Fix: Unknown service
Merge pull request #271 from localheinz/fix/unknown-service

Fix: Unknown service
removed unused methods
fix: resolved conflicts