BUG-8568: remove reference to DataBrokerService