more cleanup for CRM-12463

more cleanup for CRM-12463