Issue #24: Code cleanup, removal of MM logic