Remove singleton, update to use multiple peer instances.

Jira issue: WP-799