CRM-12463 - Clean up
Merge pull request #604 from yashodha/CRM-12463

clean up (CRM-12463)