PZH PZP Sync cleanup

Jira Issue: WP-1034