removed server argument from Connection functions
simplified Connection functions