MIFOSX-1161 clean ups
Merge pull request #987 from vishwasbabu/develop

MIFOSX-1161 clean ups