more activity clean up
more cleanup
Merge pull request #534 from yashodha/CRM-12410

Crm 12410