diff --git a/examples/v2/chat2.nim b/examples/v2/chat2.nim
index a255b2a70..d58829bc2 100644
--- a/examples/v2/chat2.nim
+++ b/examples/v2/chat2.nim
@@ -6,7 +6,7 @@ when not(compileOption("threads")):
 
 {.push raises: [Defect].}
 
-import std/[tables, strformat, strutils, times, httpclient, json, sequtils, random, options]
+import std/[tables, strformat, strutils, times, json, options]
 import confutils, chronicles, chronos, stew/shims/net as stewNet,
        eth/keys, bearssl, stew/[byteutils, endians2, results],
        nimcrypto/pbkdf2
@@ -31,8 +31,7 @@ when defined(rln):
   import
     libp2p/protocols/pubsub/rpc/messages,
     libp2p/protocols/pubsub/pubsub,
-    web3,
-    ../../waku/v2/protocol/waku_rln_relay/[rln, waku_rln_relay_utils]
+    ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils
 
 const Help = """
   Commands: /[?|help|connect|nick|exit]
diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim
index 19fe4d4b9..83341708b 100644
--- a/tests/v2/test_jsonrpc_waku.nim
+++ b/tests/v2/test_jsonrpc_waku.nim
@@ -25,8 +25,7 @@ import
   ../../waku/v2/protocol/waku_swap/waku_swap,
   ../../waku/v2/protocol/waku_filter/waku_filter,
   ../../waku/v2/utils/peers,
-  ../../waku/v2/utils/time,
-  ../test_helpers
+  ../../waku/v2/utils/time
 
 template sourceDir*: string = currentSourcePath.rsplit(DirSep, 1)[0]
 const sigPath = sourceDir / ParDir / ParDir / "waku" / "v2" / "node" / "jsonrpc" / "jsonrpc_callsigs.nim"
diff --git a/tests/v2/test_migration_utils.nim b/tests/v2/test_migration_utils.nim
index 2830b8c84..2a1194793 100644
--- a/tests/v2/test_migration_utils.nim
+++ b/tests/v2/test_migration_utils.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[unittest, tables, strutils, os, sequtils],
+  std/[unittest, tables, strutils, os],
   chronicles,
   stew/results,
   ../../waku/v2/node/storage/migration/migration_utils
diff --git a/tests/v2/test_waku_discv5.nim b/tests/v2/test_waku_discv5.nim
index 0201c831f..61ccaca2d 100644
--- a/tests/v2/test_waku_discv5.nim
+++ b/tests/v2/test_waku_discv5.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[tables, sequtils],
+  std/tables,
   chronicles,
   chronos,
   testutils/unittests,
diff --git a/tests/v2/test_waku_pagination.nim b/tests/v2/test_waku_pagination.nim
index b84ce8965..84789dd55 100644
--- a/tests/v2/test_waku_pagination.nim
+++ b/tests/v2/test_waku_pagination.nim
@@ -1,11 +1,10 @@
 {.used.}
 import
-  std/[algorithm, options, sequtils],
+  std/[options, sequtils],
   testutils/unittests, nimcrypto/sha2,
   libp2p/protobuf/minprotobuf,
   ../../waku/v2/protocol/waku_store/waku_store,
-  ../../waku/v2/utils/time,
-  ../test_helpers
+  ../../waku/v2/utils/time
 
 
 proc createSampleStoreQueue(s: int): StoreQueueRef =
diff --git a/tests/v2/test_waku_payload.nim b/tests/v2/test_waku_payload.nim
index d57ddadaf..795cb33cd 100644
--- a/tests/v2/test_waku_payload.nim
+++ b/tests/v2/test_waku_payload.nim
@@ -3,8 +3,7 @@
 import
   testutils/unittests,
   ../../waku/v2/protocol/waku_message,
-  ../../waku/v2/node/waku_payload,
-  ../test_helpers
+  ../../waku/v2/node/waku_payload
 
 procSuite "Waku Payload":
   let rng = newRng()
diff --git a/tests/v2/test_waku_rln_relay.nim b/tests/v2/test_waku_rln_relay.nim
index 23d62b9e4..0bd472768 100644
--- a/tests/v2/test_waku_rln_relay.nim
+++ b/tests/v2/test_waku_rln_relay.nim
@@ -3,14 +3,13 @@
 
 import
   std/options, sequtils, times,
-  testutils/unittests, chronos, chronicles, stint, web3,
+  testutils/unittests, chronos, chronicles, stint,
   stew/byteutils, stew/shims/net as stewNet,
   libp2p/crypto/crypto,
   ../../waku/v2/protocol/waku_rln_relay/[rln, waku_rln_relay_utils,
       waku_rln_relay_types],
   ../../waku/v2/node/wakunode2,
-  ../test_helpers,
-  ./test_utils
+  ../test_helpers
 
 const RLNRELAY_PUBSUB_TOPIC = "waku/2/rlnrelay/proto"
 const RLNRELAY_CONTENT_TOPIC = "waku/2/rlnrelay/proto"
diff --git a/tests/v2/test_wakunode.nim b/tests/v2/test_wakunode.nim
index a36c56678..accadf4c9 100644
--- a/tests/v2/test_wakunode.nim
+++ b/tests/v2/test_wakunode.nim
@@ -2,7 +2,6 @@
 
 import
   testutils/unittests,
-  std/sequtils,
   chronicles, chronos, stew/shims/net as stewNet, stew/byteutils, std/os,
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
@@ -23,10 +22,10 @@ import
   ../../waku/v2/node/peer_manager/peer_manager,
   ../../waku/v2/utils/peers,
   ../../waku/v2/utils/time,
-  ../../waku/v2/node/wakunode2,
-  ../test_helpers
+  ../../waku/v2/node/wakunode2
 
 when defined(rln):
+  import std/sequtils
   import 
     ../../waku/v2/protocol/waku_rln_relay/[waku_rln_relay_utils, waku_rln_relay_types]
   from times import epochTime
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index 821d95532..80cb24c6d 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -323,7 +323,6 @@ when isMainModule:
     ../v1/node/rpc/wakusim,
     ../v1/node/rpc/waku,
     ../v1/node/rpc/key_storage,
-    ../v1/node/waku_helpers,
     ../v2/node/jsonrpc/[debug_api,
                         filter_api,
                         relay_api,
diff --git a/waku/v2/node/config.nim b/waku/v2/node/config.nim
index 7d3000dbf..3e0d89b2c 100644
--- a/waku/v2/node/config.nim
+++ b/waku/v2/node/config.nim
@@ -8,7 +8,6 @@ import
   libp2p/crypto/secp,
   nimcrypto/utils,
   eth/keys,
-  web3,
   ../protocol/waku_rln_relay/waku_rln_relay_types,
   ../protocol/waku_message
 
diff --git a/waku/v2/node/discv5/waku_discv5.nim b/waku/v2/node/discv5/waku_discv5.nim
index 7e549f293..065d63d96 100644
--- a/waku/v2/node/discv5/waku_discv5.nim
+++ b/waku/v2/node/discv5/waku_discv5.nim
@@ -1,7 +1,7 @@
 {.push raises: [Defect].}
 
 import
-  std/[sequtils, strutils, options],
+  std/[strutils, options],
   chronos, chronicles, metrics,
   eth/keys,
   eth/p2p/discoveryv5/[enr, node, protocol],
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 257c11220..b04cfd921 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -21,7 +21,6 @@ import
   ../protocol/waku_lightpush/waku_lightpush,
   ../protocol/waku_rln_relay/[waku_rln_relay_types], 
   ../utils/[peers, requests, wakuswitch, wakuenr],
-  ./storage/migration/migration_types,
   ./peer_manager/peer_manager,
   ./dnsdisc/waku_dnsdisc,
   ./discv5/waku_discv5,
diff --git a/waku/v2/protocol/waku_store/waku_store.nim b/waku/v2/protocol/waku_store/waku_store.nim
index 7da7027c2..a2776c030 100644
--- a/waku/v2/protocol/waku_store/waku_store.nim
+++ b/waku/v2/protocol/waku_store/waku_store.nim
@@ -7,7 +7,7 @@
 # Group by std, external then internal imports
 import
   # std imports
-  std/[tables, times, sequtils, algorithm, options, math],
+  std/[tables, times, sequtils, options, math],
   # external imports
   bearssl,
   chronicles,
diff --git a/waku/v2/utils/wakuswitch.nim b/waku/v2/utils/wakuswitch.nim
index 5339d9810..682810303 100644
--- a/waku/v2/utils/wakuswitch.nim
+++ b/waku/v2/utils/wakuswitch.nim
@@ -1,13 +1,11 @@
 # Waku Switch utils.
 {.push raises: [TLSStreamProtocolError, IOError, Defect].}
 import
-  std/[options, sequtils, strutils],
+  std/options,
   chronos, chronicles,
-  stew/byteutils,
   eth/keys,
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub,
-  libp2p/nameresolving/dnsresolver,
   libp2p/nameresolving/nameresolver,
   libp2p/builders,
   libp2p/transports/[transport, tcptransport, wstransport]