revert mmcutils. cleanups and fixes.

Change-Id: I2b0c3918528e5f7e6f4d2f8df1592c55f98317d3