started some refactoring to remove duplicate code
removed commented out code and unnecessary console.log files
Merge branch 'mock-providers'