z71: cleanup and update cm.mk