Clened up CM files