CRM-12274

more work on activity cleanup