Removed references to the class member `client`