Merge pull request #886 from yashodha/4.4

CRM-12697
CRM-12697
CRM-12697
clean up (CRM-12697)
clean up (CRM-12697)
more clean up (CRM-12697)