Remove some CM stuff (2)