clean-up
Service refactored