cm-12.0: Cleanup