diff --git a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
index ba4c5c6..9150641 100644
--- a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
+++ b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
@@ -36,24 +36,9 @@ private fun initializeInterceptors() {
     }
     
     PkgConfig.initialize()
-    clearKeyStore()
     Logger.i("Interceptors initialized successfully")
 }
 
-private fun clearKeyStore() {
-    val targetUIDs = PkgConfig.getTargetPackageUids()
-    Logger.i("Clearing keystore for ${targetUIDs.size} target packages")
-
-    targetUIDs.forEach { uid ->
-        kotlin.runCatching {
-            android.security.AndroidKeyStoreMaintenance.clearNamespace(0, uid.toLong())
-            Logger.d("Cleared keystore namespace for UID: $uid")
-        }.onFailure {
-            Logger.e("Failed to clear keystore for UID: $uid", it)
-        }
-    }
-}
-
 private fun selectKeystoreInterceptor() = when {
     Build.VERSION.SDK_INT in Build.VERSION_CODES.Q..Build.VERSION_CODES.R -> {
         Logger.i("Using KeystoreInterceptor for Android Q/R (SDK ${Build.VERSION.SDK_INT})")
diff --git a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
index 127359e..4774d67 100644
--- a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
+++ b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
@@ -10,7 +10,6 @@ import android.os.Build
 import android.os.FileObserver
 import android.os.IBinder
 import android.os.IInterface
-import android.os.Process
 import android.os.ServiceManager
 import io.github.beakthoven.TrickyStoreOSS.AttestUtils.TEEStatus
 import io.github.beakthoven.TrickyStoreOSS.KeyBoxUtils
@@ -176,33 +175,6 @@ object PkgConfig {
         return false
     }.onFailure { Logger.e("failed to get packages", it) }.getOrNull() ?: false
 
-    private fun getTargetPackages(): Set<String> {
-        return (hackPackages + generatePackages + packageModes.keys).toSet()
-    }
-
-    fun getTargetPackageUids(): Set<Int> {
-        val result = mutableSetOf<Int>()
-        val pm = getPm() ?: return emptySet()
-        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 0L else 0
-        val userId = Process.myUid() / 100000
-
-        getTargetPackages().forEach { pkg ->
-            kotlin.runCatching {
-                val appInfo = pm.getApplicationInfo(pkg, flags, userId)
-                if (appInfo != null) {
-                    result.add(appInfo.uid)
-                    Logger.d("Got UID ${appInfo.uid} for package: $pkg")
-                } else {
-                    Logger.e("ApplicationInfo is null for package: $pkg")
-                }
-            }.onFailure {
-                Logger.e("Failed to get UID for package: $pkg", it)
-            }
-        }
-
-        return result
-    }
-
     @Volatile
     var _customPatchLevel: CustomPatchLevel? = null
 
diff --git a/stub/src/main/java/android/content/pm/IPackageManager.java b/stub/src/main/java/android/content/pm/IPackageManager.java
index 0b32343..d5eeaf1 100644
--- a/stub/src/main/java/android/content/pm/IPackageManager.java
+++ b/stub/src/main/java/android/content/pm/IPackageManager.java
@@ -10,10 +10,6 @@ import android.os.IBinder;
 public interface IPackageManager {
     String[] getPackagesForUid(int uid);
 
-    ApplicationInfo getApplicationInfo(String packageName, int flags, int userId);
-
-    ApplicationInfo getApplicationInfo(String packageName, long flags, int userId);
-
     PackageInfo getPackageInfo(String packageName, long flags, int userId);
 
     PackageInfo getPackageInfo(String packageName, int flags, int userId);
diff --git a/stub/src/main/java/android/security/AndroidKeyStoreMaintenance.java b/stub/src/main/java/android/security/AndroidKeyStoreMaintenance.java
deleted file mode 100644
index a478f9c..0000000
--- a/stub/src/main/java/android/security/AndroidKeyStoreMaintenance.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2025 Dakkshesh <beakthoven@gmail.com>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package android.security;
-
-public class AndroidKeyStoreMaintenance {
-
-    public static int clearNamespace(int domain, long namespace) {
-        throw new RuntimeException("");
-    }
-}
\ No newline at end of file