Replaced TCPSocket class for new, (more) generic Socket class.