clean up for MIFOSX-1145
Merge pull request #1061 from vishwasbabu/develop

clean up for MIFOSX-1145