DRY simplification
Moving away from PeerProxyManager and wiring simplifications #302