Removing switch based on the data provider's name.