Revert "Implementing provider pattern"

This reverts commit f00c680c793e1aef2a308b27e6099ff652591dde.