CRM-12463
Merge pull request #606 from yashodha/master

more cleanup for CRM-12463