Mmf cleanup

STANDARD - 3,042   GOLD - 3,163