removed services from __init__ files
removed Service class from core.py
removed services.py file
removed unused imports
removed unused imports
removed unused imports and old importer
removed TODO file