clean up and remove some more cm, FUCK CM!!!!