Added client removal support