cleaning up PR for MIFOSX-709