Remove unused ProviderSelection code
Merge pull request #419 from ifarkas/remove_unused_provider_selection_code

Remove unused ProviderSelection code