removes socket wrapper
fixes merge conflict