* Reworked MCM registration and cleanup process.