CRM-12274

more clean up