remove cm-specific stuff