diff --git a/app/src/main/java/com/tangem/di/NetworkComponent.java b/app/src/main/java/com/tangem/di/NetworkComponent.java
index f7367bdeb0..a58b5e7e1a 100644
--- a/app/src/main/java/com/tangem/di/NetworkComponent.java
+++ b/app/src/main/java/com/tangem/di/NetworkComponent.java
@@ -29,9 +29,6 @@ public interface NetworkComponent {
     @Named(Server.ApiRootstock.URL_ROOTSTOCK)
     Retrofit getRetrofitRootstock();
 
-//    @Named("Insight") //TODO:check
-//    Retrofit getRetrofitInsight(String insightURL);
-
     @Named("socket")
     Socket getSocket();
 
diff --git a/app/src/main/java/com/tangem/di/NetworkModule.java b/app/src/main/java/com/tangem/di/NetworkModule.java
index e4ce02ddc8..d540f79d73 100644
--- a/app/src/main/java/com/tangem/di/NetworkModule.java
+++ b/app/src/main/java/com/tangem/di/NetworkModule.java
@@ -41,16 +41,6 @@ class NetworkModule {
                 .build();
     }
 
-//    //@Singleton // TODO:check
-//    @Provides
-//    @Named("Insight")
-//    Retrofit provideRetrofitInsight(String insightURL) {
-//        return new Retrofit.Builder()
-//                .baseUrl(insightURL)
-//                .addConverterFactory(GsonConverterFactory.create())
-//                .build();
-//    }
-
     @Singleton
     @Provides
     @Named(Server.ApiEstimatefee.URL_ESTIMATEFEE)
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
index 8c9f086780..8a93a418b5 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
@@ -88,7 +88,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
                 try {
                     val engine = CoinEngineFactory.create(ctx)
-                    val eqFee = engine!!.evaluateFeeEquivalent(etFee!!.text.toString())
+                    val eqFee = engine?.evaluateFeeEquivalent(etFee!!.text.toString())
                     tvFeeEquivalent.text = eqFee
 
                     if (!ctx.coinData!!.amountEquivalentDescriptionAvailable) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c04498f74..c56cbf03da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,15 @@
     <string name="reading">READING…</string>
     <string name="verifying">VERIFYING…</string>
     <string name="debug_settings">Дебаг</string>
+    <string name="select_loading_method">Select loading method</string>
+    <string name="via_cryptonit">via CRYPTONIT</string>
+    <string name="via_cryptonit2">via CRYPTONIT2</string>
+    <string name="via_kraken">via KRAKEN</string>
+    <string name="in_app">Another wallet app</string>
+    <string name="load_via_share_address">Share address</string>
+    <string name="load_via_qr">Show QR-code</string>
+    <string name="show_wallet_qr_code">LOAD</string>
+    <string name="beta">BETA</string>
 
     <!-- dialogs -->
     <string name="device_is_rooted">Your Android device is rooted. Security at risk!</string>
@@ -62,14 +71,6 @@
     <string name="please_hold_banknote">Please hold the banknote firmly\n until the operation is completed…</string>
     <string name="you_may_be_required_to_repeat">You may be required to repeat this operation a few times depending on the NFC performance of your smartphone.\n This is made for safety of your funds.</string>
 
-    <string name="select_loading_method">Select loading method</string>
-    <string name="via_cryptonit">via CRYPTONIT</string>
-    <string name="via_cryptonit2">via CRYPTONIT2</string>
-    <string name="via_kraken">via KRAKEN</string>
-    <string name="in_app">Another wallet app</string>
-    <string name="load_via_share_address">Share address</string>
-    <string name="load_via_qr">Show QR-code</string>
-    <string name="show_wallet_qr_code">LOAD</string>
     <!-- menu main -->
     <string name="clean_up">Clean up</string>
     <string name="manage_user_pin_1">Manage user PIN1…</string>
@@ -128,9 +129,6 @@
     <string name="new_scan">NEW SCAN</string>
     <string name="verifying_in_blockchain">Verifying in blockchain…</string>
 
-    <!-- LogoActivity -->
-    <string name="beta">BETA</string>
-
     <!-- CreateNewWalletActivity, PurgeActivity, SignTransactionActivity -->
     <string name="now_touch_the_banknote_with_id">Now touch the banknote with ID</string>
     <string name="to_create_the_wallet">to create the wallet</string>
@@ -258,4 +256,5 @@
     <string name="kraken_not_enough_account_data">Please enter account data</string>
     <string name="kraken_request_balance">Get balance</string>
     <string name="kraken_request_withdrawal">Withdrawal</string>
+
 </resources>
\ No newline at end of file