diff --git a/app/src/main/java/com/tangem/data/network/request/ElectrumRequest.java b/app/src/main/java/com/tangem/data/network/ElectrumRequest.java
similarity index 99%
rename from app/src/main/java/com/tangem/data/network/request/ElectrumRequest.java
rename to app/src/main/java/com/tangem/data/network/ElectrumRequest.java
index a1dc3395fe..956a25e823 100644
--- a/app/src/main/java/com/tangem/data/network/request/ElectrumRequest.java
+++ b/app/src/main/java/com/tangem/data/network/ElectrumRequest.java
@@ -1,4 +1,4 @@
-package com.tangem.data.network.request;
+package com.tangem.data.network;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiHelper.java b/app/src/main/java/com/tangem/data/network/ServerApiHelper.java
index 6d76d16adc..a6c6a1f44e 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiHelper.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiHelper.java
@@ -4,45 +4,25 @@ import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import com.tangem.App;
 import com.tangem.data.network.model.CardVerifyAndGetInfo;
 import com.tangem.data.network.model.InfuraBody;
 import com.tangem.data.network.model.InfuraResponse;
 import com.tangem.data.network.model.RateInfoResponse;
-import com.tangem.data.network.request.ElectrumRequest;
-import com.tangem.domain.BitcoinNode;
-import com.tangem.domain.BitcoinNodeTestNet;
-import com.tangem.domain.wallet.Blockchain;
 import com.tangem.domain.wallet.TangemCard;
 import com.tangem.util.Util;
 
-import java.io.BufferedReader;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Random;
 
-import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.observers.DefaultObserver;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
-import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class ServerApiHelper {
     private static String TAG = ServerApiHelper.class.getSimpleName();
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java
index 987e66df8a..d1cfdc71fd 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiHelperElectrum.java
@@ -2,7 +2,6 @@ package com.tangem.data.network;
 
 import android.util.Log;
 
-import com.tangem.data.network.request.ElectrumRequest;
 import com.tangem.domain.BitcoinNode;
 import com.tangem.domain.BitcoinNodeTestNet;
 import com.tangem.domain.wallet.Blockchain;
diff --git a/app/src/main/java/com/tangem/domain/BitcoinNode.kt b/app/src/main/java/com/tangem/domain/BitcoinNode.kt
index d373fbb0f7..ee4b7cf787 100644
--- a/app/src/main/java/com/tangem/domain/BitcoinNode.kt
+++ b/app/src/main/java/com/tangem/domain/BitcoinNode.kt
@@ -1,19 +1,6 @@
 package com.tangem.domain
 
 enum class BitcoinNode(val host: String, val port: Int) {
-//	n1("174.138.11.174", 50001),
-//	n2("btc.cihar.com", 50001),
-//	n3("electrum.leblancnet.us", 50001),
-//	n4("electrum.qtornado.com", 50001),
-//	n5("electrum.vom-stausee.de", 50001),
-//	n6("helicarrier.bauerj.eu", 50001),
-//	n7("kirsche.emzy.de", 50001),
-//	n8("ndnd.selfhost.eu", 50001),
-//	n9("spv.48.org", 50003),
-//	n10("such.ninja", 50001),
-//	n11("tardis.bauerj.eu", 50001),
-//	n12("vps.hsmiths.com", 50001),
-
     n13("btc.cihar.com", 50001),
     n14("electrum.vom-stausee.de", 50001),
     n15("helicarrier.bauerj.eu", 50001),
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
index e7c45cf8e0..8d218028a1 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
@@ -16,7 +16,7 @@ import android.widget.*
 import com.tangem.data.network.ServerApiHelper
 import com.tangem.data.network.ServerApiHelperElectrum
 import com.tangem.data.network.model.InfuraResponse
-import com.tangem.data.network.request.ElectrumRequest
+import com.tangem.data.network.ElectrumRequest
 import com.tangem.domain.cardReader.NfcManager
 import com.tangem.domain.wallet.*
 import com.tangem.util.BTCUtils
diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
index be7cc14bd6..213990436f 100644
--- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
@@ -4,10 +4,8 @@ import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import com.tangem.App
 import com.tangem.presentation.fragment.LoadedWallet
 import com.tangem.wallet.R
-import retrofit2.Retrofit
 
 class LoadedWalletActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
index 03bee527e9..df4b105ccf 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
@@ -11,7 +11,7 @@ import android.widget.Toast
 import com.tangem.data.network.ServerApiHelper
 import com.tangem.data.network.ServerApiHelperElectrum
 import com.tangem.data.network.model.InfuraResponse
-import com.tangem.data.network.request.ElectrumRequest
+import com.tangem.data.network.ElectrumRequest
 import com.tangem.domain.cardReader.NfcManager
 import com.tangem.domain.wallet.Blockchain
 import com.tangem.domain.wallet.CoinEngineFactory
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index f88e5e43d7..871fb74a20 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -23,7 +23,7 @@ import com.google.zxing.WriterException
 import com.tangem.data.network.ServerApiHelper
 import com.tangem.data.network.ServerApiHelperElectrum
 import com.tangem.data.network.model.InfuraResponse
-import com.tangem.data.network.request.ElectrumRequest
+import com.tangem.data.network.ElectrumRequest
 import com.tangem.data.nfc.VerifyCardTask
 import com.tangem.domain.cardReader.CardProtocol
 import com.tangem.domain.cardReader.NfcManager