diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt
index 1ceeba3..617cbec 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt
@@ -1,8 +1,6 @@
 package im.angry.openeuicc.ui
 
-import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.provider.Settings
 import android.view.Menu
 import android.view.MenuInflater
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt
index 418b1aa..99824ff 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt
@@ -23,16 +23,13 @@ class SIMToolkit(private val context: Context) {
 
     operator fun get(slotId: Int): Slot? = when (slotId) {
         -1, EuiccChannelManager.USB_CHANNEL_ID -> null
-        else -> Slot(context, buildSet {
+        else -> Slot(context.packageManager, buildSet {
             addAll(slots.getOrDefault(slotId, emptySet()))
             addAll(slots.getOrDefault(-1, emptySet()))
         })
     }
 
-    data class Slot(private val context: Context, private val components: Set<ComponentName>) {
-        private val packageManager: PackageManager
-            get() = context.packageManager
-
+    data class Slot(private val packageManager: PackageManager, private val components: Set<ComponentName>) {
         private val packageNames: Iterable<String>
             get() = components.map(ComponentName::getPackageName).toSet()