Implemented client removal