Cleanup + coremod check