Remove new service
Merge with dev-branch