clean up for MIFOSX-1145