diff --git a/android/app/src/main/AndroidManifestBase.xml b/android/app/src/main/AndroidManifestBase.xml
index 180190914..4929b5763 100644
--- a/android/app/src/main/AndroidManifestBase.xml
+++ b/android/app/src/main/AndroidManifestBase.xml
@@ -48,6 +48,9 @@
                 <data android:scheme="bitcoin" />
                 <data android:scheme="bitcoin-wallet" />
                 <data android:scheme="bitcoin_wallet" />
+                <data android:scheme="lightning" />
+                <data android:scheme="lightning-wallet" />
+                <data android:scheme="lightning_wallet" />
                 <data android:scheme="monero" />
                 <data android:scheme="monero-wallet" />
                 <data android:scheme="monero_wallet" />
diff --git a/lib/lightning/lightning.dart b/lib/lightning/lightning.dart
index 08630d7ed..ed27f6645 100644
--- a/lib/lightning/lightning.dart
+++ b/lib/lightning/lightning.dart
@@ -8,35 +8,10 @@ import 'package:cw_core/wallet_service.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cw_bitcoin/electrum_wallet.dart';
-import 'package:cw_bitcoin/bitcoin_unspent.dart';
-import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
-import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
-import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
-import 'package:cw_bitcoin/bitcoin_amount_format.dart';
-import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
-import 'package:cw_lightning/lightning_wallet_service.dart';
 
-part 'cw_lightning.dart';
 
-Lightning? lightning = CWLightning();
 
-class ElectrumSubAddress {
-  ElectrumSubAddress(
-      {required this.id,
-      required this.name,
-      required this.address,
-      required this.txCount,
-      required this.balance,
-      required this.isChange});
-  final int id;
-  final String name;
-  final String address;
-  final int txCount;
-  final int balance;
-  final bool isChange;
-}
+Lightning? lightning;
 
 abstract class Lightning {
   TransactionPriority getMediumTransactionPriority();
@@ -79,3 +54,4 @@ abstract class Lightning {
   TransactionPriority getLightningTransactionPriorityMedium();
   TransactionPriority getLightningTransactionPrioritySlow();
 }
+  
\ No newline at end of file
diff --git a/scripts/android/pubspec_gen.sh b/scripts/android/pubspec_gen.sh
index 4b89c4afa..5c22c6ddd 100755
--- a/scripts/android/pubspec_gen.sh
+++ b/scripts/android/pubspec_gen.sh
@@ -10,7 +10,7 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--monero"
                 ;;
         $CAKEWALLET)
-                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash"
+                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --lightning"
                 ;;
         $HAVEN)
                 CONFIG_ARGS="--haven"