[0715] MC - Cleanup

* ClassicDB only, related to https://github.com/classicdb/database/commit/3cf3175b7cdde383c37b2515cdd7542c9930cd7a