CRM-12463 - Clean up