Remove redundant make_*_socket functions