Heavy cleanup
Feeling better about the sockets