Improved removal of disconnected client