4.4

more clean up (CRM-12697)