Done - https://trello.com/c/DYfNUExf/213-providers-clean-up-backend-usage-of-providers