diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index c03f3f0c8..612422171 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -4,10 +4,7 @@
 when not(compileOption("threads")):
   {.fatal: "Please, compile this program with the --threads:on option!".}
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/[tables, strformat, strutils, times, json, options, random]
 import confutils, chronicles, chronos, stew/shims/net as stewNet,
diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim
index d0e6e0f71..c2206cf05 100644
--- a/apps/chat2bridge/chat2bridge.nim
+++ b/apps/chat2bridge/chat2bridge.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, times, strutils, hashes, sequtils],
diff --git a/apps/wakubridge/wakubridge.nim b/apps/wakubridge/wakubridge.nim
index 37681aee2..abac1b608 100644
--- a/apps/wakubridge/wakubridge.nim
+++ b/apps/wakubridge/wakubridge.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, hashes, sequtils],
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index ad15452ee..b9389144c 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, tables, strutils, sequtils, os],
diff --git a/apps/wakunode2/wakunode2_setup_rest.nim b/apps/wakunode2/wakunode2_setup_rest.nim
index 70a6bcdbd..ebd4993e1 100644
--- a/apps/wakunode2/wakunode2_setup_rest.nim
+++ b/apps/wakunode2/wakunode2_setup_rest.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/shims/net,
diff --git a/apps/wakunode2/wakunode2_setup_rpc.nim b/apps/wakunode2/wakunode2_setup_rpc.nim
index 04173ff8e..036a0f0d8 100644
--- a/apps/wakunode2/wakunode2_setup_rpc.nim
+++ b/apps/wakunode2/wakunode2_setup_rpc.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/tables,
diff --git a/waku/common/utils/matterbridge_client.nim b/waku/common/utils/matterbridge_client.nim
index 9771dc01d..63d641cf3 100644
--- a/waku/common/utils/matterbridge_client.nim
+++ b/waku/common/utils/matterbridge_client.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[httpclient, json, uri, options],
diff --git a/waku/common/utils/nat.nim b/waku/common/utils/nat.nim
index 470eca255..16ecb1f21 100644
--- a/waku/common/utils/nat.nim
+++ b/waku/common/utils/nat.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[strutils, options],
diff --git a/waku/v1/node/wakunode1.nim b/waku/v1/node/wakunode1.nim
index da7b42efd..146075d6a 100644
--- a/waku/v1/node/wakunode1.nim
+++ b/waku/v1/node/wakunode1.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   confutils, chronos, json_rpc/rpcserver, 
diff --git a/waku/v1/protocol/waku_bridge.nim b/waku/v1/protocol/waku_bridge.nim
index 84cc17490..bde679a37 100644
--- a/waku/v1/protocol/waku_bridge.nim
+++ b/waku/v1/protocol/waku_bridge.nim
@@ -8,10 +8,7 @@
 #            MIT license (LICENSE-MIT)
 #
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   eth/p2p,
diff --git a/waku/v1/protocol/waku_mail.nim b/waku/v1/protocol/waku_mail.nim
index e8023f22f..40358db60 100644
--- a/waku/v1/protocol/waku_mail.nim
+++ b/waku/v1/protocol/waku_mail.nim
@@ -8,10 +8,7 @@
 #            MIT license (LICENSE-MIT)
 #
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   chronos,
diff --git a/waku/v1/protocol/waku_protocol.nim b/waku/v1/protocol/waku_protocol.nim
index d015099be..b0cd79d3d 100644
--- a/waku/v1/protocol/waku_protocol.nim
+++ b/waku/v1/protocol/waku_protocol.nim
@@ -37,10 +37,7 @@
 ## However, they only make real sense after ``connectToNetwork`` was started. As
 ## else there will be no peers to send and receive messages from.
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   options, tables, times, chronos, chronicles, metrics,
diff --git a/waku/v2/node/discv5/waku_discv5.nim b/waku/v2/node/discv5/waku_discv5.nim
index 9abc4f749..34126c9bf 100644
--- a/waku/v2/node/discv5/waku_discv5.nim
+++ b/waku/v2/node/discv5/waku_discv5.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[strutils, options],
diff --git a/waku/v2/node/dnsdisc/waku_dnsdisc.nim b/waku/v2/node/dnsdisc/waku_dnsdisc.nim
index 85e52904b..b19eb031f 100644
--- a/waku/v2/node/dnsdisc/waku_dnsdisc.nim
+++ b/waku/v2/node/dnsdisc/waku_dnsdisc.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 ## A set of utilities to integrate EIP-1459 DNS-based discovery
 ## for Waku v2 nodes.
diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim
index 4a9333cc2..f54b58104 100644
--- a/waku/v2/node/jsonrpc/admin_api.nim
+++ b/waku/v2/node/jsonrpc/admin_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/sequtils,
diff --git a/waku/v2/node/jsonrpc/debug_api.nim b/waku/v2/node/jsonrpc/debug_api.nim
index f03693683..ce642b92d 100644
--- a/waku/v2/node/jsonrpc/debug_api.nim
+++ b/waku/v2/node/jsonrpc/debug_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/node/jsonrpc/filter_api.nim b/waku/v2/node/jsonrpc/filter_api.nim
index 2b5caa8e7..e0e0b47b1 100644
--- a/waku/v2/node/jsonrpc/filter_api.nim
+++ b/waku/v2/node/jsonrpc/filter_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, sequtils],
diff --git a/waku/v2/node/jsonrpc/jsonrpc_types.nim b/waku/v2/node/jsonrpc/jsonrpc_types.nim
index 8ae5248c5..296e84619 100644
--- a/waku/v2/node/jsonrpc/jsonrpc_types.nim
+++ b/waku/v2/node/jsonrpc/jsonrpc_types.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options,tables],
diff --git a/waku/v2/node/jsonrpc/jsonrpc_utils.nim b/waku/v2/node/jsonrpc/jsonrpc_utils.nim
index 3105fe2cc..7002619ec 100644
--- a/waku/v2/node/jsonrpc/jsonrpc_utils.nim
+++ b/waku/v2/node/jsonrpc/jsonrpc_utils.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, json],
diff --git a/waku/v2/node/jsonrpc/private_api.nim b/waku/v2/node/jsonrpc/private_api.nim
index 579c186f0..bc021c78e 100644
--- a/waku/v2/node/jsonrpc/private_api.nim
+++ b/waku/v2/node/jsonrpc/private_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/relay_api.nim b/waku/v2/node/jsonrpc/relay_api.nim
index 703c2627b..1c3a113bc 100644
--- a/waku/v2/node/jsonrpc/relay_api.nim
+++ b/waku/v2/node/jsonrpc/relay_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables,sequtils],
diff --git a/waku/v2/node/jsonrpc/store_api.nim b/waku/v2/node/jsonrpc/store_api.nim
index 9cf0c9c84..53e009348 100644
--- a/waku/v2/node/jsonrpc/store_api.nim
+++ b/waku/v2/node/jsonrpc/store_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/options,
diff --git a/waku/v2/node/message_cache.nim b/waku/v2/node/message_cache.nim
index f3d361a69..848be7423 100644
--- a/waku/v2/node/message_cache.nim
+++ b/waku/v2/node/message_cache.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, sequtils],
diff --git a/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim b/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim
index 4515150cf..7426074ae 100644
--- a/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim
+++ b/waku/v2/node/peer_manager/peer_store/waku_peer_storage.nim
@@ -2,7 +2,7 @@ when (NimMajor, NimMinor) < (1, 4):
   {.push raises: [Defect].}
 else:
   {.push raises: [].}
-
+  
 
 import
   std/sets, 
diff --git a/waku/v2/node/peer_manager/waku_peer_store.nim b/waku/v2/node/peer_manager/waku_peer_store.nim
index 807423fba..8cbe0591a 100644
--- a/waku/v2/node/peer_manager/waku_peer_store.nim
+++ b/waku/v2/node/peer_manager/waku_peer_store.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, sequtils, sets],
diff --git a/waku/v2/node/rest/base64.nim b/waku/v2/node/rest/base64.nim
index 102dfa862..ba40ca933 100644
--- a/waku/v2/node/rest/base64.nim
+++ b/waku/v2/node/rest/base64.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import stew/[results, byteutils, base64]
 
diff --git a/waku/v2/node/rest/client.nim b/waku/v2/node/rest/client.nim
index 7693e8878..230e7fc39 100644
--- a/waku/v2/node/rest/client.nim
+++ b/waku/v2/node/rest/client.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import presto/client
 
diff --git a/waku/v2/node/rest/debug/api_types.nim b/waku/v2/node/rest/debug/api_types.nim
index ac277e93f..1c56de304 100644
--- a/waku/v2/node/rest/debug/api_types.nim
+++ b/waku/v2/node/rest/debug/api_types.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/node/rest/debug/debug_api.nim b/waku/v2/node/rest/debug/debug_api.nim
index fa2c7e279..d0a0be0c8 100644
--- a/waku/v2/node/rest/debug/debug_api.nim
+++ b/waku/v2/node/rest/debug/debug_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/node/rest/relay/api_types.nim b/waku/v2/node/rest/relay/api_types.nim
index a60a03cf8..74e7962b9 100644
--- a/waku/v2/node/rest/relay/api_types.nim
+++ b/waku/v2/node/rest/relay/api_types.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[sets, strformat],
diff --git a/waku/v2/node/rest/relay/relay_api.nim b/waku/v2/node/rest/relay/relay_api.nim
index 312a33a5d..9193ee756 100644
--- a/waku/v2/node/rest/relay/relay_api.nim
+++ b/waku/v2/node/rest/relay/relay_api.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[sets, sequtils],
diff --git a/waku/v2/node/rest/relay/topic_cache.nim b/waku/v2/node/rest/relay/topic_cache.nim
index 32e846c9d..f640c4485 100644
--- a/waku/v2/node/rest/relay/topic_cache.nim
+++ b/waku/v2/node/rest/relay/topic_cache.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/results,
diff --git a/waku/v2/node/rest/serdes.nim b/waku/v2/node/rest/serdes.nim
index f87c157c0..a8be61ce1 100644
--- a/waku/v2/node/rest/serdes.nim
+++ b/waku/v2/node/rest/serdes.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/typetraits,
diff --git a/waku/v2/node/rest/server.nim b/waku/v2/node/rest/server.nim
index 96764b132..a0d617579 100644
--- a/waku/v2/node/rest/server.nim
+++ b/waku/v2/node/rest/server.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/results,
diff --git a/waku/v2/node/rest/utils.nim b/waku/v2/node/rest/utils.nim
index 12bc44a27..baaee7bbd 100644
--- a/waku/v2/node/rest/utils.nim
+++ b/waku/v2/node/rest/utils.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/typetraits
 import 
diff --git a/waku/v2/node/storage/message/message_retention_policy.nim b/waku/v2/node/storage/message/message_retention_policy.nim
index 2a3a9fa78..009a75dae 100644
--- a/waku/v2/node/storage/message/message_retention_policy.nim
+++ b/waku/v2/node/storage/message/message_retention_policy.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/results
diff --git a/waku/v2/node/storage/message/message_retention_policy_capacity.nim b/waku/v2/node/storage/message/message_retention_policy_capacity.nim
index d682a5b1c..5acd54548 100644
--- a/waku/v2/node/storage/message/message_retention_policy_capacity.nim
+++ b/waku/v2/node/storage/message/message_retention_policy_capacity.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   stew/results,
diff --git a/waku/v2/node/storage/message/message_retention_policy_time.nim b/waku/v2/node/storage/message/message_retention_policy_time.nim
index f5504f1e8..361d1405c 100644
--- a/waku/v2/node/storage/message/message_retention_policy_time.nim
+++ b/waku/v2/node/storage/message/message_retention_policy_time.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/times,
diff --git a/waku/v2/node/storage/message/queue_store/index.nim b/waku/v2/node/storage/message/queue_store/index.nim
index ff02c2794..e47ccbc0d 100644
--- a/waku/v2/node/storage/message/queue_store/index.nim
+++ b/waku/v2/node/storage/message/queue_store/index.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/byteutils,
diff --git a/waku/v2/node/storage/message/queue_store/queue_store.nim b/waku/v2/node/storage/message/queue_store/queue_store.nim
index 6feb21f41..7dc99ac2f 100644
--- a/waku/v2/node/storage/message/queue_store/queue_store.nim
+++ b/waku/v2/node/storage/message/queue_store/queue_store.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, times],
diff --git a/waku/v2/node/storage/message/sqlite_store.nim b/waku/v2/node/storage/message/sqlite_store.nim
index 7cfc1cd03..e9889a7c9 100644
--- a/waku/v2/node/storage/message/sqlite_store.nim
+++ b/waku/v2/node/storage/message/sqlite_store.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import ./sqlite_store/sqlite_store
 
diff --git a/waku/v2/node/storage/message/sqlite_store/queries.nim b/waku/v2/node/storage/message/sqlite_store/queries.nim
index e33c5af0f..0d84230c8 100644
--- a/waku/v2/node/storage/message/sqlite_store/queries.nim
+++ b/waku/v2/node/storage/message/sqlite_store/queries.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, sequtils],
diff --git a/waku/v2/node/storage/message/sqlite_store/sqlite_store.nim b/waku/v2/node/storage/message/sqlite_store/sqlite_store.nim
index b11305a59..3824770e9 100644
--- a/waku/v2/node/storage/message/sqlite_store/sqlite_store.nim
+++ b/waku/v2/node/storage/message/sqlite_store/sqlite_store.nim
@@ -1,9 +1,6 @@
 # The code in this file is an adaptation of the Sqlite KV Store found in nim-eth.
 # https://github.com/status-im/nim-eth/blob/master/eth/db/kvstore_sqlite3.nim
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/[options, tables],
diff --git a/waku/v2/node/storage/message/waku_store_queue.nim b/waku/v2/node/storage/message/waku_store_queue.nim
index 5dd34dd27..8697dae73 100644
--- a/waku/v2/node/storage/message/waku_store_queue.nim
+++ b/waku/v2/node/storage/message/waku_store_queue.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   ./queue_store/index,
diff --git a/waku/v2/node/storage/migration/migration_utils.nim b/waku/v2/node/storage/migration/migration_utils.nim
index a5d89b199..7e1338f80 100644
--- a/waku/v2/node/storage/migration/migration_utils.nim
+++ b/waku/v2/node/storage/migration/migration_utils.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/[os, algorithm, tables, strutils], 
diff --git a/waku/v2/node/waku_metrics.nim b/waku/v2/node/waku_metrics.nim
index 4944004a4..4cc4008e6 100644
--- a/waku/v2/node/waku_metrics.nim
+++ b/waku/v2/node/waku_metrics.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/shims/net,
diff --git a/waku/v2/node/waku_node.nim b/waku/v2/node/waku_node.nim
index 9cb12f5d2..dfd9db223 100644
--- a/waku/v2/node/waku_node.nim
+++ b/waku/v2/node/waku_node.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[hashes, options, tables, strutils, sequtils, os],
diff --git a/waku/v2/node/waku_payload.nim b/waku/v2/node/waku_payload.nim
index dacae3fbd..e8fe2e886 100644
--- a/waku/v2/node/waku_payload.nim
+++ b/waku/v2/node/waku_payload.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/options,
diff --git a/waku/v2/protocol/waku_filter.nim b/waku/v2/protocol/waku_filter.nim
index d59a63aa6..81685e09b 100644
--- a/waku/v2/protocol/waku_filter.nim
+++ b/waku/v2/protocol/waku_filter.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   ./waku_filter/rpc,
diff --git a/waku/v2/protocol/waku_filter/client.nim b/waku/v2/protocol/waku_filter/client.nim
index 943e17530..3848befda 100644
--- a/waku/v2/protocol/waku_filter/client.nim
+++ b/waku/v2/protocol/waku_filter/client.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/[options, tables, sequtils],
diff --git a/waku/v2/protocol/waku_filter/protocol_metrics.nim b/waku/v2/protocol/waku_filter/protocol_metrics.nim
index de266e16b..f9dd7ad15 100644
--- a/waku/v2/protocol/waku_filter/protocol_metrics.nim
+++ b/waku/v2/protocol/waku_filter/protocol_metrics.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import metrics
 
diff --git a/waku/v2/protocol/waku_filter/rpc_codec.nim b/waku/v2/protocol/waku_filter/rpc_codec.nim
index 2bbda4a27..d1e610d7d 100644
--- a/waku/v2/protocol/waku_filter/rpc_codec.nim
+++ b/waku/v2/protocol/waku_filter/rpc_codec.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   libp2p/protobuf/minprotobuf,
diff --git a/waku/v2/protocol/waku_lightpush/client.nim b/waku/v2/protocol/waku_lightpush/client.nim
index ca5d25456..c0e616d1c 100644
--- a/waku/v2/protocol/waku_lightpush/client.nim
+++ b/waku/v2/protocol/waku_lightpush/client.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/options,
diff --git a/waku/v2/protocol/waku_lightpush/protocol.nim b/waku/v2/protocol/waku_lightpush/protocol.nim
index acb77536a..02a7301e4 100644
--- a/waku/v2/protocol/waku_lightpush/protocol.nim
+++ b/waku/v2/protocol/waku_lightpush/protocol.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/options,
diff --git a/waku/v2/protocol/waku_lightpush/protocol_metrics.nim b/waku/v2/protocol/waku_lightpush/protocol_metrics.nim
index 98cb5fa67..b55486378 100644
--- a/waku/v2/protocol/waku_lightpush/protocol_metrics.nim
+++ b/waku/v2/protocol/waku_lightpush/protocol_metrics.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import metrics
 
diff --git a/waku/v2/protocol/waku_lightpush/rpc.nim b/waku/v2/protocol/waku_lightpush/rpc.nim
index 0bb05746e..5893b189b 100644
--- a/waku/v2/protocol/waku_lightpush/rpc.nim
+++ b/waku/v2/protocol/waku_lightpush/rpc.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   ../waku_message
diff --git a/waku/v2/protocol/waku_lightpush/rpc_codec.nim b/waku/v2/protocol/waku_lightpush/rpc_codec.nim
index dd57b5650..9647afcf9 100644
--- a/waku/v2/protocol/waku_lightpush/rpc_codec.nim
+++ b/waku/v2/protocol/waku_lightpush/rpc_codec.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 
 import
diff --git a/waku/v2/protocol/waku_message.nim b/waku/v2/protocol/waku_message.nim
index 1f1fef66b..88799c27a 100644
--- a/waku/v2/protocol/waku_message.nim
+++ b/waku/v2/protocol/waku_message.nim
@@ -6,10 +6,7 @@
 ## For payload content and encryption, see waku/v2/node/waku_payload.nim
 
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   libp2p/protobuf/minprotobuf,
diff --git a/waku/v2/protocol/waku_noise/noise.nim b/waku/v2/protocol/waku_noise/noise.nim
index abe9d5077..598ddb95f 100644
--- a/waku/v2/protocol/waku_noise/noise.nim
+++ b/waku/v2/protocol/waku_noise/noise.nim
@@ -6,10 +6,7 @@
 ## Implementation partially inspired by noise-libp2p:
 ## https://github.com/status-im/nim-libp2p/blob/master/libp2p/protocols/secure/noise.nim
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/[options, strutils]
 import stew/byteutils
diff --git a/waku/v2/protocol/waku_noise/noise_handshake_processing.nim b/waku/v2/protocol/waku_noise/noise_handshake_processing.nim
index 1c38df279..362c3fadc 100644
--- a/waku/v2/protocol/waku_noise/noise_handshake_processing.nim
+++ b/waku/v2/protocol/waku_noise/noise_handshake_processing.nim
@@ -2,10 +2,7 @@
 ## See spec for more details:
 ## https://github.com/vacp2p/rfc/tree/master/content/docs/rfcs/35
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/[options, strutils, tables]
 import chronos
diff --git a/waku/v2/protocol/waku_noise/noise_types.nim b/waku/v2/protocol/waku_noise/noise_types.nim
index 855c4ff00..b66e34b5b 100644
--- a/waku/v2/protocol/waku_noise/noise_types.nim
+++ b/waku/v2/protocol/waku_noise/noise_types.nim
@@ -5,10 +5,7 @@
 ## Implementation partially inspired by noise-libp2p:
 ## https://github.com/status-im/nim-libp2p/blob/master/libp2p/protocols/secure/noise.nim
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/[options, tables]
 import chronos
diff --git a/waku/v2/protocol/waku_noise/noise_utils.nim b/waku/v2/protocol/waku_noise/noise_utils.nim
index 443460a8a..67bf81675 100644
--- a/waku/v2/protocol/waku_noise/noise_utils.nim
+++ b/waku/v2/protocol/waku_noise/noise_utils.nim
@@ -3,10 +3,7 @@
 ## See spec for more details:
 ## https://github.com/vacp2p/rfc/tree/master/content/docs/rfcs/35
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import std/[algorithm, base64, oids, options, strutils, tables, sequtils]
 import chronos
diff --git a/waku/v2/protocol/waku_peer_exchange.nim b/waku/v2/protocol/waku_peer_exchange.nim
index d11ff7ca4..e8b61e25b 100644
--- a/waku/v2/protocol/waku_peer_exchange.nim
+++ b/waku/v2/protocol/waku_peer_exchange.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   ./waku_peer_exchange/rpc,
diff --git a/waku/v2/protocol/waku_peer_exchange/rpc_codec.nim b/waku/v2/protocol/waku_peer_exchange/rpc_codec.nim
index 3432353f3..9301204da 100644
--- a/waku/v2/protocol/waku_peer_exchange/rpc_codec.nim
+++ b/waku/v2/protocol/waku_peer_exchange/rpc_codec.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   libp2p/protobuf/minprotobuf,
diff --git a/waku/v2/protocol/waku_rln_relay/rln.nim b/waku/v2/protocol/waku_rln_relay/rln.nim
index 5e0073ae0..fcc516652 100644
--- a/waku/v2/protocol/waku_rln_relay/rln.nim
+++ b/waku/v2/protocol/waku_rln_relay/rln.nim
@@ -1,9 +1,6 @@
 # this module contains the Nim wrappers for the rln library https://github.com/kilic/rln/blob/3bbec368a4adc68cd5f9bfae80b17e1bbb4ef373/src/ffi.rs
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   os,
diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim
index 4c1b60fd8..9e05a43b8 100644
--- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim
+++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   chronicles,
diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
index cba2126ab..7da4c6a0e 100644
--- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
+++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, tables, deques],
diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
index f3e9da141..46d2fe854 100644
--- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
+++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[sequtils, tables, times, os, deques],
diff --git a/waku/v2/protocol/waku_store/client.nim b/waku/v2/protocol/waku_store/client.nim
index 312818843..b680b36d1 100644
--- a/waku/v2/protocol/waku_store/client.nim
+++ b/waku/v2/protocol/waku_store/client.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, sequtils, times],
diff --git a/waku/v2/protocol/waku_store/message_store.nim b/waku/v2/protocol/waku_store/message_store.nim
index a0f0dd9e1..d1ee0b22e 100644
--- a/waku/v2/protocol/waku_store/message_store.nim
+++ b/waku/v2/protocol/waku_store/message_store.nim
@@ -1,10 +1,7 @@
 ## This module defines a message store interface. Implementations of
 ## MessageStore are used by the `WakuStore` protocol to store and 
 ## retrieve historical messages
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, times],
diff --git a/waku/v2/protocol/waku_store/pagination.nim b/waku/v2/protocol/waku_store/pagination.nim
index 9d2caf826..05c1442d9 100644
--- a/waku/v2/protocol/waku_store/pagination.nim
+++ b/waku/v2/protocol/waku_store/pagination.nim
@@ -1,8 +1,5 @@
 ## Contains types and utilities for pagination.
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   stew/byteutils,
diff --git a/waku/v2/protocol/waku_store/protocol.nim b/waku/v2/protocol/waku_store/protocol.nim
index a9e3c84e5..459253ce0 100644
--- a/waku/v2/protocol/waku_store/protocol.nim
+++ b/waku/v2/protocol/waku_store/protocol.nim
@@ -1,10 +1,7 @@
 ## Waku Store protocol for historical messaging support.
 ## See spec for more details:
 ## https://github.com/vacp2p/specs/blob/master/specs/waku/v2/waku-store.md
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[tables, times, sequtils, options, algorithm],
diff --git a/waku/v2/protocol/waku_store/protocol_metrics.nim b/waku/v2/protocol/waku_store/protocol_metrics.nim
index da574dca6..c38318028 100644
--- a/waku/v2/protocol/waku_store/protocol_metrics.nim
+++ b/waku/v2/protocol/waku_store/protocol_metrics.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import metrics
 
diff --git a/waku/v2/protocol/waku_store/rpc.nim b/waku/v2/protocol/waku_store/rpc.nim
index e35eb5ebb..1dc0b8717 100644
--- a/waku/v2/protocol/waku_store/rpc.nim
+++ b/waku/v2/protocol/waku_store/rpc.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   ../../utils/time,
diff --git a/waku/v2/protocol/waku_store/rpc_codec.nim b/waku/v2/protocol/waku_store/rpc_codec.nim
index 226e0e363..5b4452446 100644
--- a/waku/v2/protocol/waku_store/rpc_codec.nim
+++ b/waku/v2/protocol/waku_store/rpc_codec.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   nimcrypto/hash,
diff --git a/waku/v2/protocol/waku_swap/waku_swap.nim b/waku/v2/protocol/waku_swap/waku_swap.nim
index 70f0414af..3a7ea8562 100644
--- a/waku/v2/protocol/waku_swap/waku_swap.nim
+++ b/waku/v2/protocol/waku_swap/waku_swap.nim
@@ -21,10 +21,7 @@
 ## Things like settlement is for future work.
 ##
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 # TODO Generally clean up errors here, a lot of Exceptions, Defects and KeyErros
 #
diff --git a/waku/v2/protocol/waku_swap/waku_swap_contracts.nim b/waku/v2/protocol/waku_swap/waku_swap_contracts.nim
index 2dc324cb8..946736211 100644
--- a/waku/v2/protocol/waku_swap/waku_swap_contracts.nim
+++ b/waku/v2/protocol/waku_swap/waku_swap_contracts.nim
@@ -3,10 +3,7 @@
 # Assumes swap-contracts-module node is running.
 #
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[osproc, strutils, json],
diff --git a/waku/v2/protocol/waku_swap/waku_swap_types.nim b/waku/v2/protocol/waku_swap/waku_swap_types.nim
index aa993321d..23f491fd6 100644
--- a/waku/v2/protocol/waku_swap/waku_swap_types.nim
+++ b/waku/v2/protocol/waku_swap/waku_swap_types.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/tables,
diff --git a/waku/v2/utils/collector.nim b/waku/v2/utils/collector.nim
index 29310eb62..64e38d26f 100644
--- a/waku/v2/utils/collector.nim
+++ b/waku/v2/utils/collector.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   metrics
diff --git a/waku/v2/utils/keyfile.nim b/waku/v2/utils/keyfile.nim
index c6cd2a822..2c0ca7c37 100644
--- a/waku/v2/utils/keyfile.nim
+++ b/waku/v2/utils/keyfile.nim
@@ -3,10 +3,7 @@
 # - allow storage of multiple keyfiles (encrypted with different passwords) in same file and iteration among successful decryptions
 # - enable/disable at compilation time the keyfile id and version fields
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[os, strutils, json, sequtils],
diff --git a/waku/v2/utils/peers.nim b/waku/v2/utils/peers.nim
index 4c74a08e4..2ae8b68bd 100644
--- a/waku/v2/utils/peers.nim
+++ b/waku/v2/utils/peers.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 # Collection of utilities related to Waku peers
 import
diff --git a/waku/v2/utils/protobuf.nim b/waku/v2/utils/protobuf.nim
index c1e3fb049..0e5c86f22 100644
--- a/waku/v2/utils/protobuf.nim
+++ b/waku/v2/utils/protobuf.nim
@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   libp2p/protobuf/minprotobuf,
diff --git a/waku/v2/utils/requests.nim b/waku/v2/utils/requests.nim
index 40ee6773b..c64df71d0 100644
--- a/waku/v2/utils/requests.nim
+++ b/waku/v2/utils/requests.nim
@@ -1,9 +1,6 @@
 # Request utils.
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import bearssl/rand, stew/byteutils
 
diff --git a/waku/v2/utils/time.nim b/waku/v2/utils/time.nim
index 693938fd5..704b6d1c7 100644
--- a/waku/v2/utils/time.nim
+++ b/waku/v2/utils/time.nim
@@ -1,8 +1,5 @@
 ## Contains types and utilities for timestamps.
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import 
   std/times,
diff --git a/waku/whisper/whisper_protocol.nim b/waku/whisper/whisper_protocol.nim
index 8e6c311de..ccc907ae6 100644
--- a/waku/whisper/whisper_protocol.nim
+++ b/waku/whisper/whisper_protocol.nim
@@ -29,10 +29,7 @@
 ## However, they only make real sense after ``connectToNetwork`` was started. As
 ## else there will be no peers to send and receive messages from.
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[options, tables, times],
diff --git a/waku/whisper/whisper_types.nim b/waku/whisper/whisper_types.nim
index b73ecf85f..4805d1962 100644
--- a/waku/whisper/whisper_types.nim
+++ b/waku/whisper/whisper_types.nim
@@ -5,10 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
+{.push raises: [Defect].}
 
 import
   std/[algorithm, bitops, math, options, tables, times, hashes],