Pre-cm-cleanup.