More code cleanups to IO/Network/Transfer/Client