more fixes CRM-12966
more cleanup CRM-12966
more cleanup CRM-12966