refactored services

cut out an unnecessary service by adding it's functionality to a pre-existing one.