Remove elements if service is remvoed

Jira Issue: WP-1264