diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index e6e846376..8dae17776 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -1,5 +1,3 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
@@ -8,7 +6,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/load_current_wallet.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 ReactionDisposer? _onAuthenticationStateChange;
 
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index 3ecefb2c1..7f598fbbf 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -5,7 +5,6 @@ import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:another_flushbar/flushbar.dart';
-import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/routes.dart';
@@ -256,10 +255,10 @@ class WalletListBodyState extends State<WalletListBody> {
           return;
         }
 
-        if (walletListItem.type == WalletType.haven) {
-          _onHavenWalletSelected(walletListItem);
-          return;
-        }
+        // if (walletListItem.type == WalletType.haven) {
+        //   _onHavenWalletSelected(walletListItem);
+        //   return;
+        // }
 
         try {
           changeProcessText(S.of(context).wallet_list_loading_wallet(walletListItem.name));
diff --git a/lib/view_model/haven_removal_view_model.dart b/lib/view_model/haven_removal_view_model.dart
index ccacb94c3..deaca94b2 100644
--- a/lib/view_model/haven_removal_view_model.dart
+++ b/lib/view_model/haven_removal_view_model.dart
@@ -6,15 +6,13 @@ import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:hive/hive.dart';
-import 'package:mobx/mobx.dart';
 
-part 'haven_removal_view_model.g.dart';
-
-class HavenRemovalViewModel = HavenRemovalViewModelBase with _$HavenRemovalViewModel;
-
-abstract class HavenRemovalViewModelBase with Store {
-  HavenRemovalViewModelBase(
-      {required this.appStore, required this.walletInfoSource, required this.walletLoadingService});
+class HavenRemovalViewModel {
+  HavenRemovalViewModel({
+    required this.appStore,
+    required this.walletInfoSource,
+    required this.walletLoadingService,
+  });
 
   final AppStore appStore;
   final Box<WalletInfo> walletInfoSource;