clean up(CRM-12274)
Merge pull request #497 from yashodha/more-work

clean up(CRM-12274)