remove CM related stuff