clean-up + bring inline with cm