cleaned up all win & osx related code