CRM-14434 - Further cleanup