Additional mash mote cleanup