Fixed the disconnect from the socket in client, removed some commented out code