cleanup the windows hackery a little