[Bug 245185] Mash Cleanup