clean up (CRM-13205)
Merge pull request #1498 from yashodha/4.4.CRM-13205

clean up (CRM-13205)