disconnected client wasn't removed properly in several cases. fixed