Cleanup/3.x/client selector cleanup

Removed code duplication in the client IO Handler by making use of the functionality in the server.