diff --git a/config.nims b/config.nims
index 21155f611b..efe0d6d1c4 100644
--- a/config.nims
+++ b/config.nims
@@ -1,6 +1,3 @@
-when defined(macosx):
-  import algorithm, strutils
-
 if defined(release):
   switch("nimcache", "nimcache/release/$projectName")
 else:
diff --git a/src/status/chat.nim b/src/status/chat.nim
index 30fc4d548b..705aa0c38c 100644
--- a/src/status/chat.nim
+++ b/src/status/chat.nim
@@ -3,7 +3,7 @@ import libstatus/chat as status_chat
 import libstatus/stickers as status_stickers
 import libstatus/types
 import profile/profile
-import chat/[chat, message], wallet
+import chat/[chat, message]
 import ../signals/messages
 import ens
 import eth/common/eth_types
diff --git a/src/status/ens.nim b/src/status/ens.nim
index e344f09634..0d3f0e73b0 100644
--- a/src/status/ens.nim
+++ b/src/status/ens.nim
@@ -1,15 +1,12 @@
 import strutils
 import profile/profile
 import nimcrypto
-import strmisc
 import json
 import strformat
 import libstatus/core
 import stew/byteutils
-import sequtils
 import unicode
 import algorithm
-import libstatus/settings as status_settings
 
 let domain* = ".stateofus.eth"
 
diff --git a/src/status/libstatus/stickers.nim b/src/status/libstatus/stickers.nim
index fae8e84926..bd77d93673 100644
--- a/src/status/libstatus/stickers.nim
+++ b/src/status/libstatus/stickers.nim
@@ -1,6 +1,6 @@
 import eth/common/eth_types
-import ./core as status, ./types, ./contracts, ./settings, ./utils
-import json, json_serialization, tables, chronicles, strutils, sequtils
+import ./core as status, ./types, ./contracts, ./settings
+import json, json_serialization, tables, strutils, sequtils
 
 # Retrieves number of sticker packs owned by user
 # See https://notes.status.im/Q-sQmQbpTOOWCQcYiXtf5g#Read-Sticker-Packs-owned-by-a-user
diff --git a/src/status/libstatus/types.nim b/src/status/libstatus/types.nim
index e5c65d6c46..e51d923dc4 100644
--- a/src/status/libstatus/types.nim
+++ b/src/status/libstatus/types.nim
@@ -100,7 +100,7 @@ type
     to*: string
 
 type
-  RpcException* = object of Exception
+  RpcException* = object of CatchableError
 
 type Sticker* = object
   hash*: string
diff --git a/src/status/libstatus/wallet.nim b/src/status/libstatus/wallet.nim
index 526d6c5ff1..f6d2e100ac 100644
--- a/src/status/libstatus/wallet.nim
+++ b/src/status/libstatus/wallet.nim
@@ -1,4 +1,4 @@
-import json, httpclient, json, strformat, stint, strutils, sequtils, chronicles
+import json, json, strformat, stint, strutils, chronicles
 import libstatus, core, types
 import ../wallet/account
 
diff --git a/src/status/wallet/balance_manager.nim b/src/status/wallet/balance_manager.nim
index 343a57713d..28595c983e 100644
--- a/src/status/wallet/balance_manager.nim
+++ b/src/status/wallet/balance_manager.nim
@@ -1,4 +1,4 @@
-import tables, strformat, strutils, stint, httpclient, json, times
+import strformat, strutils, stint, httpclient, json
 import ../libstatus/wallet as status_wallet
 import ../libstatus/tokens as status_tokens
 import ../utils/cache