some clean up of mms