TMDM-7702: cleanup