diff --git a/tests/v2/test_waku_filter.nim b/tests/v2/test_waku_filter.nim
index 55ccd2255..04071dc28 100644
--- a/tests/v2/test_waku_filter.nim
+++ b/tests/v2/test_waku_filter.nim
@@ -1,20 +1,10 @@
+{.used.}
 
-import unittest, options, tables, sets, sequtils
-import chronos, chronicles
-import utils,
-       libp2p/errors,
-       libp2p/switch,
-       libp2p/protobuf/minprotobuf,
-       libp2p/stream/[bufferstream, connection],
-       libp2p/crypto/crypto,
-       libp2p/protocols/pubsub/floodsub,
-       libp2p/protocols/pubsub/rpc/message,
-       libp2p/multistream,
-       libp2p/transports/transport,
-       libp2p/transports/tcptransport
-import ../../waku/protocol/v2/[waku_protocol2, waku_filter, filter]
-
-import ../test_helpers
+import
+  std/[unittest, options, sets],
+  chronos, chronicles,
+  utils,
+  ../../waku/protocol/v2/waku_filter, ../test_helpers
 
 procSuite "Waku Filter":
 
diff --git a/waku.nimble b/waku.nimble
index 49a622205..3c1e389ac 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -67,4 +67,3 @@ task wakusim2, "Build Experimental Waku simulation tools":
 task wakuexample2, "Build example Waku usage":
   let name = "basic2"
   buildBinary name, "examples/v2/", "-d:chronicles_log_level=DEBUG"
-  exec "build/" & name
diff --git a/waku/protocol/v2/waku_filter.nim b/waku/protocol/v2/waku_filter.nim
index 2b26a3e09..08858087b 100644
--- a/waku/protocol/v2/waku_filter.nim
+++ b/waku/protocol/v2/waku_filter.nim
@@ -1,19 +1,14 @@
-import chronos, chronicles
-import ./filter
-import tables
-import libp2p/protocols/pubsub/pubsub,
-       libp2p/protocols/pubsub/pubsubpeer,
-       libp2p/protocols/pubsub/floodsub,
-       libp2p/protocols/pubsub/gossipsub,
-       libp2p/protocols/pubsub/rpc/[messages, protobuf],
-       libp2p/protocols/protocol,
-       libp2p/protobuf/minprotobuf,
-       libp2p/stream/connection
-
-import metrics
-
-import stew/results
-
+import
+  std/tables,
+  chronos, chronicles, metrics, stew/results,
+  libp2p/protocols/pubsub/pubsubpeer,
+  libp2p/protocols/pubsub/floodsub,
+  libp2p/protocols/pubsub/gossipsub,
+  libp2p/protocols/pubsub/rpc/[messages, protobuf],
+  libp2p/protocols/protocol,
+  libp2p/protobuf/minprotobuf,
+  libp2p/stream/connection,
+  ./filter
 
 # NOTE This is just a start, the design of this protocol isn't done yet. It
 # should be direct payload exchange (a la req-resp), not be coupled with the
@@ -36,13 +31,13 @@ type
   WakuFilter* = ref object of LPProtocol
     subscribers*: seq[Subscriber]
 
-method encode*(filter: ContentFilter): ProtoBuffer =
+proc encode*(filter: ContentFilter): ProtoBuffer =
   result = initProtoBuffer()
 
   for topic in filter.topics:
     result.write(1, topic)
 
-method encode*(rpc: FilterRPC): ProtoBuffer =
+proc encode*(rpc: FilterRPC): ProtoBuffer =
   result = initProtoBuffer()
 
   for filter in rpc.filters:
@@ -68,7 +63,7 @@ proc init*(T: type FilterRPC, buffer: seq[byte]): ProtoResult[T] =
 
   ok(rpc)
 
-method init*(T: type WakuFilter): T =
+proc init*(T: type WakuFilter): T =
   var ws = WakuFilter(subscribers: newSeq[Subscriber](0))
 
   # From my understanding we need to set up filters,