MIFOSX-1161 clean ups