CRM-10164
CRM-10164 : more clean up
Merge pull request #958 from pratik-joshi/CRM-10164

CRM-10164