CRM-13026 clean up