diff --git a/app/src/main/java/im/status/keycard/connect/card/ChangePUKCommand.kt b/app/src/main/java/im/status/keycard/connect/card/ChangePUKCommand.kt
index ce9b5f2..a30301f 100644
--- a/app/src/main/java/im/status/keycard/connect/card/ChangePUKCommand.kt
+++ b/app/src/main/java/im/status/keycard/connect/card/ChangePUKCommand.kt
@@ -1,9 +1,5 @@
 package im.status.keycard.connect.card
 
-import im.status.keycard.connect.Registry
-import java.io.IOException
-import java.lang.Exception
-
 class ChangePUKCommand(private val newPUK: String) : CardCommand {
     //TODO: like for the PINCache, no strings should be used here
     override fun run(context: CardScriptExecutor.ScriptContext): CardCommand.Result {
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
index 7eb56fa..cc844f1 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ChangePINActivity.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.widget.EditText
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
-import im.status.keycard.connect.card.CardCommand
 import im.status.keycard.connect.card.ChangePINCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
 
diff --git a/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
index 827f81a..08e19a3 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/ChangePairingPasswordActivity.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.widget.EditText
 import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
-import im.status.keycard.connect.card.ChangePUKCommand
 import im.status.keycard.connect.card.ChangePairingPasswordCommand
 import im.status.keycard.connect.card.scriptWithAuthentication
 
diff --git a/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt b/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
index 68cbe89..1eebbc0 100644
--- a/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
+++ b/app/src/main/java/im/status/keycard/connect/ui/MainActivity.kt
@@ -13,8 +13,6 @@ import im.status.keycard.connect.R
 import im.status.keycard.connect.Registry
 import im.status.keycard.connect.card.*
 import kotlin.reflect.KClass
-import androidx.core.app.ComponentActivity.ExtraData
-import androidx.core.content.ContextCompat.getSystemService
 import com.google.zxing.client.android.Intents
 import im.status.keycard.connect.data.*
 
@@ -104,6 +102,10 @@ class MainActivity : AppCompatActivity(), ScriptListener {
         this.startActivityForResult(intent, REQ_LOADKEY)
     }
 
+    fun removeKey(@Suppress("UNUSED_PARAMETER") view: View) {
+        Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(RemoveKeyCommand()))
+    }
+
     private fun loadKeyHandler(resultCode: Int, data: Intent?) {
         if (resultCode != Activity.RESULT_OK || data == null) return
 
@@ -113,10 +115,6 @@ class MainActivity : AppCompatActivity(), ScriptListener {
         Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(LoadKeyCommand(loadType, mnemonic)))
     }
 
-    fun removeKey(@Suppress("UNUSED_PARAMETER") view: View) {
-        Registry.scriptExecutor.runScript(scriptWithAuthentication().plus(RemoveKeyCommand()))
-    }
-
     private fun startCommand(activity: KClass<out Activity>) {
         val intent = Intent(this, activity.java)
         startActivity(intent)