CRM-12274

more fixes on activity clean up