CRM-14288 - Additional cleanup