cm-10.1: cleanup