Get rid of some CM stuff