move more M$ stuff out from nolinger