removed cm stuff