remove some unneeded cm referneces