Merge pull request #130 from fatchicken007/master

Remove unused provider
Add common services