CRM-11958 - Cleanup