Mms: Code cleanup

Change-Id: Ia097cf374a13119331990723e08121a8956ee52c