deleting a bunch of stuff, starting to integrate sockets