Unravel general connection functionality from server specific functionality
More cleanup