Cleanup cm build