more cleanup CRM-12966