removed server name stuff