removed the socket argument from some functions that always passed in the

same socket and it was available from the passed-in struct anyway!