CRM-12274

more activity clean up