worked on CRM-12463, more cleanup