Better cleanup for disconnected clients