updated client node and removed code pertaining to sockets
resolved merge conflicts