CRM-12856 - Cleanup