Remove service handling

Jira Issue: WP-1264