Removed comment out code and moving that to the provider