Remove SocketBase, tidy PrefilledReadStream