remove cm stuff