Peer PZH remove handling

Jira Issue : WP-1264