CRM-20588, code cleanup