remove some cm stuff