Remove CMR logic from code and tests