Remove cm stuff