diff --git a/api/android/revanced-library.api b/api/android/revanced-library.api
index cf91bf6..3deedb0 100644
--- a/api/android/revanced-library.api
+++ b/api/android/revanced-library.api
@@ -1,13 +1,8 @@
 public final class app/revanced/library/ApkSigner {
 	public static final field INSTANCE Lapp/revanced/library/ApkSigner;
-	public final fun newApkSigner (Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)Lapp/revanced/library/ApkSigner$Signer;
 	public final fun newApkSigner (Ljava/lang/String;Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newApkSigner (Ljava/lang/String;Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newApkSigner (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newKeyStore (Ljava/io/OutputStream;Ljava/lang/String;Ljava/util/Set;)V
 	public final fun newKeyStore (Ljava/util/Set;)Ljava/security/KeyStore;
 	public final fun newPrivateKeyCertificatePair (Ljava/lang/String;Ljava/util/Date;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun readKeyCertificatePair (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
 	public final fun readKeyStore (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/KeyStore;
 	public final fun readPrivateKeyCertificatePair (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
 }
@@ -26,19 +21,12 @@ public final class app/revanced/library/ApkSigner$PrivateKeyCertificatePair {
 }
 
 public final class app/revanced/library/ApkSigner$Signer {
-	public final fun signApk (Lcom/android/tools/build/apkzlib/zip/ZFile;)V
-	public final fun signApk (Ljava/io/File;)V
 	public final fun signApk (Ljava/io/File;Ljava/io/File;)V
 }
 
 public final class app/revanced/library/ApkUtils {
 	public static final field INSTANCE Lapp/revanced/library/ApkUtils;
 	public final fun applyTo (Lapp/revanced/patcher/PatcherResult;Ljava/io/File;)V
-	public final fun newPrivateKeyCertificatePair (Lapp/revanced/library/ApkUtils$PrivateKeyCertificatePairDetails;Lapp/revanced/library/ApkUtils$KeyStoreDetails;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun readPrivateKeyCertificatePairFromKeyStore (Lapp/revanced/library/ApkUtils$KeyStoreDetails;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun sign (Ljava/io/File;Lapp/revanced/library/ApkUtils$SigningOptions;)V
-	public final fun sign (Ljava/io/File;Ljava/io/File;Lapp/revanced/library/ApkUtils$SigningOptions;)V
-	public final fun sign (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)V
 	public final fun signApk (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Lapp/revanced/library/ApkUtils$KeyStoreDetails;)V
 }
 
@@ -59,35 +47,6 @@ public final class app/revanced/library/ApkUtils$PrivateKeyCertificatePairDetail
 	public final fun getValidUntil ()Ljava/util/Date;
 }
 
-public final class app/revanced/library/ApkUtils$SigningOptions {
-	public fun <init> (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getAlias ()Ljava/lang/String;
-	public final fun getKeyStore ()Ljava/io/File;
-	public final fun getKeyStorePassword ()Ljava/lang/String;
-	public final fun getPassword ()Ljava/lang/String;
-	public final fun getSigner ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/Options {
-	public static final field INSTANCE Lapp/revanced/library/Options;
-	public final fun deserialize (Ljava/lang/String;)[Lapp/revanced/library/Options$Patch;
-	public final fun serialize (Ljava/util/Set;Z)Ljava/lang/String;
-	public static synthetic fun serialize$default (Lapp/revanced/library/Options;Ljava/util/Set;ZILjava/lang/Object;)Ljava/lang/String;
-	public final fun setOptions (Ljava/util/Set;Ljava/io/File;)V
-	public final fun setOptions (Ljava/util/Set;Ljava/lang/String;)V
-}
-
-public final class app/revanced/library/Options$Patch {
-	public final fun getOptions ()Ljava/util/List;
-	public final fun getPatchName ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/Options$Patch$Option {
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getValue ()Ljava/lang/Object;
-}
-
 public final class app/revanced/library/OptionsKt {
 	public static final fun setOptions (Ljava/util/Set;Ljava/util/Map;)V
 }
@@ -97,40 +56,6 @@ public final class app/revanced/library/PatchKt {
 	public static synthetic fun mostCommonCompatibleVersions$default (Ljava/util/Set;Ljava/util/Set;ZILjava/lang/Object;)Ljava/util/Map;
 }
 
-public final class app/revanced/library/PatchUtils {
-	public static final field INSTANCE Lapp/revanced/library/PatchUtils;
-	public final fun getMostCommonCompatibleVersions (Ljava/util/Set;Ljava/util/Set;Z)Ljava/util/Map;
-	public static synthetic fun getMostCommonCompatibleVersions$default (Lapp/revanced/library/PatchUtils;Ljava/util/Set;Ljava/util/Set;ZILjava/lang/Object;)Ljava/util/Map;
-}
-
-public final class app/revanced/library/PatchUtils$Json {
-	public static final field INSTANCE Lapp/revanced/library/PatchUtils$Json;
-	public final fun deserialize (Ljava/io/InputStream;Ljava/lang/Class;)Ljava/util/Set;
-	public final fun serialize (Ljava/util/Set;Lkotlin/jvm/functions/Function1;ZLjava/io/OutputStream;)V
-	public static synthetic fun serialize$default (Lapp/revanced/library/PatchUtils$Json;Ljava/util/Set;Lkotlin/jvm/functions/Function1;ZLjava/io/OutputStream;ILjava/lang/Object;)V
-}
-
-public final class app/revanced/library/PatchUtils$Json$FullJsonPatch : app/revanced/library/PatchUtils$Json$JsonPatch {
-	public final fun getCompatiblePackages ()Ljava/util/Set;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getOptions ()Ljava/util/Map;
-	public final fun getUse ()Z
-}
-
-public final class app/revanced/library/PatchUtils$Json$FullJsonPatch$FullJsonPatchOption {
-	public final fun getDefault ()Ljava/lang/Object;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getRequired ()Z
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getType ()Lkotlin/reflect/KType;
-	public final fun getValues ()Ljava/util/Map;
-}
-
-public abstract interface class app/revanced/library/PatchUtils$Json$JsonPatch {
-}
-
 public final class app/revanced/library/SerializationKt {
 	public static final fun serializeTo (Ljava/util/Set;Ljava/io/OutputStream;Z)V
 	public static synthetic fun serializeTo$default (Ljava/util/Set;Ljava/io/OutputStream;ZILjava/lang/Object;)V
@@ -141,52 +66,6 @@ public final class app/revanced/library/Utils {
 	public final fun isAndroidEnvironment ()Z
 }
 
-public abstract class app/revanced/library/adb/AdbManager {
-	public static final field Companion Lapp/revanced/library/adb/AdbManager$Companion;
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	protected abstract fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class app/revanced/library/adb/AdbManager$Apk {
-	public fun <init> (Ljava/io/File;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getFile ()Ljava/io/File;
-	public final fun getPackageName ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/adb/AdbManager$Companion {
-	public final fun getAdbManager (Ljava/lang/String;Z)Lapp/revanced/library/adb/AdbManager;
-	public static synthetic fun getAdbManager$default (Lapp/revanced/library/adb/AdbManager$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lapp/revanced/library/adb/AdbManager;
-}
-
-public final class app/revanced/library/adb/AdbManager$DeviceNotFoundException : java/lang/Exception {
-	public fun <init> ()V
-}
-
-public final class app/revanced/library/adb/AdbManager$FailedToFindInstalledPackageException : java/lang/Exception {
-}
-
-public final class app/revanced/library/adb/AdbManager$PackageNameRequiredException : java/lang/Exception {
-}
-
-public final class app/revanced/library/adb/AdbManager$RootAdbManager : app/revanced/library/adb/AdbManager {
-	public static final field Utils Lapp/revanced/library/adb/AdbManager$RootAdbManager$Utils;
-	public synthetic fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class app/revanced/library/adb/AdbManager$RootAdbManager$Utils {
-}
-
-public final class app/revanced/library/adb/AdbManager$UserAdbManager : app/revanced/library/adb/AdbManager {
-	public synthetic fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
 public final class app/revanced/library/installation/command/AdbShellCommandRunner : app/revanced/library/installation/command/ShellCommandRunner {
 }
 
diff --git a/api/jvm/revanced-library.api b/api/jvm/revanced-library.api
index dff6f4a..81007f9 100644
--- a/api/jvm/revanced-library.api
+++ b/api/jvm/revanced-library.api
@@ -1,13 +1,8 @@
 public final class app/revanced/library/ApkSigner {
 	public static final field INSTANCE Lapp/revanced/library/ApkSigner;
-	public final fun newApkSigner (Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)Lapp/revanced/library/ApkSigner$Signer;
 	public final fun newApkSigner (Ljava/lang/String;Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newApkSigner (Ljava/lang/String;Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newApkSigner (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$Signer;
-	public final fun newKeyStore (Ljava/io/OutputStream;Ljava/lang/String;Ljava/util/Set;)V
 	public final fun newKeyStore (Ljava/util/Set;)Ljava/security/KeyStore;
 	public final fun newPrivateKeyCertificatePair (Ljava/lang/String;Ljava/util/Date;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun readKeyCertificatePair (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
 	public final fun readKeyStore (Ljava/io/InputStream;Ljava/lang/String;)Ljava/security/KeyStore;
 	public final fun readPrivateKeyCertificatePair (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
 }
@@ -26,19 +21,12 @@ public final class app/revanced/library/ApkSigner$PrivateKeyCertificatePair {
 }
 
 public final class app/revanced/library/ApkSigner$Signer {
-	public final fun signApk (Lcom/android/tools/build/apkzlib/zip/ZFile;)V
-	public final fun signApk (Ljava/io/File;)V
 	public final fun signApk (Ljava/io/File;Ljava/io/File;)V
 }
 
 public final class app/revanced/library/ApkUtils {
 	public static final field INSTANCE Lapp/revanced/library/ApkUtils;
 	public final fun applyTo (Lapp/revanced/patcher/PatcherResult;Ljava/io/File;)V
-	public final fun newPrivateKeyCertificatePair (Lapp/revanced/library/ApkUtils$PrivateKeyCertificatePairDetails;Lapp/revanced/library/ApkUtils$KeyStoreDetails;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun readPrivateKeyCertificatePairFromKeyStore (Lapp/revanced/library/ApkUtils$KeyStoreDetails;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;
-	public final fun sign (Ljava/io/File;Lapp/revanced/library/ApkUtils$SigningOptions;)V
-	public final fun sign (Ljava/io/File;Ljava/io/File;Lapp/revanced/library/ApkUtils$SigningOptions;)V
-	public final fun sign (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;)V
 	public final fun signApk (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Lapp/revanced/library/ApkUtils$KeyStoreDetails;)V
 }
 
@@ -59,35 +47,6 @@ public final class app/revanced/library/ApkUtils$PrivateKeyCertificatePairDetail
 	public final fun getValidUntil ()Ljava/util/Date;
 }
 
-public final class app/revanced/library/ApkUtils$SigningOptions {
-	public fun <init> (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getAlias ()Ljava/lang/String;
-	public final fun getKeyStore ()Ljava/io/File;
-	public final fun getKeyStorePassword ()Ljava/lang/String;
-	public final fun getPassword ()Ljava/lang/String;
-	public final fun getSigner ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/Options {
-	public static final field INSTANCE Lapp/revanced/library/Options;
-	public final fun deserialize (Ljava/lang/String;)[Lapp/revanced/library/Options$Patch;
-	public final fun serialize (Ljava/util/Set;Z)Ljava/lang/String;
-	public static synthetic fun serialize$default (Lapp/revanced/library/Options;Ljava/util/Set;ZILjava/lang/Object;)Ljava/lang/String;
-	public final fun setOptions (Ljava/util/Set;Ljava/io/File;)V
-	public final fun setOptions (Ljava/util/Set;Ljava/lang/String;)V
-}
-
-public final class app/revanced/library/Options$Patch {
-	public final fun getOptions ()Ljava/util/List;
-	public final fun getPatchName ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/Options$Patch$Option {
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getValue ()Ljava/lang/Object;
-}
-
 public final class app/revanced/library/OptionsKt {
 	public static final fun setOptions (Ljava/util/Set;Ljava/util/Map;)V
 }
@@ -97,40 +56,6 @@ public final class app/revanced/library/PatchKt {
 	public static synthetic fun mostCommonCompatibleVersions$default (Ljava/util/Set;Ljava/util/Set;ZILjava/lang/Object;)Ljava/util/Map;
 }
 
-public final class app/revanced/library/PatchUtils {
-	public static final field INSTANCE Lapp/revanced/library/PatchUtils;
-	public final fun getMostCommonCompatibleVersions (Ljava/util/Set;Ljava/util/Set;Z)Ljava/util/Map;
-	public static synthetic fun getMostCommonCompatibleVersions$default (Lapp/revanced/library/PatchUtils;Ljava/util/Set;Ljava/util/Set;ZILjava/lang/Object;)Ljava/util/Map;
-}
-
-public final class app/revanced/library/PatchUtils$Json {
-	public static final field INSTANCE Lapp/revanced/library/PatchUtils$Json;
-	public final fun deserialize (Ljava/io/InputStream;Ljava/lang/Class;)Ljava/util/Set;
-	public final fun serialize (Ljava/util/Set;Lkotlin/jvm/functions/Function1;ZLjava/io/OutputStream;)V
-	public static synthetic fun serialize$default (Lapp/revanced/library/PatchUtils$Json;Ljava/util/Set;Lkotlin/jvm/functions/Function1;ZLjava/io/OutputStream;ILjava/lang/Object;)V
-}
-
-public final class app/revanced/library/PatchUtils$Json$FullJsonPatch : app/revanced/library/PatchUtils$Json$JsonPatch {
-	public final fun getCompatiblePackages ()Ljava/util/Set;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getOptions ()Ljava/util/Map;
-	public final fun getUse ()Z
-}
-
-public final class app/revanced/library/PatchUtils$Json$FullJsonPatch$FullJsonPatchOption {
-	public final fun getDefault ()Ljava/lang/Object;
-	public final fun getDescription ()Ljava/lang/String;
-	public final fun getKey ()Ljava/lang/String;
-	public final fun getRequired ()Z
-	public final fun getTitle ()Ljava/lang/String;
-	public final fun getType ()Lkotlin/reflect/KType;
-	public final fun getValues ()Ljava/util/Map;
-}
-
-public abstract interface class app/revanced/library/PatchUtils$Json$JsonPatch {
-}
-
 public final class app/revanced/library/SerializationKt {
 	public static final fun serializeTo (Ljava/util/Set;Ljava/io/OutputStream;Z)V
 	public static synthetic fun serializeTo$default (Ljava/util/Set;Ljava/io/OutputStream;ZILjava/lang/Object;)V
@@ -141,52 +66,6 @@ public final class app/revanced/library/Utils {
 	public final fun isAndroidEnvironment ()Z
 }
 
-public abstract class app/revanced/library/adb/AdbManager {
-	public static final field Companion Lapp/revanced/library/adb/AdbManager$Companion;
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	protected abstract fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class app/revanced/library/adb/AdbManager$Apk {
-	public fun <init> (Ljava/io/File;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getFile ()Ljava/io/File;
-	public final fun getPackageName ()Ljava/lang/String;
-}
-
-public final class app/revanced/library/adb/AdbManager$Companion {
-	public final fun getAdbManager (Ljava/lang/String;Z)Lapp/revanced/library/adb/AdbManager;
-	public static synthetic fun getAdbManager$default (Lapp/revanced/library/adb/AdbManager$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lapp/revanced/library/adb/AdbManager;
-}
-
-public final class app/revanced/library/adb/AdbManager$DeviceNotFoundException : java/lang/Exception {
-	public fun <init> ()V
-}
-
-public final class app/revanced/library/adb/AdbManager$FailedToFindInstalledPackageException : java/lang/Exception {
-}
-
-public final class app/revanced/library/adb/AdbManager$PackageNameRequiredException : java/lang/Exception {
-}
-
-public final class app/revanced/library/adb/AdbManager$RootAdbManager : app/revanced/library/adb/AdbManager {
-	public static final field Utils Lapp/revanced/library/adb/AdbManager$RootAdbManager$Utils;
-	public synthetic fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
-public final class app/revanced/library/adb/AdbManager$RootAdbManager$Utils {
-}
-
-public final class app/revanced/library/adb/AdbManager$UserAdbManager : app/revanced/library/adb/AdbManager {
-	public synthetic fun getInstaller ()Lapp/revanced/library/installation/installer/Installer;
-	public fun install (Lapp/revanced/library/adb/AdbManager$Apk;)Lkotlin/jvm/functions/Function1;
-	public fun uninstall (Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
-}
-
 public final class app/revanced/library/installation/command/AdbShellCommandRunner : app/revanced/library/installation/command/ShellCommandRunner {
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index fdad00f..f7586aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -59,7 +59,6 @@ kotlin {
             implementation(libs.bcpkix.jdk15on)
             implementation(libs.guava)
             implementation(libs.jadb)
-            implementation(libs.jackson.module.kotlin)
             implementation(libs.kotlin.reflect)
             implementation(libs.kotlinx.serialization.json)
             implementation(libs.revanced.patcher)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3a881e4..3fd7d4a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,6 @@ bcpkix-jdk15on = "1.70"
 binary-compatibility-validator = "0.15.1"
 core-ktx = "1.13.1"
 guava = "33.0.0-jre"
-jackson-module-kotlin = "2.16.1"
 jadb = "1.2.1"
 kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
@@ -18,7 +17,6 @@ apksig = { module = "com.android.tools.build:apksig", version.ref = "android" }
 bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkix-jdk15on" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
-jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-module-kotlin" }
 jadb = { module = "app.revanced:jadb", version.ref = "jadb" } # Fork with Shell v2 support.
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..2c35211 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f203e9..68e8816 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dist
\ No newline at end of file
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..f5feea6 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,69 +15,104 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..9d21a21 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/src/commonMain/kotlin/app/revanced/library/ApkSigner.kt b/src/commonMain/kotlin/app/revanced/library/ApkSigner.kt
index b653fe4..e020576 100644
--- a/src/commonMain/kotlin/app/revanced/library/ApkSigner.kt
+++ b/src/commonMain/kotlin/app/revanced/library/ApkSigner.kt
@@ -1,9 +1,6 @@
 package app.revanced.library
 
 import com.android.apksig.ApkSigner.SignerConfig
-import com.android.tools.build.apkzlib.sign.SigningExtension
-import com.android.tools.build.apkzlib.sign.SigningOptions
-import com.android.tools.build.apkzlib.zip.ZFile
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
 import org.bouncycastle.cert.X509v3CertificateBuilder
@@ -13,7 +10,6 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import java.io.OutputStream
 import java.math.BigInteger
 import java.security.*
 import java.security.cert.X509Certificate
@@ -197,105 +193,6 @@ object ApkSigner {
         ),
     )
 
-    /**
-     * Read a [PrivateKeyCertificatePair] from a keystore entry.
-     *
-     * @param keyStore The keystore to read the entry from.
-     * @param keyStoreEntryAlias The alias of the key store entry to read.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The read [PrivateKeyCertificatePair].
-     *
-     * @throws IllegalArgumentException If the keystore does not contain the given alias or the password is invalid.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun readKeyCertificatePair(
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = readPrivateKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword)
-
-    /**
-     * Create a new keystore with a new keypair and saves it to the given [keyStoreOutputStream].
-     *
-     * @param keyStoreOutputStream The stream to write the keystore to.
-     * @param keyStorePassword The password for the keystore.
-     * @param entries The entries to add to the keystore.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newKeyStore(
-        keyStoreOutputStream: OutputStream,
-        keyStorePassword: String?,
-        entries: Set<KeyStoreEntry>,
-    ) = newKeyStore(entries).store(
-        keyStoreOutputStream,
-        keyStorePassword?.toCharArray(),
-    )
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param privateKeyCertificatePair The private key and certificate pair to use for signing.
-     *
-     * @return The new [Signer].
-     *
-     * @see PrivateKeyCertificatePair
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(privateKeyCertificatePair: PrivateKeyCertificatePair) =
-        Signer(
-            SigningExtension(
-                SigningOptions.builder()
-                    .setMinSdkVersion(21) // TODO: Extracting from the target APK would be ideal.
-                    .setV1SigningEnabled(true)
-                    .setV2SigningEnabled(true)
-                    .setCertificates(privateKeyCertificatePair.certificate)
-                    .setKey(privateKeyCertificatePair.privateKey)
-                    .build(),
-            ),
-        )
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param signer The name of the signer.
-     * @param keyStore The keystore to use for signing.
-     * @param keyStoreEntryAlias The alias of the key store entry to use for signing.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The new [Signer].
-     *
-     * @see KeyStore
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(
-        signer: String,
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = newApkSigner(signer, readKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword))
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param keyStore The keystore to use for signing.
-     * @param keyStoreEntryAlias The alias of the key store entry to use for signing.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The new [Signer].
-     *
-     * @see KeyStore
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = newApkSigner("ReVanced", readKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword))
-
     /**
      * An entry in a keystore.
      *
@@ -322,48 +219,11 @@ object ApkSigner {
         val certificate: X509Certificate,
     )
 
-    class Signer {
-        private val signerBuilder: com.android.apksig.ApkSigner.Builder?
-        private val signingExtension: SigningExtension?
-
-        internal constructor(signerBuilder: com.android.apksig.ApkSigner.Builder) {
-            this.signerBuilder = signerBuilder
-            signingExtension = null
-        }
-
+    class Signer internal constructor(private val signerBuilder: com.android.apksig.ApkSigner.Builder) {
         fun signApk(inputApkFile: File, outputApkFile: File) {
             logger.info("Signing APK")
 
-            signerBuilder?.setInputApk(inputApkFile)?.setOutputApk(outputApkFile)?.build()?.sign()
-        }
-
-        @Deprecated("This constructor will be removed in the future.")
-        internal constructor(signingExtension: SigningExtension) {
-            signerBuilder = null
-            this.signingExtension = signingExtension
-        }
-
-        /**
-         * Sign an APK file.
-         *
-         * @param apkFile The APK file to sign.
-         */
-        @Deprecated("This method will be removed in the future.")
-        fun signApk(apkFile: File) = ZFile.openReadWrite(apkFile).use {
-            @Suppress("DEPRECATION")
-            signApk(it)
-        }
-
-        /**
-         * Sign an APK file.
-         *
-         * @param apkZFile The APK [ZFile] to sign.
-         */
-        @Deprecated("This method will be removed in the future.")
-        fun signApk(apkZFile: ZFile) {
-            logger.info("Signing ${apkZFile.file.name}")
-
-            signingExtension?.register(apkZFile)
+            signerBuilder.setInputApk(inputApkFile)?.setOutputApk(outputApkFile)?.build()?.sign()
         }
     }
 }
diff --git a/src/commonMain/kotlin/app/revanced/library/ApkUtils.kt b/src/commonMain/kotlin/app/revanced/library/ApkUtils.kt
index b56c62c..a42cb80 100644
--- a/src/commonMain/kotlin/app/revanced/library/ApkUtils.kt
+++ b/src/commonMain/kotlin/app/revanced/library/ApkUtils.kt
@@ -103,8 +103,7 @@ object ApkUtils {
      *
      * @return The newly created private key and certificate pair.
      */
-    @Deprecated("This method will be removed in the future.")
-    fun newPrivateKeyCertificatePair(
+    private fun newPrivateKeyCertificatePair(
         privateKeyCertificatePairDetails: PrivateKeyCertificatePairDetails,
         keyStoreDetails: KeyStoreDetails,
     ) = newPrivateKeyCertificatePair(
@@ -132,8 +131,7 @@ object ApkUtils {
      *
      * @return The private key and certificate pair.
      */
-    @Deprecated("This method will be removed in the future.")
-    fun readPrivateKeyCertificatePairFromKeyStore(
+    private fun readPrivateKeyCertificatePairFromKeyStore(
         keyStoreDetails: KeyStoreDetails,
     ) = ApkSigner.readPrivateKeyCertificatePair(
         ApkSigner.readKeyStore(
@@ -168,91 +166,6 @@ object ApkUtils {
         },
     ).signApk(inputApkFile, outputApkFile)
 
-    @Deprecated("This method will be removed in the future.")
-    private fun readOrNewPrivateKeyCertificatePair(
-        signingOptions: SigningOptions,
-    ): ApkSigner.PrivateKeyCertificatePair {
-        val privateKeyCertificatePairDetails = PrivateKeyCertificatePairDetails(
-            signingOptions.alias,
-            PrivateKeyCertificatePairDetails().validUntil,
-        )
-        val keyStoreDetails = KeyStoreDetails(
-            signingOptions.keyStore,
-            signingOptions.keyStorePassword,
-            signingOptions.alias,
-            signingOptions.password,
-        )
-
-        return if (keyStoreDetails.keyStore.exists()) {
-            readPrivateKeyCertificatePairFromKeyStore(keyStoreDetails)
-        } else {
-            newPrivateKeyCertificatePair(privateKeyCertificatePairDetails, keyStoreDetails)
-        }
-    }
-
-    /**
-     * Signs [inputApkFile] with the given options and saves the signed apk to [outputApkFile].
-     *
-     * @param inputApkFile The apk file to sign.
-     * @param outputApkFile The file to save the signed apk to.
-     * @param signer The name of the signer.
-     * @param privateKeyCertificatePair The private key and certificate pair to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun sign(
-        inputApkFile: File,
-        outputApkFile: File,
-        signer: String,
-        privateKeyCertificatePair: ApkSigner.PrivateKeyCertificatePair,
-    ) = ApkSigner.newApkSigner(
-        signer,
-        privateKeyCertificatePair,
-    ).signApk(inputApkFile, outputApkFile)
-
-    /**
-     * Signs the apk file with the given options.
-     *
-     * @param signingOptions The options to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun File.sign(signingOptions: SigningOptions) = ApkSigner.newApkSigner(
-        signingOptions.signer,
-        readOrNewPrivateKeyCertificatePair(signingOptions),
-    ).signApk(this)
-
-    /**
-     * Signs [inputApkFile] with the given options and saves the signed apk to [outputApkFile].
-     *
-     * @param inputApkFile The apk file to sign.
-     * @param outputApkFile The file to save the signed apk to.
-     * @param signingOptions The options to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun sign(inputApkFile: File, outputApkFile: File, signingOptions: SigningOptions) = sign(
-        inputApkFile,
-        outputApkFile,
-        signingOptions.signer,
-        readOrNewPrivateKeyCertificatePair(signingOptions),
-    )
-
-    /**
-     * Options for signing an apk.
-     *
-     * @param keyStore The keystore to use for signing.
-     * @param keyStorePassword The password for the keystore.
-     * @param alias The alias of the key store entry to use for signing.
-     * @param password The password for recovering the signing key.
-     * @param signer The name of the signer.
-     */
-    @Deprecated("This class will be removed in the future.")
-    class SigningOptions(
-        val keyStore: File,
-        val keyStorePassword: String?,
-        val alias: String = "ReVanced Key",
-        val password: String = "",
-        val signer: String = "ReVanced",
-    )
-
     /**
      * Details for a keystore.
      *
diff --git a/src/commonMain/kotlin/app/revanced/library/Commands.kt b/src/commonMain/kotlin/app/revanced/library/Commands.kt
deleted file mode 100644
index 3f25439..0000000
--- a/src/commonMain/kotlin/app/revanced/library/Commands.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-@file:Suppress("DeprecatedCallableAddReplaceWith")
-
-package app.revanced.library
-
-import app.revanced.library.installation.command.AdbShellCommandRunner
-import se.vidstige.jadb.JadbDevice
-import se.vidstige.jadb.ShellProcessBuilder
-import java.io.File
-
-@Deprecated("Do not use this anymore. Instead use AdbCommandRunner.")
-internal fun JadbDevice.buildCommand(
-    command: String,
-    su: Boolean = true,
-): ShellProcessBuilder {
-    if (su) return shellProcessBuilder("su -c \'$command\'")
-
-    val args = command.split(" ") as ArrayList<String>
-    val cmd = args.removeFirst()
-
-    return shellProcessBuilder(cmd, *args.toTypedArray())
-}
-
-@Suppress("DEPRECATION")
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.run(
-    command: String,
-    su: Boolean = true,
-) = buildCommand(command, su).start()
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.hasSu() = AdbShellCommandRunner(this).hasRootPermission()
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.push(
-    file: File,
-    targetFilePath: String,
-) = AdbShellCommandRunner(this).move(file, targetFilePath)
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.createFile(
-    targetFile: String,
-    content: String,
-) = AdbShellCommandRunner(this).write(content.byteInputStream(), targetFile)
diff --git a/src/commonMain/kotlin/app/revanced/library/Options.kt b/src/commonMain/kotlin/app/revanced/library/Options.kt
index 3775f3c..32ada70 100644
--- a/src/commonMain/kotlin/app/revanced/library/Options.kt
+++ b/src/commonMain/kotlin/app/revanced/library/Options.kt
@@ -4,17 +4,15 @@ package app.revanced.library
 
 import app.revanced.patcher.patch.OptionException
 import app.revanced.patcher.patch.Patch
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.File
 import java.util.logging.Logger
 
-private val logger = Logger.getLogger("Options")
-
 typealias PatchName = String
 typealias OptionKey = String
 typealias OptionValue = Any?
 typealias PatchesOptions = Map<PatchName, Map<OptionKey, OptionValue>>
 
+private val logger = Logger.getLogger("Options")
+
 /**
  * Set the options for a set of patches that have a name.
  *
@@ -31,107 +29,3 @@ fun Set<Patch<*>>.setOptions(options: PatchesOptions) = filter { it.name != null
         }
     }
 }
-
-@Suppress("unused")
-@Deprecated("Functions have been moved to top level.")
-object Options {
-    private val logger = Logger.getLogger(Options::class.java.name)
-
-    private val mapper = jacksonObjectMapper()
-
-    /**
-     * Serializes the options for a set of patches.
-     *
-     * @param patches The set of patches to serialize.
-     * @param prettyPrint Whether to pretty print the JSON.
-     * @return The JSON string containing the options.
-     */
-    @Deprecated("Functions have been moved to the Serialization class.")
-    fun serialize(
-        patches: Set<app.revanced.patcher.patch.Patch<*>>,
-        prettyPrint: Boolean = false,
-    ): String =
-        patches
-            .filter { it.options.any() }
-            .map { patch ->
-                Patch(
-                    patch.name!!,
-                    patch.options.values.map { option ->
-                        val optionValue =
-                            try {
-                                option.value
-                            } catch (e: OptionException) {
-                                logger.warning("Using default option value for the \"${patch.name}\" patch: ${e.message}")
-                                option.default
-                            }
-
-                        Patch.Option(option.key, optionValue)
-                    },
-                )
-            }
-            // See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
-            .distinctBy { it.patchName }
-            .let {
-                if (prettyPrint) {
-                    mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
-                } else {
-                    mapper.writeValueAsString(it)
-                }
-            }
-
-    /**
-     * Deserializes the options to a set of patches.
-     *
-     * @param json The JSON string containing the options.
-     * @return A set of [Patch]s.
-     * @see Patch
-     */
-    @Deprecated("Functions have been moved to the Serialization class.")
-    fun deserialize(json: String): Array<Patch> = mapper.readValue(json, Array<Patch>::class.java)
-
-    /**
-     * Sets the options for a set of patches.
-     *
-     * @param json The JSON string containing the options.
-     */
-    @Deprecated("Function has been moved to top level.")
-    fun Set<app.revanced.patcher.patch.Patch<*>>.setOptions(json: String) {
-        filter { it.options.any() }.let { patches ->
-            if (patches.isEmpty()) return
-
-            val jsonPatches = deserialize(json).associate {
-                it.patchName to it.options.associate { option -> option.key to option.value }
-            }
-
-            setOptions(jsonPatches)
-        }
-    }
-
-    /**
-     * Sets the options for a set of patches.
-     *
-     * @param file The file containing the JSON string containing the options.
-     * @see setOptions
-     */
-    @Deprecated("Function has been moved to top level.")
-    fun Set<app.revanced.patcher.patch.Patch<*>>.setOptions(file: File) = setOptions(file.readText())
-
-    /**
-     * Data class for a patch and its [Option]s.
-     *
-     * @property patchName The name of the patch.
-     * @property options The [Option]s for the patch.
-     */
-    class Patch internal constructor(
-        val patchName: String,
-        val options: List<Option>,
-    ) {
-        /**
-         * Data class for patch option.
-         *
-         * @property key The name of the option.
-         * @property value The value of the option.
-         */
-        class Option internal constructor(val key: String, val value: Any?)
-    }
-}
diff --git a/src/commonMain/kotlin/app/revanced/library/PatchUtils.kt b/src/commonMain/kotlin/app/revanced/library/PatchUtils.kt
deleted file mode 100644
index 23221e4..0000000
--- a/src/commonMain/kotlin/app/revanced/library/PatchUtils.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package app.revanced.library
-
-import app.revanced.patcher.patch.Option
-import app.revanced.patcher.patch.Package
-import app.revanced.patcher.patch.Patch
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.InputStream
-import java.io.OutputStream
-import kotlin.reflect.KType
-
-@Deprecated("Functions have been moved to top level.")
-object PatchUtils {
-    @Deprecated(
-        "Function has been moved to top level.",
-        ReplaceWith("patches.mostCommonCompatibleVersions(packageNames, countUnusedPatches)"),
-    )
-    fun getMostCommonCompatibleVersions(
-        patches: Set<Patch<*>>,
-        packageNames: Set<String>? = null,
-        countUnusedPatches: Boolean = false,
-    ): PackageNameMap = patches.mostCommonCompatibleVersions(packageNames, countUnusedPatches)
-
-    @Deprecated("Functions have been moved to the Serialization class.")
-    object Json {
-        private val mapper = jacksonObjectMapper()
-
-        /**
-         * Serializes a set of [Patch]es to a JSON string and writes it to an output stream.
-         *
-         * @param patches The set of [Patch]es to serialize.
-         * @param transform A function to transform the [Patch]es to [JsonPatch]es.
-         * @param prettyPrint Whether to pretty print the JSON.
-         * @param outputStream The output stream to write the JSON to.
-         */
-        @Deprecated("Functions have been moved to the Serialization class.")
-        fun serialize(
-            patches: Set<Patch<*>>,
-            transform: (Patch<*>) -> JsonPatch = { patch -> FullJsonPatch.fromPatch(patch) },
-            prettyPrint: Boolean = false,
-            outputStream: OutputStream,
-        ) {
-            patches.map(transform).let { transformed ->
-                if (prettyPrint) {
-                    mapper.writerWithDefaultPrettyPrinter().writeValue(outputStream, transformed)
-                } else {
-                    mapper.writeValue(outputStream, transformed)
-                }
-            }
-        }
-
-        /**
-         * Deserializes a JSON string to a set of [FullJsonPatch]es from an input stream.
-         *
-         * @param inputStream The input stream to read the JSON from.
-         * @param jsonPatchElementClass The class of the [JsonPatch]es to deserialize.
-         * @return A set of [JsonPatch]es.
-         * @see FullJsonPatch
-         */
-        @Deprecated("This function will be removed in the future.")
-        fun <T : JsonPatch> deserialize(
-            inputStream: InputStream,
-            jsonPatchElementClass: Class<T>,
-        ): Set<T> =
-            mapper.readValue(
-                inputStream,
-                mapper.typeFactory.constructCollectionType(Set::class.java, jsonPatchElementClass),
-            )
-
-        interface JsonPatch
-
-        /**
-         * A JSON representation of a [Patch].
-         * @see Patch
-         */
-        class FullJsonPatch internal constructor(
-            val name: String?,
-            val description: String?,
-            val compatiblePackages: Set<Package>?,
-            // Cannot serialize dependencies, because they are references to other patches and patch names are nullable.
-            // val dependencies: Set<String>,
-            val use: Boolean,
-            val options: Map<String, FullJsonPatchOption<*>>,
-        ) : JsonPatch {
-            internal companion object {
-                internal fun fromPatch(patch: Patch<*>) =
-                    FullJsonPatch(
-                        patch.name,
-                        patch.description,
-                        patch.compatiblePackages,
-                        // buildSet { patch.dependencies.forEach { add(it.name) } },
-                        patch.use,
-                        patch.options.mapValues { FullJsonPatchOption.fromPatchOption(it.value) },
-                    )
-            }
-
-            /**
-             * A JSON representation of a [Option].
-             * @see Option
-             */
-            class FullJsonPatchOption<T> internal constructor(
-                val key: String,
-                val default: T?,
-                val values: Map<String, T?>?,
-                val title: String?,
-                val description: String?,
-                val required: Boolean,
-                val type: KType,
-            ) {
-                internal companion object {
-                    internal fun fromPatchOption(option: Option<*>) =
-                        FullJsonPatchOption(
-                            option.key,
-                            option.default,
-                            option.values,
-                            option.title,
-                            option.description,
-                            option.required,
-                            option.type,
-                        )
-                }
-            }
-        }
-    }
-}
diff --git a/src/commonMain/kotlin/app/revanced/library/adb/AdbManager.kt b/src/commonMain/kotlin/app/revanced/library/adb/AdbManager.kt
deleted file mode 100644
index 1eefdd0..0000000
--- a/src/commonMain/kotlin/app/revanced/library/adb/AdbManager.kt
+++ /dev/null
@@ -1,144 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package app.revanced.library.adb
-
-import app.revanced.library.adb.AdbManager.Apk
-import app.revanced.library.installation.installer.AdbInstaller
-import app.revanced.library.installation.installer.AdbRootInstaller
-import app.revanced.library.installation.installer.Constants.PLACEHOLDER
-import app.revanced.library.installation.installer.Installer
-import app.revanced.library.run
-import se.vidstige.jadb.JadbDevice
-import java.io.File
-
-/**
- * [AdbManager] to install and uninstall [Apk] files.
- *
- * @param deviceSerial The serial of the device. If null, the first connected device will be used.
- */
-@Deprecated("Use an implementation of Installer instead.")
-@Suppress("unused")
-sealed class AdbManager private constructor(
-    @Suppress("UNUSED_PARAMETER") deviceSerial: String?,
-) {
-    protected abstract val installer: Installer<*, *>
-
-    /**
-     * Installs the [Apk] file.
-     *
-     * @param apk The [Apk] file.
-     */
-    @Suppress("DeprecatedCallableAddReplaceWith")
-    @Deprecated("Use Installer.install instead.")
-    open fun install(apk: Apk) = suspend {
-        installer.install(Installer.Apk(apk.file, apk.packageName))
-    }
-
-    /**
-     * Uninstalls the package.
-     *
-     * @param packageName The package name.
-     */
-    @Suppress("DeprecatedCallableAddReplaceWith")
-    @Deprecated("Use Installer.uninstall instead.")
-    open fun uninstall(packageName: String) = suspend {
-        installer.uninstall(packageName)
-    }
-
-    @Deprecated("Use Installer instead.")
-    companion object {
-        /**
-         * Gets an [AdbManager] for the supplied device serial.
-         *
-         * @param deviceSerial The device serial. If null, the first connected device will be used.
-         * @param root Whether to use root or not.
-         * @return The [AdbManager].
-         * @throws DeviceNotFoundException If the device can not be found.
-         */
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("This is deprecated.")
-        fun getAdbManager(
-            deviceSerial: String? = null,
-            root: Boolean = false,
-        ): AdbManager = if (root) RootAdbManager(deviceSerial) else UserAdbManager(deviceSerial)
-    }
-
-    /**
-     * Adb manager for rooted devices.
-     *
-     * @param deviceSerial The device serial. If null, the first connected device will be used.
-     */
-    @Deprecated("Use AdbRootInstaller instead.", ReplaceWith("AdbRootInstaller(deviceSerial)"))
-    class RootAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
-        override val installer = AdbRootInstaller(deviceSerial)
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbRootInstaller.install instead.")
-        override fun install(apk: Apk) = suspend {
-            installer.install(Installer.Apk(apk.file, apk.packageName))
-        }
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbRootInstaller.uninstall instead.")
-        override fun uninstall(packageName: String) = suspend {
-            installer.uninstall(packageName)
-        }
-
-        @Deprecated("This is deprecated.")
-        companion object Utils {
-            private fun JadbDevice.run(
-                command: String,
-                with: String,
-            ) = run(command.applyReplacement(with))
-
-            private fun String.applyReplacement(with: String) = replace(PLACEHOLDER, with)
-        }
-    }
-
-    /**
-     * Adb manager for non-rooted devices.
-     *
-     * @param deviceSerial The device serial. If null, the first connected device will be used.
-     */
-    @Deprecated("Use AdbInstaller instead.")
-    class UserAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
-        override val installer = AdbInstaller(deviceSerial)
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbInstaller.install instead.")
-        override fun install(apk: Apk) = suspend {
-            installer.install(Installer.Apk(apk.file, apk.packageName))
-        }
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbInstaller.uninstall instead.")
-        override fun uninstall(packageName: String) = suspend {
-            installer.uninstall(packageName)
-        }
-    }
-
-    /**
-     * Apk file for [AdbManager].
-     *
-     * @param file The [Apk] file.
-     * @param packageName The package name of the [Apk] file.
-     */
-    @Deprecated("Use Installer.Apk instead.")
-    class Apk(val file: File, val packageName: String? = null)
-
-    @Deprecated("Use AdbCommandRunner.DeviceNotFoundException instead.")
-    class DeviceNotFoundException internal constructor(deviceSerial: String? = null) :
-        Exception(
-            deviceSerial?.let {
-                "The device with the ADB device serial \"$deviceSerial\" can not be found"
-            } ?: "No ADB device found",
-        )
-
-    @Deprecated("Use RootInstaller.FailedToFindInstalledPackageException instead.")
-    class FailedToFindInstalledPackageException internal constructor(packageName: String) :
-        Exception("Failed to find installed package \"$packageName\" because no activity was found")
-
-    @Deprecated("Use RootInstaller.PackageNameRequiredException instead.")
-    class PackageNameRequiredException internal constructor() :
-        Exception("Package name is required")
-}