diff --git a/waku/node/v2/quicksim.nim b/waku/node/v2/quicksim.nim
index 42f45a473..2a64af4f3 100644
--- a/waku/node/v2/quicksim.nim
+++ b/waku/node/v2/quicksim.nim
@@ -1,8 +1,6 @@
 import
   os, strformat, chronicles, json_rpc/[rpcclient, rpcserver], nimcrypto/sysrand,
   eth/common as eth_common, eth/keys,
-  # XXX: Replace me
-  ../../protocol/v1/waku_protocol,
   ../v1/rpc/[hexstrings, rpc_types],
   options as what # TODO: Huh? Redefinition?
 
@@ -13,18 +11,9 @@ template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0]
 const sigWakuPath = &"{sourceDir}{DirSep}rpc{DirSep}wakucallsigs.nim"
 createRpcSigs(RpcHttpClient, sigWakuPath)
 
-# More minimal than v1 quicksim, just RPC client for now
-
 let node1 = newRpcHttpClient()
 let node2 = newRpcHttpClient()
 
-# Where do we connect nodes here? Protocol so not RPC based, maybe?
-# Using with static nodes, hardcoded "works":
-# /ip4/127.0.0.1/tcp/55505/ipfs/16Uiu2HAkufRTzUnYCMggjPaAMbC3ss1bkrjewPcjwSeqK9WgUKYu
-
-# Need to figure out rw stuff as well, perhaps we can start a few nodes and see if we get some pingpong
-# Unclear how to mount waku on top of gossipsub tho
-
 info "Hello there"
 
 # portsShift=2
diff --git a/waku/node/v2/rpc/wakucallsigs.nim b/waku/node/v2/rpc/wakucallsigs.nim
index bf54dad35..8ef11e5dd 100644
--- a/waku/node/v2/rpc/wakucallsigs.nim
+++ b/waku/node/v2/rpc/wakucallsigs.nim
@@ -5,29 +5,29 @@ proc waku_subscribe(topic: string): bool
 #proc waku_subscribe(topic: string, handler: Topichandler): bool
 
 # NYI
-proc waku_info(): WakuInfo
-proc waku_setMaxMessageSize(size: uint64): bool
-proc waku_setMinPoW(pow: float): bool
-proc waku_markTrustedPeer(enode: string): bool
-
-proc waku_newKeyPair(): Identifier
-proc waku_addPrivateKey(key: string): Identifier
-proc waku_deleteKeyPair(id: Identifier): bool
-proc waku_hasKeyPair(id: Identifier): bool
-proc waku_getPublicKey(id: Identifier): PublicKey
-proc waku_getPrivateKey(id: Identifier): PrivateKey
-
-proc waku_newSymKey(): Identifier
-proc waku_addSymKey(key: string): Identifier
-proc waku_generateSymKeyFromPassword(password: string): Identifier
-proc waku_hasSymKey(id: Identifier): bool
-proc waku_getSymKey(id: Identifier): SymKey
-proc waku_deleteSymKey(id: Identifier): bool
-
-proc waku_newMessageFilter(options: WakuFilterOptions): Identifier
-proc waku_deleteMessageFilter(id: Identifier): bool
-proc waku_getFilterMessages(id: Identifier): seq[WakuFilterMessage]
-#proc waku_post(message: WakuPostMessage): bool
-
-proc wakusim_generateTraffic(amount: int): bool
-proc wakusim_generateRandomTraffic(amount: int): bool
+#proc waku_info(): WakuInfo
+#proc waku_setMaxMessageSize(size: uint64): bool
+#proc waku_setMinPoW(pow: float): bool
+#proc waku_markTrustedPeer(enode: string): bool
+#
+#proc waku_newKeyPair(): Identifier
+#proc waku_addPrivateKey(key: string): Identifier
+#proc waku_deleteKeyPair(id: Identifier): bool
+#proc waku_hasKeyPair(id: Identifier): bool
+#proc waku_getPublicKey(id: Identifier): PublicKey
+#proc waku_getPrivateKey(id: Identifier): PrivateKey
+#
+#proc waku_newSymKey(): Identifier
+#proc waku_addSymKey(key: string): Identifier
+#proc waku_generateSymKeyFromPassword(password: string): Identifier
+#proc waku_hasSymKey(id: Identifier): bool
+#proc waku_getSymKey(id: Identifier): SymKey
+#proc waku_deleteSymKey(id: Identifier): bool
+#
+#proc waku_newMessageFilter(options: WakuFilterOptions): Identifier
+#proc waku_deleteMessageFilter(id: Identifier): bool
+#proc waku_getFilterMessages(id: Identifier): seq[WakuFilterMessage]
+##proc waku_post(message: WakuPostMessage): bool
+#
+#proc wakusim_generateTraffic(amount: int): bool
+#proc wakusim_generateRandomTraffic(amount: int): bool