Revert "various changes and support for ubuntu servers"

This reverts commit ad16457d0c3f447f292d3325c6850802ac3ddf46.