Refactor; Remove non-consenting providers
Refact; consenting providers