-Update client to use select as well
-Remove keepalive dependency