fixing merge issues with MIFOSX-1024
cleaning up MIFOSX-1024