Removed all the cm exters that I think are not needed..