Remove some CM stuff