Mms: cleanup

Change-Id: Idb82e1eaf3df9052cab705fb3044cbe33ba1f4dc