Remove more unneeded CM stuff