remove osx specific and fix server