final cleanup for mc stuff