diff --git a/app/lib/dal/fileDAL.ts b/app/lib/dal/fileDAL.ts
index 1298d6a12cb10db70aa6cef0357568111d03e13b..267d0f1845b296aa27b0d0cf352fecc62427b1e2 100644
--- a/app/lib/dal/fileDAL.ts
+++ b/app/lib/dal/fileDAL.ts
@@ -15,7 +15,7 @@ import {DBBlock} from "../db/DBBlock"
 import {DBMembership} from "./sqliteDAL/MembershipDAL"
 import {MerkleDTO} from "../dto/MerkleDTO"
 import {CommonConstants} from "../common-libs/constants"
-import { ProxyConf } from '../proxy';
+import { ProxiesConf } from '../proxy';
 
 const fs      = require('fs')
 const path    = require('path')
diff --git a/app/lib/dto/ConfDTO.ts b/app/lib/dto/ConfDTO.ts
index cdedf5037ad5864ab2a3c7f58b870f62324a77a3..fdd2038b728dba6f0ae6cda2030688a6e9de7864 100644
--- a/app/lib/dto/ConfDTO.ts
+++ b/app/lib/dto/ConfDTO.ts
@@ -1,5 +1,5 @@
 import {CommonConstants} from "../common-libs/constants"
-import { Proxy, ProxyConf } from '../proxy';
+import { ProxiesConf } from '../proxy';
 const _ = require('underscore');
 const constants = require('../constants');
 
@@ -47,7 +47,7 @@ export interface KeypairConfDTO {
 }
 
 export interface NetworkConfDTO {
-  proxyConf: ProxyConf|undefined
+  proxyConf: ProxiesConf|undefined
   nobma: boolean
   remoteport: number
   remotehost: string|null
@@ -136,7 +136,7 @@ export class ConfDTO implements CurrencyConfDTO, KeypairConfDTO, NetworkConfDTO,
     public homename: string,
     public memory: boolean,
     public nobma: boolean,
-    public proxyConf: ProxyConf|undefined,
+    public proxyConf: ProxiesConf|undefined,
     public ws2p?: {
       privateAccess: boolean
       publicAccess: boolean
diff --git a/app/modules/ws2p/lib/WS2PClient.ts b/app/modules/ws2p/lib/WS2PClient.ts
index 0ff0b6178e9743ab5852ac2f3331ed833997be2b..80a4fd1bd842eed644e0b79081038f002dc21156 100644
--- a/app/modules/ws2p/lib/WS2PClient.ts
+++ b/app/modules/ws2p/lib/WS2PClient.ts
@@ -6,7 +6,7 @@ import {WS2PMessageHandler} from "./impl/WS2PMessageHandler"
 import {WS2PConstants} from "./constants"
 import {WS2PStreamer} from "./WS2PStreamer"
 import {WS2PSingleWriteStream} from "./WS2PSingleWriteStream"
-import { Proxies, ProxyConf, Proxy } from '../../../lib/proxy';
+import { ProxiesConf } from '../../../lib/proxy';
 import { server } from '../../../../test/integration/tools/toolbox';
 
 export class WS2PClient {
@@ -15,16 +15,12 @@ export class WS2PClient {
 
   static async connectTo(server:Server, fullEndpointAddress:string, uuid:string, messageHandler:WS2PMessageHandler, expectedPub:string, allowKey:(pub:string)=>Promise<boolean> ) {
     const k2 = new Key(server.conf.pair.pub, server.conf.pair.sec)
-    let mySelf = false;
-    if (server.conf.ws2p && server.conf.ws2p.uuid === uuid) {
-      let mySelf = true;
-    }
     const c = WS2PConnection.newConnectionToAddress(
       fullEndpointAddress,
       messageHandler,
       new WS2PPubkeyLocalAuth(server.conf.currency , k2, allowKey),
       new WS2PPubkeyRemoteAuth(server.conf.currency, k2, allowKey),
-      Proxy.wsProxy(fullEndpointAddress, server.conf.proxyConf, mySelf),
+      ProxiesConf.wsProxy(fullEndpointAddress, server.conf.proxyConf),
       {
         connectionTimeout: WS2PConstants.REQUEST_TIMEOUT,
         requestTimeout: WS2PConstants.REQUEST_TIMEOUT
diff --git a/app/modules/ws2p/lib/WS2PCluster.ts b/app/modules/ws2p/lib/WS2PCluster.ts
index 93e8119d8dbbcc6e3f5666ff3069d8f97c115f5f..5e785d9ef63de9c95916252dbb770031d3deddfd 100644
--- a/app/modules/ws2p/lib/WS2PCluster.ts
+++ b/app/modules/ws2p/lib/WS2PCluster.ts
@@ -16,7 +16,7 @@ import {WS2PMessageHandler} from "./impl/WS2PMessageHandler"
 import { CommonConstants } from '../../../lib/common-libs/constants';
 import { Package } from "../../../lib/common/package";
 import { Constants } from "../../prover/lib/constants";
-import { ProxyConf, Proxy } from '../../../lib/proxy';
+import { ProxiesConf } from '../../../lib/proxy';
 
 const es = require('event-stream')
 const nuuid = require('node-uuid')
@@ -332,7 +332,7 @@ export class WS2PCluster {
     const prefered = ((this.server.conf.ws2p && this.server.conf.ws2p.preferedNodes) || []).slice() // Copy
     // Our key is also a prefered one, so we connect to our siblings
     prefered.push(this.server.conf.pair.pub)
-    const imCanReachTorEndpoint = Proxy.canReachTorEndpoint(this.server.conf.proxyConf)
+    const imCanReachTorEndpoint = ProxiesConf.canReachTorEndpoint(this.server.conf.proxyConf)
     peers.sort((a, b) => {
       const aIsPrefered = prefered.indexOf(a.pubkey) !== -1
       const bIsPrefered = prefered.indexOf(b.pubkey) !== -1