Refactor service handling: remove unnecessary code, enhance logging, and...

Refactor service handling: remove unnecessary code, enhance logging, and streamline service type definitions