diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f1e4c8d..2f0a06d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION" />
 
     <application
-        android:name=".OpenEuiccApplication"
+        android:name=".OpenEUICCApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/im/angry/openeuicc/OpenEUICCApplication.kt b/app/src/main/java/im/angry/openeuicc/OpenEUICCApplication.kt
new file mode 100644
index 0000000..0ae3505
--- /dev/null
+++ b/app/src/main/java/im/angry/openeuicc/OpenEUICCApplication.kt
@@ -0,0 +1,8 @@
+package im.angry.openeuicc
+
+import android.app.Application
+import im.angry.openeuicc.core.EuiccChannelManager
+
+class OpenEUICCApplication : Application() {
+    val euiccChannelManager = EuiccChannelManager(this)
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt b/app/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
deleted file mode 100644
index 30e021a..0000000
--- a/app/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package im.angry.openeuicc
-
-import android.app.Application
-import android.telephony.TelephonyManager
-import im.angry.openeuicc.core.EuiccChannelManager
-
-class OpenEuiccApplication : Application() {
-    val telephonyManager by lazy {
-        getSystemService(TelephonyManager::class.java)!!
-    }
-
-    val euiccChannelManager by lazy {
-        EuiccChannelManager(this)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt b/app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
index 1201d60..74d98ad 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
@@ -2,9 +2,9 @@ package im.angry.openeuicc.ui
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import im.angry.openeuicc.OpenEUICCApplication
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.openEuiccApplication
 
 interface EuiccFragmentMarker
 
@@ -20,7 +20,7 @@ val <T> T.slotId: Int where T: Fragment, T: EuiccFragmentMarker
     get() = requireArguments().getInt("slotId")
 
 val <T> T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccFragmentMarker
-    get() = openEuiccApplication.euiccChannelManager
+    get() = (requireActivity().application as OpenEUICCApplication).euiccChannelManager
 
 val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccFragmentMarker
     get() =
diff --git a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 94598ea..503fac4 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -12,11 +12,11 @@ import android.widget.Spinner
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
+import im.angry.openeuicc.OpenEUICCApplication
 import im.angry.openeuicc.R
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.databinding.ActivityMainBinding
 import im.angry.openeuicc.util.dsdsEnabled
-import im.angry.openeuicc.util.openEuiccApplication
 import im.angry.openeuicc.util.supportsDSDS
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -43,9 +43,9 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        tm = openEuiccApplication.telephonyManager
+        tm = getSystemService(TelephonyManager::class.java)
 
-        manager = openEuiccApplication.euiccChannelManager
+        manager = (application as OpenEUICCApplication).euiccChannelManager
 
         spinnerAdapter = ArrayAdapter<String>(this, android.R.layout.simple_spinner_item)
 
diff --git a/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
index 477837f..24c1ad8 100644
--- a/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
+++ b/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
@@ -1,18 +1,9 @@
 package im.angry.openeuicc.util
 
-import android.app.Activity
 import android.content.res.Resources
 import android.graphics.Rect
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import im.angry.openeuicc.OpenEuiccApplication
-
-val Activity.openEuiccApplication: OpenEuiccApplication
-    get() = application as OpenEuiccApplication
-
-val Fragment.openEuiccApplication: OpenEuiccApplication
-    get() = requireActivity().openEuiccApplication
 
 // Source: <https://stackoverflow.com/questions/12478520/how-to-set-dialogfragments-width-and-height>
 /**