Finalized SocketComm changes

Removed old code in comments.