Started refactoring to remove services