revert mmcutils. cleanups and fixes.