Remove CM-specific stuff