marvel: cleanup cm.mk