CRM-128456 - Cleanup