diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt b/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
index 692f239878..05f741230d 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
@@ -76,31 +76,20 @@ object CoinEngineFactory {
         var result: CoinEngine?
         try {
             result = EthEngine(context)// CardanoEngine(context)
-
         } catch (e: Exception) {
             e.printStackTrace()
             result = null
             Log.e(TAG, "Can't create Cardano CoinEngine!")
         }
         return result
-
-//        var result: EthEngine?
-//        try {
-//            result = EthEngine(context)
-//
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            result = null
-//            Log.e(TAG, "Can't create Cardano CoinEngine!")
-//        }
-//        return result
     }
 
     fun createCardanoData(): CoinData? {
-        return EthData()// CardanoData()
+        return CardanoData()
     }
 
     fun isCardano(blockchainID: String): Boolean {
-        return blockchainID==Blockchain.Ethereum.id
+        return blockchainID == Blockchain.Cardano.id
     }
+
 }
\ No newline at end of file
diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
index bbda35b010..0a13127068 100644
--- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
+++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
@@ -8,7 +8,6 @@ import android.nfc.Tag
 import android.os.Build
 import android.os.Bundle
 import android.text.Html
-import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
@@ -50,15 +49,12 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
     @Inject
     internal lateinit var toastHelper: ToastHelper
 
-    //    private lateinit var ctx: TangemContext
     private lateinit var nfcManager: NfcManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_prepare_transaction)
 
-
-
         App.navigatorComponent.inject(this)
         App.toastHelperComponent.inject(this)
 
diff --git a/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt
index d2d1302b68..9b6487a080 100644
--- a/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt
+++ b/app/src/tangemCardano/java/com/tangem/ui/SignTransactionActivity.kt
@@ -19,29 +19,26 @@ import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
 import com.tangem.card_android.android.nfc.NfcLifecycleObserver
 import com.tangem.card_android.android.reader.NfcManager
 import com.tangem.card_android.android.reader.NfcReader
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD
+import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.card_android.data.asBundle
+import com.tangem.card_common.data.TangemCard
 import com.tangem.card_common.reader.CardProtocol
+import com.tangem.card_common.tasks.CustomReadCardTask
+import com.tangem.card_common.tasks.OneTouchSignTask
 import com.tangem.card_common.tasks.SignTask
-import com.tangem.card_common.util.Util
+import com.tangem.card_common.util.Log
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
+import com.tangem.ui.activity.MainActivity
+import com.tangem.ui.activity.SendTransactionActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.layout_progress_horizontal.*
 import kotlinx.android.synthetic.main.layout_touch_card.*
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.tasks.CustomReadCardTask
-import com.tangem.card_common.tasks.OneTouchSignTask
-import com.tangem.card_common.util.Log
-import com.tangem.data.Blockchain
-import com.tangem.domain.wallet.cardano.CardanoData
-import com.tangem.ui.activity.MainActivity
-import com.tangem.ui.activity.SendTransactionActivity
 import kotlinx.coroutines.runBlocking
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine