Massive refactoring of the way providers are used
Remove 'utils' class