Refactor; Remove non-consenting providers