diff --git a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
index 2fef3db..f72377b 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
@@ -52,12 +52,9 @@ internal object PreferenceConstants {
         # eUICC standard
         $EUICC_DEFAULT_ISDR_AID
 
-        # ESTKme AUX (deprecated, use SE0 instead)
+        # eSTK.me
         A06573746B6D65FFFFFFFF4953442D52
 
-        # ESTKme SE0
-        A06573746B6D65FFFF4953442D522030
-
         # eSIM.me
         A0000005591010000000008900000300
 
diff --git a/app-common/src/main/res/xml/pref_settings.xml b/app-common/src/main/res/xml/pref_settings.xml
index 831b04d..9dc84ca 100644
--- a/app-common/src/main/res/xml/pref_settings.xml
+++ b/app-common/src/main/res/xml/pref_settings.xml
@@ -104,14 +104,12 @@
         <Preference
             app:iconSpaceReserved="false"
             app:title="@string/pref_info_app_version"
-            app:enableCopying="true"
             app:key="pref_info_app_version" />
 
         <Preference
             app:iconSpaceReserved="false"
             app:title="@string/pref_info_source_code"
             app:summary="@string/pref_info_source_code_url"
-            app:enableCopying="true"
             app:key="pref_info_source_code">
             <intent
                 android:action="android.intent.action.VIEW"
diff --git a/app-unpriv/build.gradle.kts b/app-unpriv/build.gradle.kts
index d59fe71..66a60b4 100644
--- a/app-unpriv/build.gradle.kts
+++ b/app-unpriv/build.gradle.kts
@@ -27,9 +27,6 @@ android {
     }
 
     buildTypes {
-        defaultConfig {
-            versionNameSuffix = "-unpriv"
-        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 69e0db5..b9c2100 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,9 +23,6 @@ android {
     }
 
     buildTypes {
-        defaultConfig {
-            versionNameSuffix = "-priv"
-        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
index ef07c43..24f0235 100644
--- a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
+++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
@@ -16,7 +16,7 @@ val Project.gitVersionCode: Int
                 standardOutput = stdout
             }
             stdout.toString("utf-8").trim('\n').toInt()
-        } catch (_: Exception) {
+        } catch (e: Exception) {
             0
         }
 
@@ -29,7 +29,7 @@ val Project.gitVersionName: String
                 standardOutput = stdout
             }
             stdout.toString("utf-8").trim('\n')
-        } catch (_: Exception) {
+        } catch (e: Exception) {
             "Unknown"
         }
 
@@ -38,7 +38,7 @@ class MyVersioningPlugin: Plugin<Project> {
         target.configure<BaseAppModuleExtension> {
             defaultConfig {
                 versionCode = target.gitVersionCode
-                versionName = target.gitVersionName.removePrefix("unpriv-")
+                versionName = target.gitVersionName
             }
 
             applicationVariants.all {
diff --git a/libs/lpac-jni/src/main/jni/Application.mk b/libs/lpac-jni/src/main/jni/Application.mk
index c1d3766..2112196 100644
--- a/libs/lpac-jni/src/main/jni/Application.mk
+++ b/libs/lpac-jni/src/main/jni/Application.mk
@@ -1,5 +1,4 @@
 APP_ABI := all
 APP_SHORT_COMMANDS := true
 APP_CFLAGS := -Wno-compound-token-split-by-macro
-APP_LDFLAGS := -Wl,--build-id=none -z muldefs
-APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
+APP_LDFLAGS := -Wl,--build-id=none -z muldefs
\ No newline at end of file
diff --git a/libs/lpac-jni/src/main/jni/lpac-jni.mk b/libs/lpac-jni/src/main/jni/lpac-jni.mk
index dad173c..c0bcee7 100644
--- a/libs/lpac-jni/src/main/jni/lpac-jni.mk
+++ b/libs/lpac-jni/src/main/jni/lpac-jni.mk
@@ -1,5 +1,4 @@
 LOCAL_PATH := $(call my-dir)
-LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
 
 # function to find all *.c files under a directory
 define all-c-files-under