Mash clean up

Comments