diff --git a/package.json b/package.json
index df8c77b3..e218458f 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "p-map": "^3.0.0",
     "p-queue": "^6.1.1",
     "p-settle": "^3.1.0",
-    "paramap-it": "^0.1.1",
     "peer-id": "^0.13.4",
     "peer-info": "^0.17.0",
     "promisify-es6": "^1.0.3",
diff --git a/src/dialer.js b/src/dialer.js
index f8c0bc52..f065e401 100644
--- a/src/dialer.js
+++ b/src/dialer.js
@@ -3,7 +3,6 @@
 const multiaddr = require('multiaddr')
 const errCode = require('err-code')
 const AbortController = require('abort-controller')
-const delay = require('delay')
 const anySignal = require('any-signal')
 const debug = require('debug')
 const log = debug('libp2p:dialer')
@@ -77,7 +76,7 @@ class Dialer {
     } catch (err) {
       // Error is a timeout
       if (timeoutController.signal.aborted) {
-        err = errCode(err, codes.ERR_TIMEOUT)
+        err.code = codes.ERR_TIMEOUT
       }
       log.error(err)
       throw err
diff --git a/src/dialer/dial-request.js b/src/dialer/dial-request.js
index d4e952e8..1f91a0dd 100644
--- a/src/dialer/dial-request.js
+++ b/src/dialer/dial-request.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const AbortController = require('abort-controller')
-const AggregateError = require('aggregate-error')
 const anySignal = require('any-signal')
 const debug = require('debug')
 const errCode = require('err-code')
@@ -56,8 +55,6 @@ class DialRequest {
           conn = await this.dialAction(addr, { ...options, signal: anySignal([signal, options.signal]) })
           // Remove the successful AbortController so it is not aborted
           dialAbortControllers.splice(i, 1)
-        } catch (err) {
-          throw err
         } finally {
           completedDials++
           // If we have more dials to make, recycle the token, otherwise release it
diff --git a/src/util/index.js b/src/util/index.js
index 221b97f5..bca13a45 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const AbortController = require('abort-controller')
-
 /**
  * Converts BufferList messages to Buffers
  * @param {*} source