cmt: cleanup