Crm 12274

more fixes for activity clean up