CRM-16806 - Additional cleanup