more fixes CRM-12966
more cleanup CRM-12966
more cleanup CRM-12966
more cleanup CRM-12966
Merge pull request #1120 from kurund/CRM-12966

CRM-12966