z71: cleanup cm.mk