Revert "Service provider refactor"

This reverts commit d2065bee2af87c9e2b9a00fb422c5f28088926d2.
Bug fixes and removed a config option