Remove TCPSocket and use MessageProcessor instead

Moved back into previous position.