Remove service handling

Jira Issue: WP-1264
Merge pull request #66 from habibvirji/WP-1264-pzhSync

Remove service handling