Refactoring

* removed service interfaces for impl services with only one implementation