Get rid of sockets in the context passing