CRM-13026 more cleanup