Removed unnecessary injections
Service refactoring