cwm: cleanup