Remove useless code
Merge pull request #8080 from ciupicri/service

Remove unused code