Removing the dependency injection and some scope level changes. To be followed by testing of feature.