added remove_client