diff --git a/main/app/revanced/patches/grindr/ConfigFingerprint.kt b/bin/main/app/revanced/patches/grindr/ConfigFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/ConfigFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/ConfigFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/annotations/MicroGPatchCompatibility.kt b/bin/main/app/revanced/patches/grindr/microg/annotations/MicroGPatchCompatibility.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/annotations/MicroGPatchCompatibility.kt
rename to bin/main/app/revanced/patches/grindr/microg/annotations/MicroGPatchCompatibility.kt
diff --git a/main/app/revanced/patches/grindr/microg/constants.kt b/bin/main/app/revanced/patches/grindr/microg/constants.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/constants.kt
rename to bin/main/app/revanced/patches/grindr/microg/constants.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/CastContextFetchFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/CastContextFetchFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/CastContextFetchFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/CastContextFetchFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GetCertRegistrationFIngerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GetCertRegistrationFIngerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GetCertRegistrationFIngerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GetCertRegistrationFIngerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GetMessagingCertFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GetMessagingCertFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GetMessagingCertFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GetMessagingCertFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GetPackageNameFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GetPackageNameFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GetPackageNameFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GetPackageNameFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GoogleApiAvailabilityFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GoogleApiAvailabilityFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GoogleApiAvailabilityFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GoogleApiAvailabilityFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayServicesManifestValueExceptionFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayServicesManifestValueExceptionFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayServicesManifestValueExceptionFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayServicesManifestValueExceptionFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayUtilityFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayUtilityFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayUtilityFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/GooglePlayUtilityFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/OnChangedFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/OnChangedFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/OnChangedFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/OnChangedFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/PrimeFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/PrimeFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/PrimeFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/PrimeFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/ServiceCheckFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/ServiceCheckFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/ServiceCheckFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/ServiceCheckFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/fingerprints/lyimgAuthFingerprint.kt b/bin/main/app/revanced/patches/grindr/microg/fingerprints/lyimgAuthFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/fingerprints/lyimgAuthFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/microg/fingerprints/lyimgAuthFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/FirebaseGetCertPatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/bytecode/FirebaseGetCertPatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/bytecode/FirebaseGetCertPatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/bytecode/FirebaseGetCertPatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/GooglePlayServicesManifestValueExceptionPatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/bytecode/GooglePlayServicesManifestValueExceptionPatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/bytecode/GooglePlayServicesManifestValueExceptionPatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/bytecode/GooglePlayServicesManifestValueExceptionPatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/MicroGBytecodePatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/bytecode/MicroGBytecodePatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/bytecode/MicroGBytecodePatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/bytecode/MicroGBytecodePatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/OnChangedPatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/bytecode/OnChangedPatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/bytecode/OnChangedPatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/bytecode/OnChangedPatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/lyImgPatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/bytecode/lyImgPatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/bytecode/lyImgPatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/bytecode/lyImgPatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/resource/GooglePlayServicesManifestResourcePatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/resource/GooglePlayServicesManifestResourcePatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/resource/GooglePlayServicesManifestResourcePatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/resource/GooglePlayServicesManifestResourcePatch.kt
diff --git a/main/app/revanced/patches/grindr/microg/patch/resource/MicroGResourcePatch.kt b/bin/main/app/revanced/patches/grindr/microg/patch/resource/MicroGResourcePatch.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/microg/patch/resource/MicroGResourcePatch.kt
rename to bin/main/app/revanced/patches/grindr/microg/patch/resource/MicroGResourcePatch.kt
diff --git a/main/app/revanced/patches/grindr/premium/annotations/UnlockPremiumCompatibility.kt b/bin/main/app/revanced/patches/grindr/premium/annotations/UnlockPremiumCompatibility.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/premium/annotations/UnlockPremiumCompatibility.kt
rename to bin/main/app/revanced/patches/grindr/premium/annotations/UnlockPremiumCompatibility.kt
diff --git a/main/app/revanced/patches/grindr/premium/fingerprints/IsPremiumFingerprint.kt b/bin/main/app/revanced/patches/grindr/premium/fingerprints/IsPremiumFingerprint.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/premium/fingerprints/IsPremiumFingerprint.kt
rename to bin/main/app/revanced/patches/grindr/premium/fingerprints/IsPremiumFingerprint.kt
diff --git a/main/app/revanced/patches/grindr/premium/patch/setPremium.kt b/bin/main/app/revanced/patches/grindr/premium/patch/setPremium.kt
similarity index 100%
rename from main/app/revanced/patches/grindr/premium/patch/setPremium.kt
rename to bin/main/app/revanced/patches/grindr/premium/patch/setPremium.kt
diff --git a/main/app/revanced/extensions/Extensions.kt b/main/app/revanced/extensions/Extensions.kt
deleted file mode 100644
index e90fbdcfe3..0000000000
--- a/main/app/revanced/extensions/Extensions.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package app.revanced.extensions
-
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-import org.jf.dexlib2.util.MethodUtil
-import org.w3c.dom.Node
-
-// TODO: populate this to all patches
-/**
- * Convert a [MethodFingerprint] to a [PatchResultError].
- *
- * @return A [PatchResultError] for the [MethodFingerprint].
- */
-internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
-
-/**
- * Find the [MutableMethod] from a given [Method] in a [MutableClass].
- *
- * @param method The [Method] to find.
- * @return The [MutableMethod].
- */
-internal fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
-    MethodUtil.methodSignaturesMatch(it, method)
-}
-
-/**
- * apply a transform to all methods of the class
- *
- * @param transform the transformation function. original method goes in, transformed method goes out
- */
-internal fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
-    val transformedMethods = methods.map { it.transform() }
-    methods.clear()
-    methods.addAll(transformedMethods)
-}
-
-internal fun Node.doRecursively(action: (Node) -> Unit) {
-    action(this)
-    for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
-}
-
-internal fun MutableMethod.injectHideViewCall(
-    insertIndex: Int,
-    viewRegister: Int,
-    classDescriptor: String,
-    targetMethod: String
-) = addInstruction(
-    insertIndex,
-    "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
-)
-
-internal fun Method.findIndexForIdResource(resourceName: String): Int {
-    fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
-        it.type == "id" && it.name == resourceName
-    }.id
-
-    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
-}
-
-/**
- * @return the first constant instruction with the value, or -1 if not found.
- */
-fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
-    return implementation?.let {
-        it.instructions.indexOfFirst { instruction ->
-            instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
-        }
-    } ?: -1
-}
-
-/**
- * @return if the method contains a constant with the given value.
- */
-fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
-    return indexOfFirstConstantInstructionValue(constantValue) >= 0
-}
diff --git a/main/app/revanced/meta/JsonGenerator.kt b/main/app/revanced/meta/JsonGenerator.kt
deleted file mode 100644
index cebf57d91e..0000000000
--- a/main/app/revanced/meta/JsonGenerator.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.dependencies
-import app.revanced.patcher.extensions.PatchExtensions.description
-import app.revanced.patcher.extensions.PatchExtensions.include
-import app.revanced.patcher.extensions.PatchExtensions.options
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.PatchExtensions.version
-import app.revanced.patcher.patch.PatchOption
-import com.google.gson.GsonBuilder
-import java.io.File
-
-internal class JsonGenerator : PatchesFileGenerator {
-    override fun generate(bundle: PatchBundlePatches) {
-        val patches = bundle.map {
-            JsonPatch(
-                it.patchName,
-                it.description ?: "This patch has no description.",
-                it.version ?: "0.0.0",
-                !it.include,
-                it.options?.map { option ->
-                    JsonPatch.Option(
-                        option.key,
-                        option.title,
-                        option.description,
-                        option.required,
-                        option.let { listOption ->
-                            if (listOption is PatchOption.ListOption<*>) {
-                                listOption.options.toMutableList().toTypedArray()
-                            } else null
-                        }
-                    )
-                }?.toTypedArray() ?: emptyArray(),
-                it.dependencies?.map { dep ->
-                    dep.java.patchName
-                }?.toTypedArray() ?: emptyArray(),
-                it.compatiblePackages?.map { pkg ->
-                    JsonPatch.CompatiblePackage(pkg.name, pkg.versions)
-                }?.toTypedArray() ?: emptyArray()
-            )
-        }
-
-        val json = File("patches.json")
-        json.writeText(GsonBuilder().serializeNulls().create().toJson(patches))
-    }
-
-    private class JsonPatch(
-        val name: String,
-        val description: String,
-        val version: String,
-        val excluded: Boolean,
-        val options: Array<Option>,
-        val dependencies: Array<String>,
-        val compatiblePackages: Array<CompatiblePackage>,
-    ) {
-        class CompatiblePackage(
-            val name: String,
-            val versions: Array<String>,
-        )
-
-        class Option(
-            val key: String,
-            val title: String,
-            val description: String,
-            val required: Boolean,
-            val choices: Array<*>?,
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/meta/PatchesFileGenerator.kt b/main/app/revanced/meta/PatchesFileGenerator.kt
deleted file mode 100644
index dfb57d9229..0000000000
--- a/main/app/revanced/meta/PatchesFileGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.PatchBundle
-import java.io.File
-
-internal typealias PatchBundlePatches = List<Class<out Patch<Context>>>
-
-internal interface PatchesFileGenerator {
-    fun generate(bundle: PatchBundlePatches)
-
-    private companion object {
-        @JvmStatic
-        fun main(args: Array<String>) = PatchBundle.Jar(
-            File("build/libs/").listFiles()!!.first {
-                it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
-            }.absolutePath
-        ).loadPatches().also {
-            if (it.isEmpty()) throw IllegalStateException("No patches found")
-        }.let { bundle ->
-            arrayOf(JsonGenerator()).forEach { it.generate(bundle) }
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt b/main/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
deleted file mode 100644
index b80fb24289..0000000000
--- a/main/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.all.activity.exportAll.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-
-@Patch(false)
-@Name("Export all activities")
-@Description("Makes all app activities exportable.")
-class ExportAllActivitiesPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-            val activities = document.getElementsByTagName("activity")
-
-            for(i in 0..activities.length) {
-                activities.item(i)?.apply {
-                    val exportedAttribute = attributes.getNamedItem(EXPORTED_FLAG)
-
-                    if (exportedAttribute != null) {
-                        if (exportedAttribute.nodeValue != "true")
-                            exportedAttribute.nodeValue = "true"
-                    }
-                    // Reason why the attribute is added in the case it does not exist:
-                    // https://github.com/revanced/revanced-patches/pull/1751/files#r1141481604
-                    else document.createAttribute(EXPORTED_FLAG)
-                        .apply { value = "true" }
-                        .let(attributes::setNamedItem)
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val EXPORTED_FLAG = "android:exported"
-    }
-}
diff --git a/main/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt b/main/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
deleted file mode 100644
index 7bf2652867..0000000000
--- a/main/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
+++ /dev/null
@@ -1,206 +0,0 @@
-package app.revanced.patches.all.connectivity.wifi.spoof.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-import java.util.*
-
-@Patch(false)
-@Name("Spoof wifi connection")
-@Description("Spoofs an existing Wi-Fi connection.")
-@RequiresIntegrations
-internal class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "${INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX};"
-    }
-
-    // Information about method calls we want to replace
-    enum class MethodCall(
-        override val definedClassName: String,
-        override val methodName: String,
-        override val methodParams: Array<String>,
-        override val returnType: String,
-    ): IMethodCall {
-        GetSystemService1(
-            "Landroid/content/Context;",
-            "getSystemService",
-            arrayOf("Ljava/lang/String;"),
-            "Ljava/lang/Object;",
-        ),
-        GetSystemService2(
-            "Landroid/content/Context;",
-            "getSystemService",
-            arrayOf("Ljava/lang/Class;"),
-            "Ljava/lang/Object;",
-        ),
-        GetActiveNetworkInfo(
-            "Landroid/net/ConnectivityManager;",
-            "getActiveNetworkInfo",
-            arrayOf(),
-            "Landroid/net/NetworkInfo;",
-        ),
-        IsConnected(
-            "Landroid/net/NetworkInfo;",
-            "isConnected",
-            arrayOf(),
-            "Z",
-        ),
-        IsConnectedOrConnecting(
-            "Landroid/net/NetworkInfo;",
-            "isConnectedOrConnecting",
-            arrayOf(),
-            "Z",
-        ),
-        IsAvailable(
-            "Landroid/net/NetworkInfo;",
-            "isAvailable",
-            arrayOf(),
-            "Z",
-        ),
-        GetState(
-            "Landroid/net/NetworkInfo;",
-            "getState",
-            arrayOf(),
-            "Landroid/net/NetworkInfo\$State;",
-        ),
-        GetDetailedState(
-            "Landroid/net/NetworkInfo;",
-            "getDetailedState",
-            arrayOf(),
-            "Landroid/net/NetworkInfo\$DetailedState;",
-        ),
-        IsActiveNetworkMetered(
-            "Landroid/net/ConnectivityManager;",
-            "isActiveNetworkMetered",
-            arrayOf(),
-            "Z",
-        ),
-        GetActiveNetwork(
-            "Landroid/net/ConnectivityManager;",
-            "getActiveNetwork",
-            arrayOf(),
-            "Landroid/net/Network;",
-        ),
-        GetNetworkInfo(
-            "Landroid/net/ConnectivityManager;",
-            "getNetworkInfo",
-            arrayOf("Landroid/net/Network;"),
-            "Landroid/net/NetworkInfo;",
-        ),
-        HasTransport(
-            "Landroid/net/NetworkCapabilities;",
-            "hasTransport",
-            arrayOf("I"),
-            "Z",
-        ),
-        HasCapability(
-            "Landroid/net/NetworkCapabilities;",
-            "hasCapability",
-            arrayOf("I"),
-            "Z",
-        ),
-        RegisterBestMatchingNetworkCallback(
-            "Landroid/net/ConnectivityManager;",
-            "registerBestMatchingNetworkCallback",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
-            "V",
-        ),
-        RegisterDefaultNetworkCallback1(
-            "Landroid/net/ConnectivityManager;",
-            "registerDefaultNetworkCallback",
-            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;"),
-            "V",
-        ),
-        RegisterDefaultNetworkCallback2(
-            "Landroid/net/ConnectivityManager;",
-            "registerDefaultNetworkCallback",
-            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
-            "V",
-        ),
-        RegisterNetworkCallback1(
-            "Landroid/net/ConnectivityManager;",
-            "registerNetworkCallback",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;"),
-            "V",
-        ),
-        RegisterNetworkCallback2(
-            "Landroid/net/ConnectivityManager;",
-            "registerNetworkCallback",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/app/PendingIntent;"),
-            "V",
-        ),
-        RegisterNetworkCallback3(
-            "Landroid/net/ConnectivityManager;",
-            "registerNetworkCallback",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
-            "V",
-        ),
-        RequestNetwork1(
-            "Landroid/net/ConnectivityManager;",
-            "requestNetwork",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;"),
-            "V",
-        ),
-        RequestNetwork2(
-            "Landroid/net/ConnectivityManager;",
-            "requestNetwork",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "I"),
-            "V",
-        ),
-        RequestNetwork3(
-            "Landroid/net/ConnectivityManager;",
-            "requestNetwork",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;"),
-            "V",
-        ),
-        RequestNetwork4(
-            "Landroid/net/ConnectivityManager;",
-            "requestNetwork",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/app/PendingIntent;"),
-            "V",
-        ),
-        RequestNetwork5(
-            "Landroid/net/ConnectivityManager;",
-            "requestNetwork",
-            arrayOf("Landroid/net/NetworkRequest;", "Landroid/net/ConnectivityManager\$NetworkCallback;", "Landroid/os/Handler;", "I"),
-            "V",
-        ),
-        UnregisterNetworkCallback1(
-            "Landroid/net/ConnectivityManager;",
-            "unregisterNetworkCallback",
-            arrayOf("Landroid/net/ConnectivityManager\$NetworkCallback;"),
-            "V",
-        ),
-        UnregisterNetworkCallback2(
-            "Landroid/net/ConnectivityManager;",
-            "unregisterNetworkCallback",
-            arrayOf("Landroid/app/PendingIntent;"),
-            "V",
-        );
-    }
-
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ) = filterMapInstruction35c<MethodCall>(
-        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
-        classDef,
-        instruction,
-        instructionIndex
-    )
-
-    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
-        val (methodType, instruction, instructionIndex) = entry
-        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
-    }
-}
diff --git a/main/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt b/main/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
deleted file mode 100644
index 412487660c..0000000000
--- a/main/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.all.interaction.gestures.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-
-@Patch(false)
-@Name("Predictive back gesture")
-@Description("Enables the predictive back gesture introduced on Android 13.")
-class PredictiveBackGesturePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            val document = editor.file
-
-            with(document.getElementsByTagName("application").item(0)) {
-                if (attributes.getNamedItem(FLAG) != null) return@with
-
-                document.createAttribute(FLAG)
-                    .apply { value = "true" }
-                    .let(attributes::setNamedItem)
-
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val FLAG = "android:enableOnBackInvokedCallback"
-    }
-}
diff --git a/main/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt b/main/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
deleted file mode 100644
index e575ad086b..0000000000
--- a/main/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.all.misc.debugging.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Enable android debugging")
-@Description("Enables Android debugging capabilities.")
-class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
-
-            // set application as debuggable
-            applicationNode.setAttribute("android:debuggable", "true")
-        }
-
-        return PatchResultSuccess()
-    }
-
-}
diff --git a/main/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt b/main/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
deleted file mode 100644
index 0709e75c44..0000000000
--- a/main/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package app.revanced.patches.all.misc.packagename.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Change package name")
-@Description("Changes the package name.")
-class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        packageName?.let { packageName ->
-            val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
-            if (!packageName.matches(packageNameRegex))
-                return PatchResultError("Invalid package name")
-
-            var originalPackageName: String
-            context.xmlEditor["AndroidManifest.xml"].use { editor ->
-                val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
-                originalPackageName = manifest.getAttribute("package")
-            }
-
-            if (!originalPackageName.matches(packageNameRegex))
-                return PatchResultError("Failed to get the original package name")
-
-            context["AndroidManifest.xml"].apply {
-                readText().replace(originalPackageName, packageName).let(::writeText)
-            }
-
-        } ?: return PatchResultError("No package name provided")
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var packageName: String? by option(
-            PatchOption.StringOption(
-                key = "packageName",
-                default = null,
-                title = "Package name",
-                description = "The name of the package to rename of the app.",
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt b/main/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
deleted file mode 100644
index 499f262bcf..0000000000
--- a/main/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package app.revanced.patches.all.screencapture.removerestriction.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-
-@Patch(false)
-@Name("Remove screen capture restriction")
-@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
-@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
-@RequiresIntegrations
-internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
-    // Information about method calls we want to replace
-    enum class MethodCall(
-        override val definedClassName: String,
-        override val methodName: String,
-        override val methodParams: Array<String>,
-        override val returnType: String
-    ): IMethodCall {
-        SetAllowedCapturePolicySingle(
-            "Landroid/media/AudioAttributes\$Builder;",
-            "setAllowedCapturePolicy",
-            arrayOf("I"),
-            "Landroid/media/AudioAttributes\$Builder;",
-        ),
-        SetAllowedCapturePolicyGlobal(
-            "Landroid/media/AudioManager;",
-            "setAllowedCapturePolicy",
-            arrayOf("I"),
-            "V",
-        );
-    }
-
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ) = filterMapInstruction35c<MethodCall>(
-        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
-        classDef,
-        instruction,
-        instructionIndex
-    )
-
-    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
-        val (methodType, instruction, instructionIndex) = entry
-        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-            "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
-    }
-}
diff --git a/main/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt b/main/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
deleted file mode 100644
index 4efd191e26..0000000000
--- a/main/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.all.screencapture.removerestriction.resource.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import org.w3c.dom.Element
-
-@Description("Sets allowAudioPlaybackCapture in manifest to true.")
-internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        // create an xml editor instance
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            // get the application node
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
-
-            // set allowAudioPlaybackCapture attribute to true
-            applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt b/main/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
deleted file mode 100644
index 9f096e799b..0000000000
--- a/main/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package app.revanced.patches.all.screenshot.removerestriction.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.*
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-import java.util.*
-
-@Patch(false)
-@Name("Remove screenshot restriction")
-@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
-@RequiresIntegrations
-internal class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
-            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
-    }
-
-    // Information about method calls we want to replace
-    enum class MethodCall(
-        override val definedClassName: String,
-        override val methodName: String,
-        override val methodParams: Array<String>,
-        override val returnType: String
-    ): IMethodCall {
-        SetFlags(
-            "Landroid/view/Window;",
-            "setFlags",
-            arrayOf("I", "I"),
-            "V",
-        );
-    }
-
-    override fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ) = filterMapInstruction35c<MethodCall>(
-        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
-        classDef,
-        instruction,
-        instructionIndex
-    )
-
-    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
-        val (methodType, instruction, instructionIndex) = entry
-        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
-    }
-}
diff --git a/main/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt b/main/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt
deleted file mode 100644
index 0159508b58..0000000000
--- a/main/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.backdrops.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.backdrops.wallpapers", arrayOf("4.52"))])
-internal annotation class ProUnlockCompatibility
diff --git a/main/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt b/main/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
deleted file mode 100644
index 2835fc0b2f..0000000000
--- a/main/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.backdrops.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object ProUnlockFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/backdrops/wallpapers/data/local/DatabaseHandlerIAB;"
-                && methodDef.name == "lambda\$existPurchase\$0"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt b/main/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
deleted file mode 100644
index ed9af58723..0000000000
--- a/main/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package app.revanced.patches.backdrops.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
-import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Pro unlock")
-@Description("Unlocks pro-only functions.")
-@ProUnlockCompatibility
-class ProUnlockPatch : BytecodePatch(
-    listOf(ProUnlockFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ProUnlockFingerprint.result?.let { result ->
-            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
-
-            result.mutableMethod.apply {
-                val register = getInstruction<OneRegisterInstruction>(registerIndex).registerA
-                addInstruction(
-                    result.scanResult.patternScanResult!!.endIndex,
-                    """
-                        const/4 v$register, 0x1
-                    """
-                )
-            }
-
-        } ?: return ProUnlockFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index 36c0f653c1..0000000000
--- a/main/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.candylinkvpn.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.candylink.openvpn")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt b/main/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt
deleted file mode 100644
index 4dd0a1b0ae..0000000000
--- a/main/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.candylinkvpn.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsPremiumPurchasedFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("PreferenceProvider;") &&
-                methodDef.name == "isPremiumPurchased"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt b/main/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
deleted file mode 100644
index c15c69348d..0000000000
--- a/main/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.revanced.patches.candylinkvpn.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
-import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks premium features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(IsPremiumPurchasedFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-               const/4 v0, 0x1
-               return v0
-            """
-        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt b/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
deleted file mode 100644
index 082ca3121d..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
-object BootStateFingerprint : MethodFingerprint(
-    "Z",
-    accessFlags = AccessFlags.PUBLIC.value,
-    opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.NEW_ARRAY,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.APUT_OBJECT,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_STATIC,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_EQ,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.GOTO,
-        Opcode.MOVE,
-        Opcode.RETURN
-    )
-)
diff --git a/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt b/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
deleted file mode 100644
index dcfcb0b8e5..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
-object CreateKeyFingerprint : MethodFingerprint(
-    "Z",
-    accessFlags = AccessFlags.PUBLIC.value,
-    strings = listOf("attestation", "SHA-256", "random", "EC", "AndroidKeyStore")
-)
diff --git a/main/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt b/main/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
deleted file mode 100644
index 61ed8c5758..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.finanzonline.detection.bootloader.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
-import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
-import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-
-
-@Patch
-@Name("Remove bootloader detection")
-@Description("Removes the check for an unlocked bootloader.")
-@DetectionCompatibility
-class BootloaderDetectionPatch : BytecodePatch(
-    listOf(CreateKeyFingerprint, BootStateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
-            fingerprint.result?.mutableMethod?.addInstructions(
-                0,
-                """
-                        const/4 v0, 0x1
-                        return v0
-                """
-            ) ?: return fingerprint.toErrorResult()
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt b/main/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
deleted file mode 100644
index 8c0bb011d8..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.finanzonline.detection.root.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
-object RootDetectionFingerprint : MethodFingerprint(
-    "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    )
-)
diff --git a/main/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt b/main/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
deleted file mode 100644
index a7a0066146..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.revanced.patches.finanzonline.detection.root.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
-import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-
-@Patch
-@Name("Remove root detection")
-@Description("Removes the check for root permissions.")
-@DetectionCompatibility
-class RootDetectionPatch : BytecodePatch(
-    listOf(RootDetectionFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-                return-object v0
-            """
-        ) ?: return RootDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt b/main/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt
deleted file mode 100644
index 8da838baef..0000000000
--- a/main/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.finanzonline.detection.shared.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("at.gv.bmf.bmf2go")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DetectionCompatibility
diff --git a/main/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt b/main/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt
deleted file mode 100644
index 5310939194..0000000000
--- a/main/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.googlerecorder.restrictions.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object OnApplicationCreateFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.feature.PIXEL_2017_EXPERIENCE"),
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (methodDef.name != "onCreate") return@custom false
-
-        classDef.type.endsWith("RecorderApplication;")
-    }
-)
diff --git a/main/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt b/main/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
deleted file mode 100644
index 6e408c06ca..0000000000
--- a/main/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.googlerecorder.restrictions.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Remove device restrictions")
-@Description("Removes restrictions from using the app on any device.")
-@Compatibility([Package("com.google.android.apps.recorder")])
-class RemoveDeviceRestrictions : BytecodePatch(
-    listOf(OnApplicationCreateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        OnApplicationCreateFingerprint.result?.let {
-            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
-
-            it.mutableMethod.apply {
-                // Remove check for device restrictions.
-                removeInstructions(featureStringIndex - 2, 5)
-
-                val featureAvailableRegister = getInstruction<OneRegisterInstruction>(featureStringIndex).registerA
-
-                // Override "isPixelDevice()" to return true.
-                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
-            }
-        } ?: return OnApplicationCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/grindr/microg/patch/bytecode/GetPackageNamePatch.kt b/main/app/revanced/patches/grindr/microg/patch/bytecode/GetPackageNamePatch.kt
deleted file mode 100644
index b731aeab0c..0000000000
--- a/main/app/revanced/patches/grindr/microg/patch/bytecode/GetPackageNamePatch.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package app.revanced.patches.grindr.microg.patch.bytecode
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.extensions.toErrorResult
-
-import app.revanced.patches.grindr.microg.fingerprints.GetPackageNameFingerprint
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-
-import app.revanced.patches.grindr.microg.Constants.PACKAGE_NAME
-class GetPackageNamePatch : BytecodePatch(
-    listOf(
-        GetPackageNameFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        GetPackageNameFingerprint.result?.let { result ->
-            println("Found get package name fingerprint!")
-
-            result.mutableMethod.apply {
-                addInstructions(
-                    0,
-                    """
-                        const-string v0, "$PACKAGE_NAME"
-                        return-object v0
-                    """
-                )
-            }
-        } ?: return GetPackageNameFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt b/main/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt
deleted file mode 100644
index 15fa03761c..0000000000
--- a/main/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.hexeditor.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.myprog.hexedit")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HexEditorAdsCompatibility
diff --git a/main/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt b/main/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
deleted file mode 100644
index ada0385157..0000000000
--- a/main/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.hexeditor.ad.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PrimaryAdsFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt b/main/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
deleted file mode 100644
index e5ad20d55b..0000000000
--- a/main/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.hexeditor.ad.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
-import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
-
-@Patch
-@Name("Disable ads")
-@Description("Disables ads in HexEditor.")
-@HexEditorAdsCompatibility
-class HexEditorAdsPatch : BytecodePatch(
-    listOf(
-        PrimaryAdsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = PrimaryAdsFingerprint.result!!.mutableMethod
-        
-        method.replaceInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index e7a54f1f98..0000000000
--- a/main/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.iconpackstudio.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("ginlemon.iconpackstudio")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt b/main/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
deleted file mode 100644
index 8ecdb50327..0000000000
--- a/main/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.iconpackstudio.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckProFingerprint : MethodFingerprint(
-    "Z",
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("IPSPurchaseRepository;")}
-)
diff --git a/main/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt b/main/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
deleted file mode 100644
index bb866bfff5..0000000000
--- a/main/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.iconpackstudio.misc.pro.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        CheckProFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = CheckProFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt b/main/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
deleted file mode 100644
index 185a9e5ad8..0000000000
--- a/main/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.idaustria.detection.root.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object RootDetectionFingerprint : MethodFingerprint(
-    "V",
-    accessFlags = AccessFlags.PUBLIC.value,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
-    }
-)
diff --git a/main/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt b/main/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
deleted file mode 100644
index 04c486bbcc..0000000000
--- a/main/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.patches.idaustria.detection.root.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
-import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
-
-@Patch
-@Name("Remove root detection")
-@Description("Removes the check for root permissions and unlocked bootloader.")
-@DetectionCompatibility
-class RootDetectionPatch : BytecodePatch(
-    listOf(RootDetectionFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt b/main/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
deleted file mode 100644
index dbc8d4619b..0000000000
--- a/main/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.idaustria.detection.shared.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("at.gv.oe.app")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DetectionCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt b/main/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
deleted file mode 100644
index c11b2e0b6f..0000000000
--- a/main/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.idaustria.detection.signature.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object SpoofSignatureFingerprint : MethodFingerprint(
-    "L",
-    parameters = listOf("L"),
-    accessFlags = AccessFlags.PRIVATE.value,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SL2Step1Task;") && methodDef.name == "getPubKey"
-    }
-)
diff --git a/main/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt b/main/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
deleted file mode 100644
index 6c1c229b7c..0000000000
--- a/main/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package app.revanced.patches.idaustria.detection.signature.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
-import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
-
-@Patch
-@Name("Spoof signature")
-@Description("Spoofs the signature of the app.")
-@DetectionCompatibility
-class SpoofSignaturePatch : BytecodePatch(
-    listOf(SpoofSignatureFingerprint)
-) {
-    companion object {
-        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
-                "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
-                "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
-                "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
-                "324cd48341cce64fabf6a9b55d1a7bf23b2fcdff451fd85bf0c7feb0a5e884d7c5c078e413149566a12a686e6efa70ae5161" +
-                "a0201307692834cda336c55157fef125e67c01c1359886f94742105596b42a790404bbcda5dad6a65f115aaff5e45ef3c28b" +
-                "2316ff6cef07aa49a45aa58c07bf258051b13ef449ccb37a3679afd5cfb9132f70bb9d931a937897544f90c3bcc80ed012e9" +
-                "f6ba020b8cdc23f8c29ac092b88f0e370ff9434e4f0f359e614ae0868dc526fa41e4b7596533e8d10279b66e923ecd9f0b20" +
-                "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
-                "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
-                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
-            0,
-            """
-                const-string v0, "$EXPECTED_SIGNATURE"
-                return-object v0 
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt b/main/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
deleted file mode 100644
index 372929a12f..0000000000
--- a/main/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.inshorts.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.nis.app")])
-
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
diff --git a/main/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt b/main/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
deleted file mode 100644
index 0aba22b1bd..0000000000
--- a/main/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.inshorts.ad.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object InshortsAdsFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("GoogleAdLoader","exception in requestAd"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt b/main/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
deleted file mode 100644
index a0b314e750..0000000000
--- a/main/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.inshorts.ad.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
-import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
-
-@Patch
-@Name("Hide ads")
-@Description("Removes ads from Inshorts.")
-@HideAdsCompatibility
-class HideAdsPatch : BytecodePatch(
-    listOf(InshortsAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        InshortsAdsFingerprint.result?.let { result ->
-            result.apply {
-                mutableMethod.addInstruction(
-                    0,
-                    """
-                        return-void
-                    """
-                )
-            }
-        } ?: return InshortsAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
deleted file mode 100644
index 3ae3fd8241..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object MediaFingerprint : MethodFingerprint(
-    strings = listOf("force_overlay", "Media#updateFields", "live_reels_metadata")
-)
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
deleted file mode 100644
index 55d2dafe50..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ShowAdFingerprint : MethodFingerprint(
-    "Z",
-    AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
-    listOf("L", "L", "Z", "Z"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.RETURN,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-    ),
-)
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
deleted file mode 100644
index f4988a1358..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import org.jf.dexlib2.Opcode
-
-object GenericMediaAdFingerprint : MediaAdFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
deleted file mode 100644
index b31290f703..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-
-abstract class MediaAdFingerprint(
-    returnType: String? = "Z",
-    accessFlags: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters: Iterable<String>? = listOf(),
-    opcodes: Iterable<Opcode>?,
-    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
-) : MethodFingerprint(
-    returnType,
-    accessFlags,
-    parameters,
-    opcodes,
-    customFingerprint = customFingerprint
-) {
-    abstract override fun toString(): String
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
deleted file mode 100644
index 0f10168c66..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-object PaidPartnershipAdFingerprint : MediaAdFingerprint(
-    "V",
-    null,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IPUT_BOOLEAN
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ClipsEditMetadataController;")
-    }
-) {
-    override fun toString() = result!!.let {
-        val adCheckIndex = it.scanResult.patternScanResult!!.startIndex
-        val adCheckInstruction = it.method.implementation!!.instructions.elementAt(adCheckIndex)
-
-        val adCheckMethod = (adCheckInstruction as ReferenceInstruction).reference as MethodReference
-
-        adCheckMethod.toString()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
deleted file mode 100644
index 28bd08a2ec..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import org.jf.dexlib2.Opcode
-
-object ShoppingAdFingerprint : MediaAdFingerprint(
-    opcodes = listOf(
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.XOR_INT_LIT8,
-        Opcode.IF_EQZ,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt b/main/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
deleted file mode 100644
index 3090f5be09..0000000000
--- a/main/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.GenericMediaAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Hide timeline ads")
-@Description("Removes ads from the timeline.")
-@Compatibility([Package("com.instagram.android", arrayOf("275.0.0.27.98"))])
-class HideTimelineAdsPatch : BytecodePatch(
-    listOf(
-        ShowAdFingerprint,
-        MediaFingerprint,
-        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // region Resolve required methods to check for ads.
-
-        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
-
-        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
-
-        MediaFingerprint.result?.let {
-            GenericMediaAdFingerprint.resolve(context, it.classDef)
-            ShoppingAdFingerprint.resolve(context, it.classDef)
-
-            return@let
-        } ?: return MediaFingerprint.toErrorResult()
-
-        // endregion
-
-        ShowAdFingerprint.result!!.apply {
-            // region Create instructions.
-
-            val scanStart = scanResult.patternScanResult!!.startIndex
-            val jumpIndex = scanStart - 1
-
-            val mediaInstanceRegister = mutableMethod.getInstruction<FiveRegisterInstruction>(scanStart).registerC
-            val freeRegister = mutableMethod.getInstruction<OneRegisterInstruction>(jumpIndex).registerA
-
-            val returnFalseLabel = "an_ad"
-
-            val checkForAdInstructions =
-                listOf(GenericMediaAdFingerprint, PaidPartnershipAdFingerprint, ShoppingAdFingerprint)
-                    .map(MediaAdFingerprint::toString)
-                    .joinToString("\n") {
-                        """ 
-                            invoke-virtual {v$mediaInstanceRegister}, $it
-                            move-result v$freeRegister
-                            if-nez v$freeRegister, :$returnFalseLabel
-                        """.trimIndent()
-                    }.let { "$it\nconst/4 v0, 0x1\nreturn v0" }
-
-            // endregion
-
-            // region Patch.
-
-            val insertIndex = scanStart + 3
-
-            mutableMethod.addInstructionsWithLabels(
-                insertIndex,
-                checkForAdInstructions,
-                ExternalLabel(
-                    returnFalseLabel,
-                    mutableMethod.getInstruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
-                )
-            )
-
-            // endregion
-
-            // region Jump to checks for ads from previous patch.
-
-            mutableMethod.apply {
-                addInstructionsWithLabels(
-                    jumpIndex + 1,
-                    "if-nez v$freeRegister, :start_check",
-                    ExternalLabel("start_check", getInstruction(insertIndex))
-                )
-            }.removeInstruction(jumpIndex)
-
-            // endregion
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt b/main/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt
deleted file mode 100644
index c7a4a56f1c..0000000000
--- a/main/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.irplus.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("net.binarymode.android.irplus")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class IrplusAdsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt b/main/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
deleted file mode 100644
index 061606b1c4..0000000000
--- a/main/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.irplus.ad.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IrplusAdsFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L", "Z"),
-    strings = listOf("TAGGED")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt b/main/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
deleted file mode 100644
index c4e93e7c12..0000000000
--- a/main/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.irplus.ad.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.irplus.ad.annotations.IrplusAdsCompatibility
-import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
-
-
-@Patch
-@Name("Remove ads")
-@Description("Removes all ads from the app.")
-@IrplusAdsCompatibility
-class IrplusAdsPatch : BytecodePatch(
-    listOf(IrplusAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = IrplusAdsFingerprint.result!!.mutableMethod
-
-        // By overwriting the second parameter of the method,
-        // the view which holds the advertisement is removed.
-        method.addInstruction(0, "const/4 p2, 0x0")
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt b/main/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
deleted file mode 100644
index 9de66ac2a6..0000000000
--- a/main/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.memegenerator.detection.license.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object LicenseValidationFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Landroid/content/Context;"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.CMP_LONG,
-        Opcode.IF_GEZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.CONST_4,
-        Opcode.RETURN
-    )
-)
diff --git a/main/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt b/main/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
deleted file mode 100644
index 34b11e4862..0000000000
--- a/main/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.memegenerator.detection.license.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
-
-@Description("Disables Firebase license validation.")
-class LicenseValidationPatch : BytecodePatch(
-    listOf(LicenseValidationFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LicenseValidationFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw LicenseValidationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt b/main/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
deleted file mode 100644
index bc8cdc9fb1..0000000000
--- a/main/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.memegenerator.detection.signature.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2)
-object VerifySignatureFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Landroid/app/Activity;"),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_STATIC,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.SGET_OBJECT,
-        Opcode.ARRAY_LENGTH,
-        Opcode.IF_GE,
-        Opcode.AGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.ADD_INT_LIT8
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt b/main/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
deleted file mode 100644
index 3105311b6a..0000000000
--- a/main/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.memegenerator.detection.signature.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint
-
-@Description("Disables detection of incorrect signature.")
-class SignatureVerificationPatch : BytecodePatch(
-    listOf(VerifySignatureFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        VerifySignatureFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(
-                0,
-                """
-                    const/4 p0, 0x1
-                    return  p0
-                """
-            )
-        } ?: throw VerifySignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/memegenerator/misc/pro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/memegenerator/misc/pro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index b93215674a..0000000000
--- a/main/app/revanced/patches/memegenerator/misc/pro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.zombodroid.MemeGenerator", arrayOf(
-            "4.6364",
-            "4.6370",
-            "4.6375",
-            "4.6377",
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt b/main/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
deleted file mode 100644
index 19f08da0e2..0000000000
--- a/main/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object IsFreeVersionFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/Boolean;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    strings = listOf("free"),
-    parameters = listOf("Landroid/content/Context;"),
-    opcodes = listOf(
-        Opcode.SGET,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ
-    )
-)
diff --git a/main/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt b/main/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
deleted file mode 100644
index 74ec5da7a1..0000000000
--- a/main/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.memegenerator.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
-import app.revanced.patches.memegenerator.detection.signature.patch.SignatureVerificationPatch
-import app.revanced.patches.memegenerator.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.memegenerator.misc.pro.fingerprint.IsFreeVersionFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks pro features.")
-@DependsOn([
-    SignatureVerificationPatch::class,
-    LicenseValidationPatch::class
-])
-@UnlockProCompatibility
-class UnlockProVersionPatch : BytecodePatch(
-    listOf(
-        IsFreeVersionFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsFreeVersionFingerprint.result?.apply {
-            mutableMethod.replaceInstructions(0,
-                """
-                    sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-                    return-object p0
-                """
-            )
-        } ?: throw IsFreeVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt b/main/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
deleted file mode 100644
index 3bb5c3a385..0000000000
--- a/main/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.messenger.ads.inbox.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object LoadInboxAdsFingerprint : MethodFingerprint(
-    returnType = "V",
-    strings = listOf(
-        "ads_load_begin",
-        "inbox_ads_fetch_start"
-    ),
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
-    }
-)
-
diff --git a/main/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt b/main/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
deleted file mode 100644
index e2d272125c..0000000000
--- a/main/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.messenger.ads.inbox.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
-
-@Patch
-@Name("Hide inbox ads")
-@Description("Hides ads in inbox.")
-@Compatibility([Package("com.facebook.orca")])
-class HideInboxAdsPatch : BytecodePatch(
-    listOf(LoadInboxAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
-            this.replaceInstruction(0, "return-void")
-        } ?: return LoadInboxAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
-
diff --git a/main/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt b/main/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt
deleted file mode 100644
index cff25ae299..0000000000
--- a/main/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.messenger.inputfield.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.dexbacked.value.DexBackedStringEncodedValue
-
-object SendTypingIndicatorFingerprint : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf(),
-    customFingerprint = { methodDef, classDef ->
-        methodDef.name == "run" && classDef.fields.any {
-            it.name == "__redex_internal_original_name"
-                    && (it.initialValue as? DexBackedStringEncodedValue)?.value == "ConversationTypingContext\$sendActiveStateRunnable\$1"
-        }
-    }
-)
diff --git a/main/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt b/main/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt
deleted file mode 100644
index ef01e1a5ab..0000000000
--- a/main/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.messenger.inputfield.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object SwitchMessangeInputEmojiButtonFingerprint : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf("L", "Z"),
-    strings = listOf("afterTextChanged", "expression_search"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_STRING,
-        Opcode.GOTO,
-        Opcode.CONST_STRING,
-        Opcode.GOTO
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt b/main/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
deleted file mode 100644
index 7aa77e12d6..0000000000
--- a/main/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.messenger.inputfield.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Disable switching emoji to sticker in message input field")
-@Description("Disables switching from emoji to sticker search mode in message input field")
-@Compatibility([Package("com.facebook.orca")])
-class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SwitchMessangeInputEmojiButtonFingerprint.result?.let {
-            val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2
-
-            it.mutableMethod.apply {
-                val targetRegister = getInstruction<OneRegisterInstruction>(setStringIndex).registerA
-
-                replaceInstruction(
-                    setStringIndex,
-                    "const-string v$targetRegister, \"expression\""
-                )
-            }
-        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt b/main/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
deleted file mode 100644
index bb75cc1e65..0000000000
--- a/main/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.messenger.inputfield.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
-
-@Patch
-@Name("Disable typing indicator")
-@Description("Disables the indicator while typing a message")
-@Compatibility([Package("com.facebook.orca")])
-class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
-            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index 7e4be16aca..0000000000
--- a/main/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.moneymanager.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.ithebk.expensemanager")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt b/main/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt
deleted file mode 100644
index c7b6824a18..0000000000
--- a/main/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.moneymanager.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object UnlockProFingerprint : MethodFingerprint(
-    "Z",
-    AccessFlags.STATIC or AccessFlags.SYNTHETIC,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_BOOLEAN,
-        Opcode.RETURN
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("MainActivity;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt b/main/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
deleted file mode 100644
index 9de5db3fcd..0000000000
--- a/main/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.moneymanager.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
-import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(UnlockProFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
-            0,
-            """
-               const/4 v0, 0x1
-               return v0 
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt b/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
deleted file mode 100644
index dd60e2026e..0000000000
--- a/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.music.ad.video.fingerprints
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID
-    )
-)
diff --git a/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt b/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
deleted file mode 100644
index d6d8a138d9..0000000000
--- a/main/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.music.ad.video.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ShowMusicVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
-        Opcode.IPUT_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    )
-)
diff --git a/main/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt b/main/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
deleted file mode 100644
index ea852b9dc6..0000000000
--- a/main/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.music.ad.video.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
-import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
-import app.revanced.patches.music.annotations.MusicCompatibility
-
-@Patch
-@Name("Music video ads")
-@Description("Removes ads in the music player.")
-@MusicCompatibility
-class MusicVideoAdsPatch : BytecodePatch(
-    listOf(ShowMusicVideoAdsConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
-
-        val result = ShowMusicVideoAdsFingerprint.result!!
-
-        result.mutableMethod.addInstruction(
-            result.scanResult.patternScanResult!!.startIndex,
-            """
-                const/4 p1, 0x0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/annotations/MusicCompatibility.kt b/main/app/revanced/patches/music/annotations/MusicCompatibility.kt
deleted file mode 100644
index 5cd3b494ca..0000000000
--- a/main/app/revanced/patches/music/annotations/MusicCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.music.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MusicCompatibility
diff --git a/main/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt b/main/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
deleted file mode 100644
index 92f047d54c..0000000000
--- a/main/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package app.revanced.patches.music.audio.codecs.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object AllCodecsReferenceFingerprint : MethodFingerprint(
-    "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.MOVE_EXCEPTION,
-        Opcode.INVOKE_SUPER,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.RETURN_WIDE
-    ), listOf("itag")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt b/main/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
deleted file mode 100644
index 8ab87777b3..0000000000
--- a/main/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.music.audio.codecs.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object CodecsLockFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_OBJECT
-    ),
-    strings = listOf("eac3_supported")
-)
diff --git a/main/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt b/main/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
deleted file mode 100644
index 679bdd8b7a..0000000000
--- a/main/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package app.revanced.patches.music.audio.codecs.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
-import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
-import org.jf.dexlib2.Opcode
-
-@Patch
-@Name("Codecs unlock")
-@Description("Adds more audio codec options. The new audio codecs usually result in better audio quality.")
-@MusicCompatibility
-class CodecsUnlockPatch : BytecodePatch(
-    listOf(
-        CodecsLockFingerprint, AllCodecsReferenceFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val codecsLockResult = CodecsLockFingerprint.result!!
-
-        val implementation = codecsLockResult.mutableMethod.implementation!!
-
-        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
-        val instructionIndex = scanResultStartIndex +
-                if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
-                    // for 5.16.xx and lower
-                    -3
-                } else {
-                    // since 5.17.xx
-                    -2
-                }
-
-        val allCodecsResult = AllCodecsReferenceFingerprint.result!!
-        val allCodecsMethod =
-            context.toMethodWalker(allCodecsResult.method)
-                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
-                .getMethod()
-
-        implementation.replaceInstruction(
-            instructionIndex,
-            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt b/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
deleted file mode 100644
index 29c90b6665..0000000000
--- a/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object  AudioOnlyEnablerFingerprint: MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.GOTO,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt b/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
deleted file mode 100644
index 02eb60adce..0000000000
--- a/main/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object ExclusiveAudioFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L", "Z"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IF_EQZ,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.RETURN_VOID
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt b/main/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
deleted file mode 100644
index c0a1d85d3f..0000000000
--- a/main/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
-
-@Patch
-@Name("Exclusive audio playback")
-@Description("Enables the option to play music without video.")
-@MusicCompatibility
-class ExclusiveAudioPatch : BytecodePatch(
-    listOf(AudioOnlyEnablerFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
-        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
-        method.addInstruction("return v0")
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt b/main/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
deleted file mode 100644
index 661c138d75..0000000000
--- a/main/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.music.layout.compactheader.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object CompactHeaderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST
-    )
-)
diff --git a/main/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt b/main/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
deleted file mode 100644
index 4cea853d6a..0000000000
--- a/main/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.music.layout.compactheader.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
-import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
-
-@Patch(false)
-@Name("Compact header")
-@Description("Hides the music category bar at the top of the homepage.")
-@MusicCompatibility
-class CompactHeaderPatch : BytecodePatch(
-    listOf(CompactHeaderConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = CompactHeaderConstructorFingerprint.result!!
-        val method = result.mutableMethod
-
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex
-        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
-        method.addInstructions(
-            insertIndex, """
-                const/16 v2, 0x8
-                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt b/main/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
deleted file mode 100644
index eb3d28a080..0000000000
--- a/main/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package app.revanced.patches.music.layout.minimizedplayback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("I", "L", "Z"),
-    listOf(
-        Opcode.IGET,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQ,
-        Opcode.GOTO,
-        Opcode.RETURN_VOID,
-        Opcode.SGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_NE,
-        Opcode.IPUT_BOOLEAN,
-    )
-)
diff --git a/main/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/main/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
deleted file mode 100644
index 387e74bbb8..0000000000
--- a/main/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.music.layout.minimizedplayback.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-
-@Patch
-@Name("Minimized playback music")
-@Description("Enables minimized playback on Kids music.")
-@MusicCompatibility
-class MinimizedPlaybackPatch : BytecodePatch(
-    listOf(MinimizedPlaybackManagerFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
-            0,
-            """
-                return-void
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt b/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
deleted file mode 100644
index 5b89674cc6..0000000000
--- a/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.music.layout.premium.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object HideGetPremiumFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IF_NEZ,
-        Opcode.CONST_16,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.INVOKE_VIRTUAL
-    )
-)
diff --git a/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt b/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
deleted file mode 100644
index d91ff64a46..0000000000
--- a/main/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.music.layout.premium.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object HideGetPremiumParentFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC
-    ),
-    listOf("FEmusic_history"),
-)
diff --git a/main/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt b/main/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
deleted file mode 100644
index 1852409cab..0000000000
--- a/main/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package app.revanced.patches.music.layout.premium.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
-import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
-
-@Patch
-@Name("Hide get premium")
-@Description("Removes all \"Get Premium\" evidences from the avatar menu.")
-@MusicCompatibility
-class HideGetPremiumPatch : BytecodePatch(
-    listOf(HideGetPremiumParentFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val parentResult = HideGetPremiumParentFingerprint.result!!
-        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
-
-        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
-
-        val parentMethod = parentResult.mutableMethod
-        parentMethod.replaceInstruction(
-            startIndex,
-            """
-                const/4 v1, 0x0
-            """
-        )
-
-        val result = HideGetPremiumFingerprint.result!!
-        val method = result.mutableMethod
-        method.addInstruction(
-            startIndex,
-            """
-                const/16 v0, 0x8
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt b/main/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
deleted file mode 100644
index e62225b255..0000000000
--- a/main/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package app.revanced.patches.music.layout.upgradebutton.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object PivotBarConstructorFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L", "Z"),
-    listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.GOTO,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.NOP,
-        Opcode.IPUT_OBJECT,
-        Opcode.RETURN_VOID
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt b/main/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
deleted file mode 100644
index 05b1bb38e1..0000000000
--- a/main/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package app.revanced.patches.music.layout.upgradebutton.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.toInstructions
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-
-@Patch
-@Name("Upgrade button remover")
-@Description("Removes the upgrade tab from the pivot bar.")
-@MusicCompatibility
-class RemoveUpgradeButtonPatch : BytecodePatch(
-    listOf(PivotBarConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = PivotBarConstructorFingerprint.result!!
-        val implementation = result.mutableMethod.implementation!!
-
-        val pivotBarElementFieldRef =
-            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference
-
-        val register = (implementation.instructions.first() as Instruction35c).registerC
-        // first compile all the needed instructions
-        val instructionList = """
-                invoke-interface { v0 }, Ljava/util/List;->size()I
-                move-result v1
-                const/4 v2, 0x3
-                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-                iput-object v0, v$register, $pivotBarElementFieldRef
-            """.toInstructions().toMutableList()
-
-
-        val endIndex = result.scanResult.patternScanResult!!.endIndex
-
-        // replace the instruction to retain the label at given index
-        implementation.replaceInstruction(
-            endIndex - 1, instructionList[0] // invoke-interface
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeFirst()
-
-        val exitInstruction = instructionList.last() // iput-object
-        implementation.addInstruction(
-            endIndex, exitInstruction
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeLast()
-
-        // add the necessary if statement to remove the upgrade tab button in case it exists
-        instructionList.add(
-            2, // if-le
-            BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
-            )
-        )
-
-        implementation.addInstructions(
-            endIndex, instructionList
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt b/main/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
deleted file mode 100644
index f6ab9dbbbc..0000000000
--- a/main/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object CheckCertificateFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    parameters = listOf("Ljava/lang/String;"),
-    strings = listOf("X509", "Failed to get certificate.")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt b/main/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
deleted file mode 100644
index a59c1fc02e..0000000000
--- a/main/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
-
-@Patch
-@Name("Bypass certificate checks")
-@Description("Bypasses certificate checks which prevent YouTube Music from working on Android Auto.")
-@MusicCompatibility
-class BypassCertificateChecksPatch : BytecodePatch(
-    listOf(CheckCertificateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CheckCertificateFingerprint.result?.apply {
-            mutableMethod.addInstructions(
-                0, """
-                const/4 v0, 0x1
-                return v0
-                """
-            )
-        } ?: return CheckCertificateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
deleted file mode 100644
index 04d0430f09..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastContextFetchFingerprint : MethodFingerprint(
-    strings = listOf("Error fetching CastContext.")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
deleted file mode 100644
index a4d39a8dd4..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastDynamiteModuleFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
deleted file mode 100644
index f4119e5882..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    strings = listOf("Failed to load module via V2: ")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
deleted file mode 100644
index eaefab9b28..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object GooglePlayUtilityFingerprint : MethodFingerprint(
-    "I",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("L", "I"),
-    strings = listOf(
-        "This should never happen.",
-        "MetadataValueReader",
-        "GooglePlayServicesUtil",
-        "com.android.vending",
-        "android.hardware.type.embedded"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
deleted file mode 100644
index e1fcc27d43..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PrimeFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt b/main/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
deleted file mode 100644
index dd08331447..0000000000
--- a/main/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.music.misc.microg.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object ServiceCheckFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("L", "I"),
-    strings = listOf("Google Play Services not available")
-)
diff --git a/main/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt b/main/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
deleted file mode 100644
index 6956721701..0000000000
--- a/main/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package app.revanced.patches.music.misc.microg.patch.bytecode
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.misc.microg.fingerprints.*
-import app.revanced.patches.music.misc.microg.patch.resource.MicroGResourcePatch
-import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants
-import app.revanced.util.microg.MicroGBytecodeHelper
-
-@Patch
-@DependsOn([MicroGResourcePatch::class])
-@Name("Vanced MicroG support")
-@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
-@MusicCompatibility
-class MicroGBytecodePatch : BytecodePatch(
-    listOf(
-        ServiceCheckFingerprint,
-        GooglePlayUtilityFingerprint,
-        CastDynamiteModuleFingerprint,
-        CastDynamiteModuleV2Fingerprint,
-        CastContextFetchFingerprint,
-        PrimeFingerprint,
-    )
-) {
-    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
-    // - "com.google.android.gms.chimera.GmsIntentOperationService",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
-    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
-    // - "com.google.android.gms.phenotype.UPDATE",
-    // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) =
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context,
-            arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
-                    Constants.PACKAGE_NAME,
-                    Constants.REVANCED_PACKAGE_NAME
-                )
-            ),
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                PrimeFingerprint,
-                MUSIC_PACKAGE_NAME,
-                REVANCED_MUSIC_PACKAGE_NAME
-            ),
-            listOf(
-                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
-                CastDynamiteModuleFingerprint,
-                CastDynamiteModuleV2Fingerprint,
-                CastContextFetchFingerprint
-            )
-        ).let { PatchResultSuccess() }
-}
diff --git a/main/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt b/main/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
deleted file mode 100644
index 89dc28ee9e..0000000000
--- a/main/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.music.misc.microg.patch.resource
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
-import app.revanced.util.microg.MicroGManifestHelper
-import app.revanced.util.microg.MicroGResourceHelper
-
-@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
-class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        // update manifest
-        MicroGResourceHelper.patchManifest(
-            context,
-            MUSIC_PACKAGE_NAME,
-            REVANCED_MUSIC_PACKAGE_NAME,
-            REVANCED_MUSIC_APP_NAME
-        )
-
-        // add metadata to the manifest
-        MicroGManifestHelper.addSpoofingMetadata(
-            context,
-            SPOOFED_PACKAGE_NAME,
-            SPOOFED_PACKAGE_SIGNATURE
-        )
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/misc/microg/shared/Constants.kt b/main/app/revanced/patches/music/misc/microg/shared/Constants.kt
deleted file mode 100644
index a7405cc4e7..0000000000
--- a/main/app/revanced/patches/music/misc/microg/shared/Constants.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.music.misc.microg.shared
-
-object Constants {
-    internal const val REVANCED_MUSIC_APP_NAME = "YT Music ReVanced"
-    internal const val REVANCED_MUSIC_PACKAGE_NAME = "app.revanced.android.apps.youtube.music"
-    internal const val MUSIC_PACKAGE_NAME = "com.google.android.apps.youtube.music"
-    internal const val SPOOFED_PACKAGE_NAME = MUSIC_PACKAGE_NAME
-    internal const val SPOOFED_PACKAGE_SIGNATURE = "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"
-}
diff --git a/main/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt b/main/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
deleted file mode 100644
index fdaea77606..0000000000
--- a/main/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.RETURN,
-        Opcode.RETURN
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt b/main/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
deleted file mode 100644
index a3404c44cc..0000000000
--- a/main/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.annotations.MusicCompatibility
-import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
-
-@Patch
-@Name("Background play")
-@Description("Enables playing music in the background.")
-@MusicCompatibility
-class BackgroundPlayPatch : BytecodePatch(
-    listOf(BackgroundPlaybackDisableFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/myexpenses/misc/pro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/myexpenses/misc/pro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index 8ab7f6adfa..0000000000
--- a/main/app/revanced/patches/myexpenses/misc/pro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.myexpenses.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("org.totschnig.myexpenses", arrayOf("3.4.9"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/myexpenses/misc/pro/fingerprints/IsEnabledFingerprint.kt b/main/app/revanced/patches/myexpenses/misc/pro/fingerprints/IsEnabledFingerprint.kt
deleted file mode 100644
index caebe9e504..0000000000
--- a/main/app/revanced/patches/myexpenses/misc/pro/fingerprints/IsEnabledFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.myexpenses.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsEnabledFingerprint : MethodFingerprint(
-    "Z",
-    strings = listOf("feature", "feature.licenceStatus")
-)
diff --git a/main/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt b/main/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
deleted file mode 100644
index 83b4624be2..0000000000
--- a/main/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.myexpenses.misc.pro.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.myexpenses.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.myexpenses.misc.pro.fingerprints.IsEnabledFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all professional features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        IsEnabledFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = IsEnabledFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/annotations/RemoveBroadcastsRestrictionCompatibility.kt b/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/annotations/RemoveBroadcastsRestrictionCompatibility.kt
deleted file mode 100644
index 94bbbe9f55..0000000000
--- a/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/annotations/RemoveBroadcastsRestrictionCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.netguard.broadcasts.removerestriction.resource.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("eu.faircode.netguard")])
-@Target(AnnotationTarget.CLASS)
-annotation class RemoveBroadcastsRestrictionCompatibility
diff --git a/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt b/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
deleted file mode 100644
index 8bd7f6b1e1..0000000000
--- a/main/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package app.revanced.patches.netguard.broadcasts.removerestriction.resource.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.netguard.broadcasts.removerestriction.resource.annotations.RemoveBroadcastsRestrictionCompatibility
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Remove broadcasts restriction")
-@Description("Enables starting/stopping NetGuard via broadcasts.")
-@RemoveBroadcastsRestrictionCompatibility
-class RemoveBroadcastsRestrictionPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["AndroidManifest.xml"].use { dom ->
-            val applicationNode = dom
-                .file
-                .getElementsByTagName("application")
-                .item(0) as Element
-
-            applicationNode.getElementsByTagName("receiver").also {  list ->
-                for (i in 0 until list.length) {
-                    val element = list.item(i) as? Element ?: continue
-                    if (element.getAttribute("android:name") == "eu.faircode.netguard.WidgetAdmin") {
-                        element.removeAttribute("android:permission")
-                        break
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/nfctoolsse/misc/pro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/nfctoolsse/misc/pro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index 0fdf6ac068..0000000000
--- a/main/app/revanced/patches/nfctoolsse/misc/pro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.nfctoolsse.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.wakdev.apps.nfctools.se")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt b/main/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt
deleted file mode 100644
index fd6089e398..0000000000
--- a/main/app/revanced/patches/nfctoolsse/misc/pro/fingerprints/IsLicenseRegisteredFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.nfctoolsse.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IsLicenseRegisteredFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC.value,
-    strings = listOf("kLicenseCheck")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt b/main/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
deleted file mode 100644
index 7e9ca26000..0000000000
--- a/main/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.patches.nfctoolsse.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.nfctoolsse.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.nfctoolsse.misc.pro.fingerprints.IsLicenseRegisteredFingerprint
-
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        IsLicenseRegisteredFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsLicenseRegisteredFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """
-            )
-        } ?: return IsLicenseRegisteredFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt b/main/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt
deleted file mode 100644
index 8ab3cc7808..0000000000
--- a/main/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.nova.prime.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.teslacoilsw.launcher")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPrimeCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt b/main/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt
deleted file mode 100644
index 69d2902a4d..0000000000
--- a/main/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.nova.prime.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object UnlockPrimeFingerprint : MethodFingerprint(
-    "V",
-    opcodes = listOf(
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_STRING,
-        Opcode.CONST_4,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT
-    ),
-    strings = listOf("1")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/nova/prime/patch/UnlockPrimePatch.kt b/main/app/revanced/patches/nova/prime/patch/UnlockPrimePatch.kt
deleted file mode 100644
index 4c1546041b..0000000000
--- a/main/app/revanced/patches/nova/prime/patch/UnlockPrimePatch.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package app.revanced.patches.nova.prime.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.nova.prime.annotations.UnlockPrimeCompatibility
-import app.revanced.patches.nova.prime.fingerprints.UnlockPrimeFingerprint
-import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
-
-@Patch
-@Name("Unlock prime")
-@Description("Unlocks Nova Prime and all functions of the app.")
-@UnlockPrimeCompatibility
-class UnlockPrimePatch : BytecodePatch(
-    listOf(
-        UnlockPrimeFingerprint
-    )
-) {
-    private companion object {
-        // Any value except 0 unlocks prime, but 512 is needed for a protection mechanism
-        // which would reset the preferences if the value on disk had changed after a restart.
-        const val PRIME_STATUS: Int = 512
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        UnlockPrimeFingerprint.result?.apply {
-            val insertIndex = scanResult.patternScanResult!!.endIndex + 1
-
-            val primeStatusRegister =
-                (mutableMethod.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
-
-            mutableMethod.addInstruction(
-                insertIndex,
-                """
-                    const/16 v$primeStatusRegister, $PRIME_STATUS
-                """
-            )
-        } ?: return UnlockPrimeFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/nyx/misc/pro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/nyx/misc/pro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index c8aef11cbf..0000000000
--- a/main/app/revanced/patches/nyx/misc/pro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.nyx.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.awedea.nyx")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/nyx/misc/pro/fingerprints/CheckProFingerprint.kt b/main/app/revanced/patches/nyx/misc/pro/fingerprints/CheckProFingerprint.kt
deleted file mode 100644
index d03ed15272..0000000000
--- a/main/app/revanced/patches/nyx/misc/pro/fingerprints/CheckProFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.nyx.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckProFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("BillingManager;") && methodDef.name == "isProVersion"
-    }
-)
diff --git a/main/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt b/main/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
deleted file mode 100644
index 3aebe83053..0000000000
--- a/main/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.nyx.misc.pro.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.nyx.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.nyx.misc.pro.fingerprints.CheckProFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        CheckProFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = CheckProFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt b/main/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
deleted file mode 100644
index df2445be7d..0000000000
--- a/main/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.photomath.detection.signature.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object CheckSignatureFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
-        (methodDef.definingClass == "Lcom/microblink/photomath/main/activity/LauncherActivity;" ||
-                methodDef.definingClass == "Lcom/microblink/photomath/PhotoMath;") &&
-                methodDef.name == "onCreate"
-    },
-    strings = listOf(
-        "currentSignature"
-    ),
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_STATIC,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-    )
-)
diff --git a/main/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt b/main/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
deleted file mode 100644
index 5d2d5b03fb..0000000000
--- a/main/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.photomath.detection.signature.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Description("Disables detection of incorrect signature.")
-class SignatureDetectionPatch : BytecodePatch(
-    listOf(
-        CheckSignatureFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CheckSignatureFingerprint.result?.apply {
-            val signatureCheckInstruction = mutableMethod.getInstruction(scanResult.patternScanResult!!.endIndex)
-            val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA
-
-            mutableMethod.replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
-        } ?: throw CheckSignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
diff --git a/main/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt b/main/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
deleted file mode 100644
index aa73c1fd3d..0000000000
--- a/main/app/revanced/patches/photomath/misc/unlockplus/annotations/UnlockPlusCompatibilty.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.photomath.misc.unlockplus.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.microblink.photomath", arrayOf("8.20.0"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPlusCompatibilty
diff --git a/main/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt b/main/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt
deleted file mode 100644
index 9f9dddffaf..0000000000
--- a/main/app/revanced/patches/photomath/misc/unlockplus/fingerprints/IsPlusUnlockedFingerprint.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.photomath.misc.unlockplus.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IsPlusUnlockedFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf(
-        "genius"
-    ),
-    customFingerprint = {
-        methodDef, _ -> methodDef.definingClass.endsWith("/User;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt b/main/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
deleted file mode 100644
index b0dc015bdc..0000000000
--- a/main/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.photomath.misc.unlockplus.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
-import app.revanced.patches.photomath.misc.unlockplus.annotations.UnlockPlusCompatibilty
-import app.revanced.patches.photomath.misc.unlockplus.fingerprints.IsPlusUnlockedFingerprint
-
-@Patch
-@Name("Unlock plus")
-@DependsOn([SignatureDetectionPatch::class])
-@Description("Unlocks plus features.")
-@UnlockPlusCompatibilty
-class UnlockPlusPatch : BytecodePatch(
-    listOf(
-        IsPlusUnlockedFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsPlusUnlockedFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """
-            )
-        } ?: return IsPlusUnlockedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/pixiv/ads/fingerprints/IsNotPremiumFingerprint.kt b/main/app/revanced/patches/pixiv/ads/fingerprints/IsNotPremiumFingerprint.kt
deleted file mode 100644
index 453ec7fe30..0000000000
--- a/main/app/revanced/patches/pixiv/ads/fingerprints/IsNotPremiumFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package app.revanced.patches.pixiv.ads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-
-object IsNotPremiumFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L"),
-    strings = listOf("pixivAccountManager"),
-    customFingerprint = custom@{ _, classDef ->
-        // The "isNotPremium" method is the only method in the class.
-        if (classDef.virtualMethods.count() != 1) return@custom false
-
-        classDef.virtualMethods.first().let { isNotPremiumMethod ->
-            isNotPremiumMethod.parameterTypes.size == 0 && isNotPremiumMethod.returnType == "Z"
-        }
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt b/main/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
deleted file mode 100644
index d2d975aa94..0000000000
--- a/main/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.pixiv.ads.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.pixiv.ads.fingerprints.IsNotPremiumFingerprint
-
-@Patch
-@Name("Hide ads")
-@Description("Hides ads.")
-@Compatibility([Package("jp.pxv.android")])
-class HideAdsPatch : BytecodePatch(listOf(IsNotPremiumFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Always return false in the "isNotPremium" method which normally returns !this.accountManager.isPremium.
-        // However, this is not the method that controls the user's premium status.
-        // Instead, this method is used to determine whether ads should be shown.
-        IsNotPremiumFingerprint.result?.mutableClass?.virtualMethods?.first()?.addInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """
-        ) ?: return IsNotPremiumFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt b/main/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
deleted file mode 100644
index 11df0eded3..0000000000
--- a/main/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.reddit.ad.banner.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-
-@Name("Hide subreddit banner")
-@Description("Hides banner ads from comments on subreddits.")
-class HideBannerPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor[RESOURCE_FILE_PATH].use {
-            it.file.getElementsByTagName("merge").item(0).childNodes.apply {
-                val attributes = arrayOf("height", "width")
-
-                for (i in 1 until length) {
-                    val view = item(i)
-                    if (
-                        view.hasAttributes() &&
-                        view.attributes.getNamedItem("android:id").nodeValue.endsWith("ad_view_stub")
-                    ) {
-                        attributes.forEach { attribute ->
-                            view.attributes.getNamedItem("android:layout_$attribute").nodeValue = "0.0dip"
-                        }
-
-                        break
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val RESOURCE_FILE_PATH = "res/layout/merge_listheader_link_detail.xml"
-    }
-}
-
diff --git a/main/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt b/main/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt
deleted file mode 100644
index a7142d290c..0000000000
--- a/main/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.reddit.ad.comments.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object HideCommentAdsFingerprint : MethodFingerprint(
-    strings = listOf(
-        "link",
-        // CommentPageRepository is not returning a link object
-        "is not returning a link object"
-    ),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "PostDetailPresenter.kt"
-    },
-)
diff --git a/main/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt b/main/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
deleted file mode 100644
index 7c307e0b45..0000000000
--- a/main/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.reddit.ad.comments.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
-
-@Name("Hide comment ads")
-@Description("Removes all comment ads.")
-class HideCommentAdsPatch : BytecodePatch(
-    listOf(HideCommentAdsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = HideCommentAdsFingerprint.result!!.mutableMethod
-        // Returns a blank object instead of the comment ad.
-        method.addInstructions(
-            0,
-            """
-            new-instance v0, Ljava/lang/Object;
-            invoke-direct {v0}, Ljava/lang/Object;-><init>()V
-            return-object v0
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/reddit/ad/general/annotations/HideAdsCompatibility.kt b/main/app/revanced/patches/reddit/ad/general/annotations/HideAdsCompatibility.kt
deleted file mode 100644
index cc9230c57a..0000000000
--- a/main/app/revanced/patches/reddit/ad/general/annotations/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.reddit.ad.general.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.reddit.frontpage")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
diff --git a/main/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt b/main/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt
deleted file mode 100644
index aecacc29cd..0000000000
--- a/main/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.reddit.ad.general.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AdPostFingerprint : MethodFingerprint(
-    "V",
-    // "children" are present throughout multiple versions
-    strings = listOf("children"),
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("Listing;") },
-)
diff --git a/main/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt b/main/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt
deleted file mode 100644
index 130aba52b6..0000000000
--- a/main/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.reddit.ad.general.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object NewAdPostFingerprint : MethodFingerprint(
-    opcodes = listOf(Opcode.INVOKE_VIRTUAL),
-    strings = listOf("chain", "feedElement"),
-    customFingerprint = { _, classDef -> classDef.sourceFile == "AdElementConverter.kt" },
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt b/main/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
deleted file mode 100644
index 3fb1c21402..0000000000
--- a/main/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package app.revanced.patches.reddit.ad.general.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.reddit.ad.banner.patch.HideBannerPatch
-import app.revanced.patches.reddit.ad.comments.patch.HideCommentAdsPatch
-import app.revanced.patches.reddit.ad.general.annotations.HideAdsCompatibility
-import app.revanced.patches.reddit.ad.general.fingerprints.AdPostFingerprint
-import app.revanced.patches.reddit.ad.general.fingerprints.NewAdPostFingerprint
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.iface.reference.MethodReference
-
-@Patch
-@Name("Hide ads")
-@Description("Removes ads from the Reddit.")
-@DependsOn([HideBannerPatch::class, HideCommentAdsPatch::class])
-@HideAdsCompatibility
-@RequiresIntegrations
-class HideAdsPatch : BytecodePatch(
-    listOf(AdPostFingerprint, NewAdPostFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // region Filter promoted ads (does not work in popular or latest feed)
-
-        AdPostFingerprint.result?.mutableMethod?.apply {
-            val setPostsListChildren = implementation!!.instructions.first { instruction ->
-                if (instruction.opcode != Opcode.IPUT_OBJECT) return@first false
-
-                val reference = (instruction as ReferenceInstruction).reference as FieldReference
-                reference.name == "children"
-            }
-
-            val castedInstruction = setPostsListChildren as Instruction22c
-            val itemsRegister = castedInstruction.registerA
-            val listInstanceRegister = castedInstruction.registerB
-
-            // postsList.children = filterChildren(postListItems)
-            removeInstruction(setPostsListChildren.location.index)
-            addInstructions(
-                setPostsListChildren.location.index,
-                """
-                    invoke-static {v$itemsRegister}, $FILTER_METHOD_DESCRIPTOR
-                    move-result-object v0
-                    iput-object v0, v$listInstanceRegister, ${castedInstruction.reference}
-                """
-            )
-        }
-
-        // endregion
-
-        // region Remove ads from popular and latest feed
-
-        NewAdPostFingerprint.result?.let { result ->
-            // The new feeds work by inserting posts into lists.
-            // AdElementConverter is conveniently responsible for inserting all feed ads.
-            // By removing the appending instruction no ad posts gets appended to the feed.
-            val index = result.method.implementation!!.instructions.indexOfFirst {
-                if (it.opcode != Opcode.INVOKE_VIRTUAL) return@indexOfFirst false
-
-                val reference = (it as ReferenceInstruction).reference as MethodReference
-
-                reference.name == "add" && reference.definingClass == "Ljava/util/ArrayList;"
-            }
-
-            result.mutableMethod.removeInstruction(index)
-        }
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val FILTER_METHOD_DESCRIPTOR =
-            "Lapp/revanced/reddit/patches/FilterPromotedLinksPatch;" +
-                    "->filterChildren(Ljava/lang/Iterable;)Ljava/util/List;"
-    }
-}
diff --git a/main/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
deleted file mode 100644
index 972b6dd5a3..0000000000
--- a/main/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package app.revanced.patches.reddit.customclients
-
-import android.os.Environment
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.*
-import java.io.File
-
-abstract class AbstractSpoofClientPatch(
-    private val redirectUri: String,
-    private val options: SpoofClientOptionsContainer,
-    private val clientIdFingerprints: List<MethodFingerprint>,
-    private val userAgentFingerprints: List<MethodFingerprint>? = null,
-) : BytecodePatch(buildList {
-    addAll(clientIdFingerprints)
-    userAgentFingerprints?.let(::addAll)
-}) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (options.clientId == null) {
-            // Ensure device runs Android.
-            try {
-                Class.forName("android.os.Environment")
-            } catch (e: ClassNotFoundException) {
-                return PatchResultError("No client ID provided")
-            }
-
-            File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
-                if (it.exists()) return@also
-
-                val error = """
-                    In order to use this patch, you need to provide a client ID.
-                    You can do this by creating a file at ${it.absolutePath} with the client ID as its content.
-                    Alternatively, you can provide the client ID using patch options.
-                    
-                    You can get your client ID from https://www.reddit.com/prefs/apps.
-                    The application type has to be "Installed app" and the redirect URI has to be set to "$redirectUri".
-                """.trimIndent()
-
-                return PatchResultError(error)
-            }.let { options.clientId = it.readText().trim() }
-        }
-
-        fun List<MethodFingerprint>?.executePatch(
-            patch: List<MethodFingerprintResult>.(BytecodeContext) -> PatchResult
-        ) {
-            when (val result = this?.map { it.result ?: throw it.toErrorResult() }?.patch(context)) {
-                is PatchResultError -> throw result
-            }
-        }
-
-        clientIdFingerprints.executePatch { patchClientId(context) }
-        userAgentFingerprints.executePatch { patchUserAgent(context) }
-
-        return PatchResultSuccess()
-    }
-
-    /**
-     * Patch the client ID. The fingerprints are guaranteed to be in the same order as in [clientIdFingerprints].
-     *
-     * @param context The current [BytecodeContext].
-     *
-     */
-    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult
-
-    /**
-     * Patch the user agent. The fingerprints are guaranteed to be in the same order as in [userAgentFingerprints].
-     *
-     * @param context The current [BytecodeContext].
-     */
-    // Not every client needs to patch the user agent.
-    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult =
-        PatchResultSuccess()
-
-    companion object Options {
-        open class SpoofClientOptionsContainer : OptionsContainer() {
-            var clientId by option(
-                PatchOption.StringOption(
-                    "client-id",
-                    null,
-                    "OAuth client ID",
-                    "The Reddit OAuth client ID."
-                )
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/SpoofClientAnnotation.kt b/main/app/revanced/patches/reddit/customclients/SpoofClientAnnotation.kt
deleted file mode 100644
index 9aede0fe11..0000000000
--- a/main/app/revanced/patches/reddit/customclients/SpoofClientAnnotation.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.reddit.customclients
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.Patch
-
-@Target(AnnotationTarget.CLASS)
-@Patch
-@Name("Spoof client")
-annotation class SpoofClientAnnotation
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetAuthorizationUrlFingerprint.kt b/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetAuthorizationUrlFingerprint.kt
deleted file mode 100644
index 870d569ccf..0000000000
--- a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetAuthorizationUrlFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetAuthorizationUrlFingerprint: MethodFingerprint(
-    strings = listOf("client_id=zACVn0dSFGdWqQ"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetClientIdFingerprint.kt
deleted file mode 100644
index 8049f362a0..0000000000
--- a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/GetClientIdFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetClientIdFingerprint : MethodFingerprint(
-    strings = listOf("client_id=zACVn0dSFGdWqQ"),
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith("RedditOAuth;")) return@custom false
-
-        methodDef.name == "getAuthorizeUrl"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/RequestTokenFingerprint.kt b/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/RequestTokenFingerprint.kt
deleted file mode 100644
index 4e4eddac87..0000000000
--- a/main/app/revanced/patches/reddit/customclients/baconreader/api/fingerprints/RequestTokenFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.baconreader.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object RequestTokenFingerprint : MethodFingerprint(
-    strings = listOf("zACVn0dSFGdWqQ", "kDm2tYpu9DqyWFFyPlNcXGEni4k"), // App ID and secret.
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 39b197c49f..0000000000
--- a/main/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package app.revanced.patches.reddit.customclients.baconreader.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
-import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.RequestTokenFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"http://baconreader.com/auth\".")
-@Compatibility(
-    [
-        Package("com.onelouder.baconreader"),
-        Package("com.onelouder.baconreader.premium")
-    ]
-)
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://baconreader.com/auth", Options, listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
-) {
-
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        fun MethodFingerprintResult.patch(replacementString: String) {
-            val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index
-
-            mutableMethod.apply {
-                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
-                replaceInstruction(
-                    clientIdIndex,
-                    "const-string v$clientIdRegister, \"$replacementString\""
-                )
-            }
-        }
-
-        // Patch client id in authorization url.
-        first().patch("client_id=$clientId")
-
-        // Patch client id for access token request.
-        last().patch(clientId!!)
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
diff --git a/main/app/revanced/patches/reddit/customclients/boostforreddit/api/fingerprints/GetClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/boostforreddit/api/fingerprints/GetClientIdFingerprint.kt
deleted file mode 100644
index c8ffa4baef..0000000000
--- a/main/app/revanced/patches/reddit/customclients/boostforreddit/api/fingerprints/GetClientIdFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetClientIdFingerprint : MethodFingerprint(
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith("Credentials;")) return@custom false
-
-        methodDef.name == "getClientId"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 1f721e55f3..0000000000
--- a/main/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.reddit.customclients.boostforreddit.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"http://rubenmayayo.com\".")
-@Compatibility([Package("com.rubenmayayo.reddit")])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://rubenmayayo.com", Options, listOf(GetClientIdFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        first().mutableMethod.addInstructions(
-            0,
-            """
-                 const-string v0, "$clientId"
-                 return-object v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
diff --git a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
deleted file mode 100644
index 9099dfefa6..0000000000
--- a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-abstract class AbstractClientIdFingerprint(classTypeSuffix: String, methodName: String) : MethodFingerprint(
-    strings = listOf("NOe2iKrPPzwscA"),
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith(classTypeSuffix)) return@custom false
-
-        methodDef.name == methodName
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt b/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
deleted file mode 100644
index c7e3f0ae98..0000000000
--- a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-object GetHttpBasicAuthHeaderFingerprint : AbstractClientIdFingerprint(
-    "APIUtils;",
-    "getHttpBasicAuthHeader"
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt b/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
deleted file mode 100644
index 740fd318da..0000000000
--- a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-object LoginActivityOnCreateFingerprint : AbstractClientIdFingerprint(
-    "LoginActivity;",
-    "onCreate"
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 88c3469816..0000000000
--- a/main/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
-import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"infinity://localhost\".")
-@Compatibility([Package("ml.docilealligator.infinityforreddit")])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "infinity://localhost",
-    Options,
-    listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        forEach {
-            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
-            it.mutableMethod.apply {
-                val oAuthClientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
-
-                replaceInstruction(
-                    clientIdIndex,
-                    "const-string v$oAuthClientIdRegister, \"$clientId\""
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/fingerprints/IsAdFreeUserFingerprint.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/fingerprints/IsAdFreeUserFingerprint.kt
deleted file mode 100644
index 4c625220d2..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/fingerprints/IsAdFreeUserFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IsAdFreeUserFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC.value,
-    strings = listOf("AD_FREE_USER")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
deleted file mode 100644
index 7b0c565da3..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.ads.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints.IsAdFreeUserFingerprint
-import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
-
-@Patch
-@Name("Disable ads")
-@DependsOn([DisablePiracyDetectionPatch::class])
-@Compatibility([Package("o.o.joey")])
-class DisableAdsPatch : BytecodePatch(listOf(IsAdFreeUserFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsAdFreeUserFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        ) ?: return IsAdFreeUserFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/fingerprints/GetClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/fingerprints/GetClientIdFingerprint.kt
deleted file mode 100644
index 861bb0dd73..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/fingerprints/GetClientIdFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.api.fingerprints
-
-import app.revanced.patcher.extensions.or
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetClientIdFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    opcodes = listOf(
-        Opcode.CONST,               // R.string.valuable_cid
-        Opcode.INVOKE_STATIC,       // StringMaster.decrypt
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    ),
-    customFingerprint = custom@{ _, classDef ->
-        classDef.sourceFile == "AuthUtility.java"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 8bd8ce6d00..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.joeyforreddit.api.fingerprints.GetClientIdFingerprint
-import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
-
-@SpoofClientAnnotation
-@Description(
-    "Spoofs the client in order to allow logging in. " +
-            "The OAuth application type has to be \"Installed app\" " +
-            "and the redirect URI has to be set to \"https://127.0.0.1:65023/authorize_callback\"."
-)
-@Compatibility(
-    [
-        Package("o.o.joey"),
-        Package("o.o.joey.pro"),
-        Package("o.o.joey.dev")
-    ]
-)
-@DependsOn([DisablePiracyDetectionPatch::class])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "https://127.0.0.1:65023/authorize_callback", Options, listOf(GetClientIdFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        first().mutableMethod.addInstructions(
-            0,
-            """
-                const-string v0, "$clientId"
-                return-object v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
deleted file mode 100644
index dfd1d4afc4..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object PiracyDetectionFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.STATIC,
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,    // new PiracyDetectionRunnable()
-        Opcode.CONST_16,
-        Opcode.CONST_WIDE_16,
-        Opcode.INVOKE_DIRECT,   // <init>(..)
-        Opcode.INVOKE_VIRTUAL,  // run()
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = custom@{ _, classDef ->
-        classDef.type.endsWith("ProcessLifeCyleListener;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt b/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
deleted file mode 100644
index b2935fa854..0000000000
--- a/main/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
-
-class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        PiracyDetectionFingerprint.result?.mutableMethod?.addInstruction(
-            0,
-            """
-                return-void
-            """
-        ) ?: return PiracyDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/AbstractClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/AbstractClientIdFingerprint.kt
deleted file mode 100644
index fe166b91d8..0000000000
--- a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/AbstractClientIdFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-abstract class AbstractClientIdFingerprint(string: String) : MethodFingerprint(
-    strings = listOfNotNull("yyOCBp.RHJhDKd", string),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BasicAuthorizationFingerprint.kt b/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BasicAuthorizationFingerprint.kt
deleted file mode 100644
index 9e4b3530a4..0000000000
--- a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BasicAuthorizationFingerprint.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
-
-object BasicAuthorizationFingerprint : AbstractClientIdFingerprint(
-    string = "fJOxVwBUyo*=f:<OoejWs:AqmIJ", // Encrypted basic authorization string.
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BuildAuthorizationStringFingerprint.kt b/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BuildAuthorizationStringFingerprint.kt
deleted file mode 100644
index 514a91ae31..0000000000
--- a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/BuildAuthorizationStringFingerprint.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
-
-object BuildAuthorizationStringFingerprint : AbstractClientIdFingerprint(
-    string = "client_id"
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/GetUserAgentFingerprint.kt b/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/GetUserAgentFingerprint.kt
deleted file mode 100644
index 24609d686c..0000000000
--- a/main/app/revanced/patches/reddit/customclients/redditisfun/api/fingerprints/GetUserAgentFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object GetUserAgentFingerprint : MethodFingerprint(
-    "Ljava/lang/String;",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    emptyList(),
-    listOf(
-        Opcode.NEW_ARRAY,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.APUT_OBJECT,
-        Opcode.CONST,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index b5228a2a8f..0000000000
--- a/main/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package app.revanced.patches.reddit.customclients.redditisfun.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
-import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BuildAuthorizationStringFingerprint
-import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.GetUserAgentFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"redditisfun://auth\".")
-@Compatibility([Package("com.andrewshu.android.reddit"), Package("com.andrewshu.android.redditdonation")])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "redditisfun://auth",
-    Options,
-    listOf(BuildAuthorizationStringFingerprint, BasicAuthorizationFingerprint),
-    listOf(GetUserAgentFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        /**
-         * Replaces a one register instruction with a const-string instruction
-         * at the index returned by [getReplacementIndex].
-         *
-         * @param string The string to replace the instruction with.
-         * @param getReplacementIndex A function that returns the index of the instruction to replace
-         * using the [StringMatch] list from the [MethodFingerprintResult].
-         */
-        fun MethodFingerprintResult.replaceWith(
-            string: String,
-            getReplacementIndex: List<StringMatch>.() -> Int,
-        ) = mutableMethod.apply {
-            val replacementIndex = scanResult.stringsScanResult!!.matches.getReplacementIndex()
-            val clientIdRegister = getInstruction<OneRegisterInstruction>(replacementIndex).registerA
-
-            replaceInstruction(replacementIndex, "const-string v$clientIdRegister, \"$string\"")
-        }
-
-        // Patch OAuth authorization.
-        first().replaceWith(clientId!!) { first().index + 4 }
-
-        // Path basic authorization.
-        last().replaceWith("$clientId:") { last().index + 7 }
-
-        return PatchResultSuccess()
-    }
-
-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult {
-        // Use a random number as the user agent string.
-        val randomUserAgent = (0..100000).random()
-
-        first().mutableMethod.addInstructions(
-            0,
-            """
-                 const-string v0, "$randomUserAgent"
-                 return-object v0
-             """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
deleted file mode 100644
index 8cb5161f5c..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-abstract class AbstractClientIdFingerprint(string: String) : MethodFingerprint(
-    strings = listOfNotNull("dj-xCIZQYiLbEg", string),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt
deleted file mode 100644
index 9ba4ec6286..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
-
-object GetLoggedInBearerTokenFingerprint : AbstractClientIdFingerprint("authorization_code")
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt
deleted file mode 100644
index 74e479c586..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
-
-object GetLoggedOutBearerTokenFingerprint : AbstractClientIdFingerprint("https://oauth.reddit.com/grants/installed_client")
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt
deleted file mode 100644
index 492a5554c9..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
-
-object GetRefreshTokenFingerprint : AbstractClientIdFingerprint("refresh_token")
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt
deleted file mode 100644
index ba260ee195..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
-
-object LoginActivityClientIdFingerprint : AbstractClientIdFingerprint("&duration=permanent")
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 9c4fdfe543..0000000000
--- a/main/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package app.revanced.patches.reddit.customclients.relayforreddit.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedOutBearerTokenFingerprint
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetRefreshTokenFingerprint
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.LoginActivityClientIdFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"dbrady://relay\".")
-@Compatibility([Package("free.reddit.news"), Package("reddit.news")])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "dbrady://relay",
-    Options,
-    listOf(
-        LoginActivityClientIdFingerprint,
-        GetLoggedInBearerTokenFingerprint,
-        GetLoggedOutBearerTokenFingerprint,
-        GetRefreshTokenFingerprint
-    )
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        forEach {
-            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
-            it.mutableMethod.apply {
-                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
-
-                it.mutableMethod.replaceInstruction(
-                    clientIdIndex,
-                    "const-string v$clientIdRegister, \"$clientId\""
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/slide/api/fingerprints/GetClientIdFingerprint.kt b/main/app/revanced/patches/reddit/customclients/slide/api/fingerprints/GetClientIdFingerprint.kt
deleted file mode 100644
index 9caed98521..0000000000
--- a/main/app/revanced/patches/reddit/customclients/slide/api/fingerprints/GetClientIdFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.reddit.customclients.slide.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetClientIdFingerprint : MethodFingerprint(
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith("Credentials;")) return@custom false
-
-        methodDef.name == "getClientId"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index b218291695..0000000000
--- a/main/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.reddit.customclients.slide.api.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"http://www.ccrama.me\".")
-@Compatibility([Package("me.ccrama.redditslide")])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://www.ccrama.me", Options, listOf(GetClientIdFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        first().mutableMethod.addInstructions(
-            0,
-    """
-                     const-string v0, "$clientId"
-                     return-object v0
-                """
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt
deleted file mode 100644
index 40c98bc2ba..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/fingerprints/IsAdsEnabledFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object IsAdsEnabledFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    strings = listOf("SyncIapHelper")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
deleted file mode 100644
index 367ca8f90d..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.ads.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
-import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
-
-@Patch
-@Name("Disable ads")
-@DependsOn([DisablePiracyDetectionPatch::class])
-@Compatibility([Package("com.laurencedawson.reddit_sync")])
-class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsAdsEnabledFingerprint.result?.mutableMethod?.apply {
-            addInstructions(
-                0,
-                """
-                const/4 v0, 0x0
-                return v0
-            """
-            )
-        } ?: return IsAdsEnabledFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/fingerprints/MainActivityOnCreate.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/fingerprints/MainActivityOnCreate.kt
deleted file mode 100644
index 6473502526..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/fingerprints/MainActivityOnCreate.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startup.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object MainActivityOnCreate : MethodFingerprint(
-    customFingerprint = custom@{ method, classDef ->
-        classDef.type.endsWith("MainActivity;") && method.name == "onCreate"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
deleted file mode 100644
index e47e6ea013..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startup.patch
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startup.fingerprints.MainActivityOnCreate
-
-@Patch
-@Name("Disable Sync for Lemmy bottom sheet")
-@Description("Disables the bottom sheet at the startup that asks you to signup to \"Sync for Lemmy\".")
-@Compatibility(
-    [
-        Package("com.laurencedawson.reddit_sync", ["v23.06.30-13:39"]),
-        Package("com.laurencedawson.reddit_sync.pro"), // Version unknown.
-        Package("com.laurencedawson.reddit_sync.dev") // Version unknown.
-    ]
-)
-class DisableSyncForLemmyBottomSheetPatch : BytecodePatch(listOf(MainActivityOnCreate)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        MainActivityOnCreate.result?.mutableMethod?.apply {
-            val showBottomSheetIndex = implementation!!.instructions.lastIndex - 1
-
-            removeInstruction(showBottomSheetIndex)
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt
deleted file mode 100644
index 0e517e1d35..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetAuthorizationStringFingerprint : MethodFingerprint(
-    strings = listOf("authorize.compact?client_id")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt
deleted file mode 100644
index 0d4fee94b7..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetBearerTokenFingerprint : MethodFingerprint(
-    strings = listOf("Basic")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
deleted file mode 100644
index 2f1ec7a1bb..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.api.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Package
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
-import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
-import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
-import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch.DisablePiracyDetectionPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-import java.util.*
-
-@SpoofClientAnnotation
-@Description("Spoofs the client in order to allow logging in. " +
-        "The OAuth application type has to be \"Installed app\" " +
-        "and the redirect URI has to be set to \"http://redditsync/auth\".")
-@Compatibility(
-    [
-        Package("com.laurencedawson.reddit_sync"),
-        Package("com.laurencedawson.reddit_sync.pro"),
-        Package("com.laurencedawson.reddit_sync.dev")
-    ]
-)
-@DependsOn([DisablePiracyDetectionPatch::class])
-class SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://redditsync/auth", Options, listOf(GetAuthorizationStringFingerprint)
-) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
-        forEach { fingerprintResult ->
-            fingerprintResult.also { result ->
-                GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
-                    val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8))
-                    addInstructions(
-                        0,
-                        """
-                         const-string v0, "Basic $auth"
-                         return-object v0
-                    """
-                    )
-                } ?: return GetBearerTokenFingerprint.toErrorResult()
-            }.let {
-                val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index
-
-                it.mutableMethod.apply {
-                    val authorizationStringInstruction = getInstruction<ReferenceInstruction>(occurrenceIndex)
-                    val targetRegister = (authorizationStringInstruction as OneRegisterInstruction).registerA
-                    val reference = authorizationStringInstruction.reference as StringReference
-
-                    val newAuthorizationUrl = reference.string.replace(
-                        "client_id=.*?&".toRegex(),
-                        "client_id=$clientId&"
-                    )
-
-                    replaceInstruction(
-                        occurrenceIndex,
-                        "const-string v$targetRegister, \"$newAuthorizationUrl\""
-                    )
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
-}
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
deleted file mode 100644
index f420ce16b7..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/fingerprints/PiracyDetectionFingerprint.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-
-object PiracyDetectionFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL
-    ),
-    customFingerprint = { method, _ ->
-        method.implementation?.instructions?.any {
-            if (it.opcode != Opcode.NEW_INSTANCE) return@any false
-
-            val reference = (it as ReferenceInstruction).reference
-
-            reference.toString() == "Lcom/github/javiersantos/piracychecker/PiracyChecker;"
-        } ?: false
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt b/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
deleted file mode 100644
index f0d7306034..0000000000
--- a/main/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
-
-@Description("Disables detection of modified versions.")
-class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Do not return an error if the fingerprint is not resolved.
-        // This is fine because new versions of the target app do not need this patch.
-        PiracyDetectionFingerprint.result?.mutableMethod?.apply {
-            addInstruction(
-                0,
-                """
-                    return-void
-                """
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/annotations/DisableScreenshotPopupCompatibility.kt b/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/annotations/DisableScreenshotPopupCompatibility.kt
deleted file mode 100644
index d0620b564f..0000000000
--- a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/annotations/DisableScreenshotPopupCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.reddit.frontpage")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableScreenshotPopupCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/fingerprints/DisableScreenshotPopupFingerprint.kt b/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/fingerprints/DisableScreenshotPopupFingerprint.kt
deleted file mode 100644
index de74945c2f..0000000000
--- a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/fingerprints/DisableScreenshotPopupFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object DisableScreenshotPopupFingerprint : MethodFingerprint(
-    "V",
-    parameters = listOf("Landroidx/compose/runtime/", "I"),
-    customFingerprint = custom@{ methodDef, classDef ->
-        if (!classDef.type.endsWith("\$ScreenshotTakenBannerKt\$lambda-1\$1;"))
-                return@custom false
-
-        methodDef.name == "invoke"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt b/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
deleted file mode 100644
index 740252f29a..0000000000
--- a/main/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.reddit.layout.disablescreenshotpopup.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations.DisableScreenshotPopupCompatibility
-import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.DisableScreenshotPopupFingerprint
-
-@Patch
-@Name("Disable screenshot popup")
-@Description("Disables the popup that shows up when taking a screenshot.")
-@DisableScreenshotPopupCompatibility
-class DisableScreenshotPopupPatch : BytecodePatch(
-    listOf(DisableScreenshotPopupFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        DisableScreenshotPopupFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return DisableScreenshotPopupFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt b/main/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
deleted file mode 100644
index 079d5f6cab..0000000000
--- a/main/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.reddit.frontpage")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PremiumIconCompatibility
diff --git a/main/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt b/main/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
deleted file mode 100644
index c406791ed0..0000000000
--- a/main/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PremiumIconFingerprint : MethodFingerprint(
-    "Z",
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt b/main/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
deleted file mode 100644
index 8233d8115e..0000000000
--- a/main/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
-import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
-
-@Patch
-@Name("Premium icon reddit")
-@Description("Unlocks premium Reddit app icons.")
-@PremiumIconCompatibility
-class PremiumIconPatch : BytecodePatch(
-    listOf(
-        PremiumIconFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = PremiumIconFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/reddit/misc/tracking/url/annotations/SanitizeUrlQueryCompatibility.kt b/main/app/revanced/patches/reddit/misc/tracking/url/annotations/SanitizeUrlQueryCompatibility.kt
deleted file mode 100644
index 6ba4a8902b..0000000000
--- a/main/app/revanced/patches/reddit/misc/tracking/url/annotations/SanitizeUrlQueryCompatibility.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.reddit.misc.tracking.url.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.reddit.frontpage"
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class SanitizeUrlQueryCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/misc/tracking/url/fingerprints/ShareLinkFormatterFingerprint.kt b/main/app/revanced/patches/reddit/misc/tracking/url/fingerprints/ShareLinkFormatterFingerprint.kt
deleted file mode 100644
index be6d34690d..0000000000
--- a/main/app/revanced/patches/reddit/misc/tracking/url/fingerprints/ShareLinkFormatterFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.reddit.misc.tracking.url.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ShareLinkFormatterFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    parameters = listOf("Ljava/lang/String;", "Ljava/util/Map;"),
-    strings = listOf("uri.getQueryParameters(name)", "uri.queryParameterNames", "newUriBuilder.build().toString()"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt b/main/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
deleted file mode 100644
index cb1735b856..0000000000
--- a/main/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.reddit.misc.tracking.url.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.misc.tracking.url.annotations.SanitizeUrlQueryCompatibility
-import app.revanced.patches.reddit.misc.tracking.url.fingerprints.ShareLinkFormatterFingerprint
-
-@Patch
-@Name("Sanitize sharing links")
-@Description("Removes (tracking) query parameters from the URLs when sharing links.")
-@SanitizeUrlQueryCompatibility
-class SanitizeUrlQueryPatch : BytecodePatch(
-    listOf(ShareLinkFormatterFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        ShareLinkFormatterFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            "return-object p0"
-        ) ?: return ShareLinkFormatterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-}
diff --git a/main/app/revanced/patches/scbeasy/detection/debugging/annotations/RemoveDebuggingDetectionCompatibility.kt b/main/app/revanced/patches/scbeasy/detection/debugging/annotations/RemoveDebuggingDetectionCompatibility.kt
deleted file mode 100644
index 095abdaa37..0000000000
--- a/main/app/revanced/patches/scbeasy/detection/debugging/annotations/RemoveDebuggingDetectionCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.scbeasy.detection.debugging.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.scb.phone")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RemoveDebuggingDetectionCompatibility
diff --git a/main/app/revanced/patches/scbeasy/detection/debugging/fingerprints/DebuggingDetectionFingerprint.kt b/main/app/revanced/patches/scbeasy/detection/debugging/fingerprints/DebuggingDetectionFingerprint.kt
deleted file mode 100644
index 61408b471f..0000000000
--- a/main/app/revanced/patches/scbeasy/detection/debugging/fingerprints/DebuggingDetectionFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.scbeasy.detection.debugging.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object DebuggingDetectionFingerprint : MethodFingerprint(
-    returnType = "Z",
-    strings = listOf("adb_enabled")
-)
diff --git a/main/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt b/main/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
deleted file mode 100644
index 026b31554f..0000000000
--- a/main/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.scbeasy.detection.debugging.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.scbeasy.detection.debugging.annotations.RemoveDebuggingDetectionCompatibility
-import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDetectionFingerprint
-
-@Patch(false)
-@Name("Remove debugging detection")
-@Description("Removes the USB and wireless debugging checks.")
-@RemoveDebuggingDetectionCompatibility
-class RemoveDebuggingDetectionPatch : BytecodePatch(
-    listOf(DebuggingDetectionFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        DebuggingDetectionFingerprint.result!!.mutableMethod.addInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/shared/fingerprints/SeekbarFingerprint.kt b/main/app/revanced/patches/shared/fingerprints/SeekbarFingerprint.kt
deleted file mode 100644
index 572ec21932..0000000000
--- a/main/app/revanced/patches/shared/fingerprints/SeekbarFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.shared.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SeekbarFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("timed_markers_width")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/fingerprints/SeekbarOnDrawFingerprint.kt b/main/app/revanced/patches/shared/fingerprints/SeekbarOnDrawFingerprint.kt
deleted file mode 100644
index 8ec4e25674..0000000000
--- a/main/app/revanced/patches/shared/fingerprints/SeekbarOnDrawFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.shared.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SeekbarOnDrawFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ -> methodDef.name == "onDraw" }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/fingerprints/WatchWhileActivityFingerprint.kt b/main/app/revanced/patches/shared/fingerprints/WatchWhileActivityFingerprint.kt
deleted file mode 100644
index 9aec2409af..0000000000
--- a/main/app/revanced/patches/shared/fingerprints/WatchWhileActivityFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.shared.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object WatchWhileActivityFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;")
-    }
-)
diff --git a/main/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt b/main/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
deleted file mode 100644
index bff3bd1997..0000000000
--- a/main/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package app.revanced.patches.shared.integrations.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-
-@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
-abstract class AbstractIntegrationsPatch(
-    private val integrationsDescriptor: String,
-    private val hooks: Iterable<IntegrationsFingerprint>
-) : BytecodePatch(hooks) {
-    /**
-     * [MethodFingerprint] for integrations.
-     *
-     * @param contextRegisterResolver A [RegisterResolver] to get the register.
-     * @see MethodFingerprint
-     */
-    abstract class IntegrationsFingerprint(
-        returnType: String? = null,
-        accessFlags: Int? = null,
-        parameters: Iterable<String>? = null,
-        opcodes: Iterable<Opcode?>? = null,
-        strings: Iterable<String>? = null,
-        customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
-        private val contextRegisterResolver: (Method) -> Int = object : RegisterResolver {}
-    ) : MethodFingerprint(
-        returnType,
-        accessFlags,
-        parameters,
-        opcodes,
-        strings,
-        customFingerprint
-    ) {
-        fun invoke(integrationsDescriptor: String): PatchResult {
-            result?.mutableMethod?.let { method ->
-                val contextRegister = contextRegisterResolver(method)
-
-                method.addInstruction(
-                    0,
-                    "sput-object v$contextRegister, " +
-                            "$integrationsDescriptor->context:Landroid/content/Context;"
-                )
-            } ?: return PatchResultError("Could not find hook target fingerprint.")
-
-            return PatchResultSuccess()
-        }
-
-        interface RegisterResolver : (Method) -> Int {
-            override operator fun invoke(method: Method) = method.implementation!!.registerCount - 1
-        }
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass(integrationsDescriptor) == null) return MISSING_INTEGRATIONS
-
-        for (hook in hooks) hook.invoke(integrationsDescriptor).let {
-            if (it is PatchResultError) return it
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        val MISSING_INTEGRATIONS = PatchResultError(
-            "Integrations have not been merged yet. " +
-                    "This patch can not succeed without merging the integrations."
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt b/main/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
deleted file mode 100644
index ea00c7832f..0000000000
--- a/main/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package app.revanced.patches.shared.mapping.misc.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import org.w3c.dom.Element
-import java.util.*
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-
-class ResourceMappingPatch : ResourcePatch {
-    companion object {
-        internal lateinit var resourceMappings: List<ResourceElement>
-            private set
-
-        private val THREAD_COUNT = Runtime.getRuntime().availableProcessors()
-        private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        // save the file in memory to concurrently read from
-        val resourceXmlFile = context["res/values/public.xml"].readBytes()
-
-        // create a synchronized list to store the resource mappings
-        val mappings = Collections.synchronizedList(mutableListOf<ResourceElement>())
-
-        for (threadIndex in 0 until THREAD_COUNT) {
-            threadPoolExecutor.execute thread@{
-                context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
-                    val resources = editor.file.documentElement.childNodes
-                    val resourcesLength = resources.length
-                    val jobSize = resourcesLength / THREAD_COUNT
-
-                    val batchStart = jobSize * threadIndex
-                    val batchEnd = jobSize * (threadIndex + 1)
-                    element@ for (i in batchStart until batchEnd) {
-                        // make sure to not to go out of bounds when rounding errors occur at calculating the jobSize
-                        if (i >= resourcesLength) return@thread
-
-                        val node = resources.item(i)
-                        if (node !is Element) continue
-
-                        val nameAttribute = node.getAttribute("name")
-                        val typeAttribute = node.getAttribute("type")
-
-                        if (node.nodeName != "public" || nameAttribute.startsWith("APKTOOL")) continue
-
-                        val id = node.getAttribute("id").substring(2).toLong(16)
-                        mappings.add(ResourceElement(typeAttribute, nameAttribute, id))
-                    }
-                }
-            }
-        }
-
-        threadPoolExecutor
-            .also { it.shutdown() }
-            .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
-
-        resourceMappings = mappings
-
-        return PatchResultSuccess()
-    }
-}
-
-data class ResourceElement(val type: String, val name: String, val id: Long)
diff --git a/main/app/revanced/patches/shared/misc/fix/verticalscroll/annotations/VerticalScrollCompatibility.kt b/main/app/revanced/patches/shared/misc/fix/verticalscroll/annotations/VerticalScrollCompatibility.kt
deleted file mode 100644
index bd19fbc45f..0000000000
--- a/main/app/revanced/patches/shared/misc/fix/verticalscroll/annotations/VerticalScrollCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.shared.misc.fix.verticalscroll.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.google.android.youtube"),
-        Package("com.vanced.android.youtube")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class VerticalScrollCompatibility
diff --git a/main/app/revanced/patches/shared/misc/fix/verticalscroll/fingerprints/CanScrollVerticallyFingerprint.kt b/main/app/revanced/patches/shared/misc/fix/verticalscroll/fingerprints/CanScrollVerticallyFingerprint.kt
deleted file mode 100644
index c58581081e..0000000000
--- a/main/app/revanced/patches/shared/misc/fix/verticalscroll/fingerprints/CanScrollVerticallyFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints
-
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object CanScrollVerticallyFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-    ),
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("SwipeRefreshLayout;") }
-)
diff --git a/main/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt b/main/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
deleted file mode 100644
index f33bb09b3c..0000000000
--- a/main/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.shared.misc.fix.verticalscroll.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.shared.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
-import app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Description("Fixes issues with refreshing the feed when the first component is of type EmptyComponent.")
-@VerticalScrollCompatibility
-class VerticalScrollPatch : BytecodePatch(
-    listOf(CanScrollVerticallyFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CanScrollVerticallyFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveResultIndex = it.scanResult.patternScanResult!!.endIndex
-                val moveResultRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-
-                val insertIndex = moveResultIndex + 1
-                addInstruction(
-                    insertIndex,
-                    "const/4 v$moveResultRegister, 0x0"
-                )
-            }
-        } ?: return CanScrollVerticallyFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/shared/settings/preference/BasePreference.kt b/main/app/revanced/patches/shared/settings/preference/BasePreference.kt
deleted file mode 100644
index 09fe4bc61e..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/BasePreference.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.shared.settings.preference
-
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-
-/**
- * Base preference class for all preferences.
- *
- * @param key The key of the preference.
- * @param title The title of the preference.
- * @param tag The tag of the preference.
- * @param summary The summary of the preference.
- */
-internal abstract class BasePreference(
-    val key: String?,
-    val title: StringResource,
-    val summary: StringResource? = null,
-    val tag: String
-) {
-    /**
-     * Serialize preference element to XML.
-     * Overriding methods should invoke super and operate on its return value.
-     * @param ownerDocument Target document to create elements from.
-     * @param resourceCallback Called when a resource has been processed.
-     * @return The serialized element.
-     */
-    open fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit): Element =
-        ownerDocument.createElement(tag).apply {
-            if (key != null) setAttribute("android:key", key)
-            setAttribute("android:title", "@string/${title.also { resourceCallback.invoke(it) }.name}")
-            addSummary(summary?.also { resourceCallback.invoke(it) })
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/BaseResource.kt b/main/app/revanced/patches/shared/settings/preference/BaseResource.kt
deleted file mode 100644
index 61a9b35a29..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/BaseResource.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.shared.settings.preference
-
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-
-/**
- * Base resource class for all resources.
- *
- * @param name The name of the resource.
- * @param tag The tag of the resource.
- */
-internal abstract class BaseResource(
-    val name: String,
-    val tag: String
-) {
-    /**
-     * Serialize resource element to XML.
-     * Overriding methods should invoke super and operate on its return value.
-     * @param ownerDocument Target document to create elements from.
-     * @param resourceCallback Called when a resource has been processed.
-     */
-    open fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit = { }): Element {
-        return ownerDocument.createElement(tag).apply {
-            setAttribute("name", name)
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/ComponentsExtensions.kt b/main/app/revanced/patches/shared/settings/preference/ComponentsExtensions.kt
deleted file mode 100644
index 21207188b8..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/ComponentsExtensions.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.shared.settings.preference
-
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-
-/**
- * Add a resource node child
- *
- * @param resource The resource to add.
- * @param resourceCallback Called when a resource has been processed.
- */
-internal fun Node.addResource(resource: BaseResource, resourceCallback: (BaseResource) -> Unit = { }) {
-    appendChild(resource.serialize(ownerDocument, resourceCallback))
-}
-
-/**
- * Add a preference node child to the settings.
- *
- * @param preference The preference to add.
- * @param resourceCallback Called when a resource has been processed.
- */
-internal fun Node.addPreference(preference: BasePreference, resourceCallback: ((BaseResource) -> Unit) = { }) {
-    appendChild(preference.serialize(ownerDocument, resourceCallback))
-}
-
-internal fun Element.addSummary(summaryResource: StringResource?, summaryType: SummaryType = SummaryType.DEFAULT) =
-    summaryResource?.let { summary ->
-        setAttribute("android:${summaryType.type}", "@string/${summary.name}")
-    }
-
-internal fun <T> Element.addDefault(default: T) {
-    if (default is Boolean && !(default as Boolean)) return // No need to include the default, as no value already means 'false'
-    default?.let {
-        setAttribute(
-            "android:defaultValue", when (it) {
-                is Boolean -> it.toString()
-                is String -> it
-                else -> throw IllegalArgumentException("Unsupported default value type: ${it::class.java.name}")
-            }
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt b/main/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt
deleted file mode 100644
index 64d35878ca..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/DefaultBasePreference.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.shared.settings.preference
-
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import org.w3c.dom.Document
-
-/**
- * Base preference class that also has a default value.
- *
- * @param key The key of the preference.
- * @param title The title of the preference.
- * @param tag The tag of the preference.
- * @param summary The summary of the preference.
- * @param default The default value of the preference.
- */
-internal abstract class DefaultBasePreference<T>(
-    key: String?,
-    title: StringResource,
-    summary: StringResource? = null,
-    tag: String,
-    val default: T? = null,
-) : BasePreference(key, title, summary, tag) {
-
-    /**
-     * Serialize preference element to XML.
-     * Overriding methods should invoke super and operate on its return value.
-     * @param ownerDocument Target document to create elements from.
-     * @param resourceCallback Called when a resource has been processed.
-     * @return The serialized element.
-     */
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply { addDefault(default) }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/SummaryType.kt b/main/app/revanced/patches/shared/settings/preference/SummaryType.kt
deleted file mode 100644
index 006f6986cf..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/SummaryType.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.revanced.patches.shared.settings.preference
-
-enum class SummaryType(val type: String) {
-    DEFAULT("summary"), ON("summaryOn"), OFF("summaryOff")
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt b/main/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt
deleted file mode 100644
index 9db57cff00..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BaseResource
-import org.w3c.dom.Document
-
-// TODO: allow specifying an array resource file instead of using a list of StringResources
-/**
- *  An array resource.
- *
- *  @param name The name of the array resource.
- *  @param items The items of the array resource.
- */
-internal class ArrayResource(
-    name: String,
-    val items: List<StringResource>
-) : BaseResource(name, "string-array") {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            setAttribute("name", name)
-
-            items.forEach { item ->
-                resourceCallback.invoke(item)
-
-                this.appendChild(ownerDocument.createElement("item").also { itemNode ->
-                    itemNode.textContent = "@string/${item.name}"
-                })
-            }
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/InputType.kt b/main/app/revanced/patches/shared/settings/preference/impl/InputType.kt
deleted file mode 100644
index 7d3ec982da..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/InputType.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-enum class InputType(val type: String) {
-    TEXT("text"),
-    TEXT_CAP_CHARACTERS("textCapCharacters"),
-    TEXT_MULTI_LINE("textMultiLine"),
-    NUMBER("number"),
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt b/main/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt
deleted file mode 100644
index 3df3c87e90..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/ListPreference.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
-import app.revanced.patches.shared.settings.preference.addSummary
-import org.w3c.dom.Document
-
-/**
- * List preference.
- *
- * @param key The key of the list preference.
- * @param title The title of the list preference.
- * @param entries The human-readable entries of the list preference.
- * @param entryValues The entry values of the list preference.
- * @param summary The summary of the list preference.
- * @param default The default entry value of the list preference.
- */
-internal class ListPreference(
-    key: String,
-    title: StringResource,
-    val entries: ArrayResource,
-    val entryValues: ArrayResource,
-    summary: StringResource? = null,
-    default: String? = null,
-) : DefaultBasePreference<String>(key, title, summary, "ListPreference", default) {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            setAttribute("android:entries", "@array/${entries.also { resourceCallback.invoke(it) }.name}")
-            setAttribute("android:entryValues", "@array/${entryValues.also { resourceCallback.invoke(it) }.name}")
-            addSummary(summary)
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt b/main/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt
deleted file mode 100644
index c97913c2a1..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/NonInteractivePreference.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.addSummary
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-
-/**
- * A non interactive preference.
- *
- * Not backed by any preference key/value,
- * and cannot be changed by or interacted with by the user.
- *
- * @param title The title of the preference.
- * @param summary The summary of the text preference.
- */
-internal class NonInteractivePreference(
-    title: StringResource,
-    summary: StringResource,
-) : BasePreference(null, title, summary, "Preference") {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit): Element {
-        return super.serialize(ownerDocument, resourceCallback).apply {
-            addSummary(summary?.also { resourceCallback.invoke(it)
-                setAttribute("android:selectable", false.toString())
-            })
-        }
-    }
-}
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/Preference.kt b/main/app/revanced/patches/shared/settings/preference/impl/Preference.kt
deleted file mode 100644
index 2ada5625d6..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/Preference.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.BaseResource
-import org.w3c.dom.Document
-
-/**
- * A preference object.
- *
- * @param key The key of the preference.
- * @param title The title of the preference.
- * @param summary The summary of the text preference.
- * @param intent The intent of the preference.
- */
-internal class Preference(
-    key: String,
-    title: StringResource,
-    summary: StringResource,
-    val intent: Intent
-) : BasePreference(key, title, summary, "Preference") {
-    constructor(
-        title: StringResource,
-        summary: StringResource,
-        intent: Intent
-    ) : this("", title, summary, intent)
-
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            this.appendChild(ownerDocument.createElement("intent").also { intentNode ->
-                intentNode.setAttribute("android:targetPackage", intent.targetPackage)
-                intentNode.setAttribute("android:data", intent.data)
-                intentNode.setAttribute("android:targetClass", intent.targetClass)
-            })
-        }
-
-    internal class Intent(
-        internal val targetPackage: String,
-        internal val data: String,
-        internal val targetClass: String
-    )
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt b/main/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt
deleted file mode 100644
index 56e02f45d6..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/PreferenceCategory.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.BaseResource
-import org.w3c.dom.Document
-
-/**
- * A preference category.
- *
- * @param key The key of the preference.
- * @param title The title of the preference.
- * @param preferences Child preferences of this category.
- */
-internal open class PreferenceCategory(
-    key: String,
-    title: StringResource,
-    var preferences: List<BasePreference>,
-    tag: String = "PreferenceCategory"
-) : BasePreference(key, title, null, tag) {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            for (childPreference in preferences) {
-                this.appendChild(childPreference.serialize(ownerDocument, resourceCallback))
-            }
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt b/main/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt
deleted file mode 100644
index e6bf32d439..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/PreferenceScreen.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.addSummary
-import org.w3c.dom.Document
-
-/**
- * A preference screen.
- *
- * @param key The key of the preference.
- * @param title The title of the preference.
- * @param preferences Child preferences of this screen.
- * @param summary The summary of the text preference.
- */
-internal open class PreferenceScreen(
-    key: String,
-    title: StringResource,
-    var preferences: List<BasePreference>,
-    summary: StringResource? = null
-) : BasePreference(key, title, summary, "PreferenceScreen") {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            addSummary(summary?.also { resourceCallback.invoke(it) })
-
-            for (childPreference in preferences)
-                this.appendChild(childPreference.serialize(ownerDocument, resourceCallback))
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/StringResource.kt b/main/app/revanced/patches/shared/settings/preference/impl/StringResource.kt
deleted file mode 100644
index 7934b12704..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/StringResource.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BaseResource
-import org.w3c.dom.Document
-
-/**
- * A string value.
- * Represets a string in the strings.xml file.
- *
- * @param name The name of the string.
- * @param value The value of the string.
- * @param formatted If the string is formatted. If false, the attribute will be set.
- */
-internal class StringResource(
-    name: String,
-    val value: String,
-    val formatted: Boolean = true
-) : BaseResource(name, "string") {
-
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            // if the string is un-formatted, explicitly add the formatted attribute
-            if (!formatted) setAttribute("formatted", "false")
-
-            textContent = value
-        }
-}
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt b/main/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt
deleted file mode 100644
index 5a9e6778ee..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/SwitchPreference.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
-import app.revanced.patches.shared.settings.preference.SummaryType
-import app.revanced.patches.shared.settings.preference.addSummary
-import app.revanced.patches.shared.settings.resource.patch.AbstractSettingsResourcePatch.Companion.include
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-
-/**
- * A switch preference.
- *
- * @param key The key of the switch.
- * @param title The title of the switch.
- * @param summaryOn The summary to show when the preference is enabled.
- * @param summaryOff The summary to show when the preference is disabled.
- * @param userDialogMessage The message to show in a dialog when the user toggles the preference.
- * @param default The default value of the switch.
- */
-internal class SwitchPreference(
-    key: String, title: StringResource,
-    val summaryOn: StringResource,
-    val summaryOff: StringResource,
-    val userDialogMessage: StringResource? = null,
-    default: Boolean = false,
-) : DefaultBasePreference<Boolean>( key,  title,  null,  "SwitchPreference", default) {
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit): Element {
-        userDialogMessage?.include()
-
-        return super.serialize(ownerDocument, resourceCallback).apply {
-            addSummary(summaryOn.also { resourceCallback.invoke(it) }, SummaryType.ON)
-            addSummary(summaryOff.also { resourceCallback.invoke(it) }, SummaryType.OFF)
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt b/main/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt
deleted file mode 100644
index 5895a5e6e1..0000000000
--- a/main/app/revanced/patches/shared/settings/preference/impl/TextPreference.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.shared.settings.preference.impl
-
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.DefaultBasePreference
-import org.w3c.dom.Document
-
-/**
- * A text preference.
- *
- * @param key The key of the text preference.
- * @param title The title of the text preference.
- * @param inputType The input type of the text preference.
- * @param summary The summary of the text preference.
- * @param default The default value of the text preference.
- */
-internal class TextPreference(
-    key: String?,
-    title: StringResource,
-    summary: StringResource?,
-    val inputType: InputType = InputType.TEXT,
-    default: String? = null,
-    tag: String = "app.revanced.integrations.settingsmenu.ResettableEditTextPreference"
-) : DefaultBasePreference<String>(key, title, summary, tag, default) {
-
-    override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
-        super.serialize(ownerDocument, resourceCallback).apply {
-            setAttribute("android:inputType", inputType.type)
-        }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt b/main/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
deleted file mode 100644
index a86ed1beec..0000000000
--- a/main/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-package app.revanced.patches.shared.settings.resource.patch
-
-import app.revanced.patcher.data.DomFileEditor
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.BaseResource
-import app.revanced.patches.shared.settings.preference.addPreference
-import app.revanced.patches.shared.settings.preference.addResource
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import org.w3c.dom.Node
-import java.io.Closeable
-
-/**
- * Abstract settings resource patch
- *
- * @param preferenceFileName Name of the settings preference xml file
- * @param sourceDirectory Source directory to copy the preference template from
- */
-abstract class AbstractSettingsResourcePatch(
-    private val preferenceFileName: String,
-    private val sourceDirectory: String,
-) : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
-        /*
-         * used for self-restart
-         * TODO: do this only, when necessary
-         */
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            editor.file.getElementsByTagName("manifest").item(0).also {
-                it.appendChild(it.ownerDocument.createElement("uses-permission").also { element ->
-                    element.setAttribute("android:name", "android.permission.SCHEDULE_EXACT_ALARM")
-                })
-            }
-        }
-
-        /* copy preference template from source dir */
-        context.copyResources(
-            sourceDirectory,
-            ResourceUtils.ResourceGroup(
-                "xml", "$preferenceFileName.xml"
-            )
-        )
-
-        /* prepare xml editors */
-        stringsEditor = context.xmlEditor["res/values/strings.xml"]
-        arraysEditor = context.xmlEditor["res/values/arrays.xml"]
-        revancedPreferencesEditor = context.xmlEditor["res/xml/$preferenceFileName.xml"]
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        private var revancedPreferenceNode: Node? = null
-        private var stringsNode: Node? = null
-        private var arraysNode: Node? = null
-
-        private var strings = mutableListOf<StringResource>()
-
-        private var revancedPreferencesEditor: DomFileEditor? = null
-            set(value) {
-                field = value
-                revancedPreferenceNode = value.getNode("PreferenceScreen")
-            }
-        private var stringsEditor: DomFileEditor? = null
-            set(value) {
-                field = value
-                stringsNode = value.getNode("resources")
-            }
-        private var arraysEditor: DomFileEditor? = null
-            set(value) {
-                field = value
-                arraysNode = value.getNode("resources")
-            }
-
-        /**
-         * Add a new string to the resources.
-         *
-         * @param identifier The key of the string.
-         * @param value The value of the string.
-         * @throws IllegalArgumentException if the string already exists.
-         */
-        fun addString(identifier: String, value: String, formatted: Boolean) =
-            StringResource(identifier, value, formatted).include()
-
-        /**
-         * Add an array to the resources.
-         *
-         * @param arrayResource The array resource to add.
-         */
-        fun addArray(arrayResource: ArrayResource) =
-            arraysNode!!.addResource(arrayResource) { it.include() }
-
-        /**
-         * Add a preference to the settings.
-         *
-         * @param preference The preference to add.
-         */
-        fun addPreference(preference: BasePreference) =
-            revancedPreferenceNode!!.addPreference(preference) { it.include() }
-
-        /**
-         * Add a new resource to the resources.
-         *
-         * @throws IllegalArgumentException if the resource already exists.
-         */
-        internal fun BaseResource.include() {
-            when (this) {
-                is StringResource -> {
-                    if (strings.any { it.name == name }) return
-                    strings.add(this)
-                }
-
-                is ArrayResource -> addArray(this)
-                else -> throw NotImplementedError("Unsupported resource type")
-            }
-        }
-
-        internal fun DomFileEditor?.getNode(tagName: String) = this!!.file.getElementsByTagName(tagName).item(0)
-    }
-
-    override fun close() {
-        // merge all strings, skip duplicates
-        strings.forEach {
-            stringsNode!!.addResource(it)
-        }
-
-        revancedPreferencesEditor?.close()
-        stringsEditor?.close()
-        arraysEditor?.close()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt b/main/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt
deleted file mode 100644
index a17b9c381b..0000000000
--- a/main/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package app.revanced.patches.shared.settings.util
-
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import java.io.Closeable
-
-internal abstract class AbstractPreferenceScreen(
-    private val root: MutableList<Screen> = mutableListOf()
-) : Closeable {
-
-    override fun close() {
-        if (root.isEmpty())
-            return
-
-        for (preference in root.sortedBy { it.title }) {
-            commit(preference.transform())
-        }
-    }
-
-    /**
-     * Finalize and insert root preference into resource patch
-     */
-    abstract fun commit(screen: PreferenceScreen)
-
-    open inner class Screen(
-        key: String,
-        title: String,
-        val summary: String? = null,
-        preferences: MutableList<BasePreference> = mutableListOf(),
-        val categories: MutableList<Category> = mutableListOf()
-    ) : BasePreferenceCollection(key, title, preferences) {
-        override fun transform(): PreferenceScreen {
-            return PreferenceScreen(
-                key,
-                StringResource("${key}_title", title),
-                 preferences.sortedBy { it.title.value.lowercase() } +
-                         categories.sortedBy { it.title.lowercase() }.map { it.transform() },
-                summary?.let { summary ->
-                    StringResource("${key}_summary", summary)
-                }
-            )
-        }
-
-        private fun ensureScreenInserted() {
-            // Add to screens if not yet done
-            if(!this@AbstractPreferenceScreen.root.contains(this))
-                this@AbstractPreferenceScreen.root.add(this)
-        }
-
-        fun addPreferences(vararg preferences: BasePreference) {
-            ensureScreenInserted()
-            this.preferences.addAll(preferences)
-        }
-
-        open inner class Category(
-            key: String,
-            title: String,
-            preferences: MutableList<BasePreference> = mutableListOf()
-        ): BasePreferenceCollection(key, title, preferences) {
-            override fun transform(): PreferenceCategory {
-                return PreferenceCategory(
-                    key,
-                    StringResource("${key}_title", title),
-                    preferences.sortedBy { it.title.value.lowercase() }
-                )
-            }
-
-            fun addPreferences(vararg preferences: BasePreference) {
-                ensureScreenInserted()
-
-                // Add to categories if not yet done
-                if(!this@Screen.categories.contains(this))
-                    this@Screen.categories.add(this)
-
-                this.preferences.addAll(preferences)
-            }
-        }
-    }
-
-    abstract class BasePreferenceCollection(
-        val key: String,
-        val title: String,
-        val preferences: MutableList<BasePreference> = mutableListOf()
-    ) {
-        abstract fun transform(): BasePreference
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/songpal/badge/annotations/BadgeCompatibility.kt b/main/app/revanced/patches/songpal/badge/annotations/BadgeCompatibility.kt
deleted file mode 100644
index 0cd69f6689..0000000000
--- a/main/app/revanced/patches/songpal/badge/annotations/BadgeCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.songpal.badge.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.sony.songpal.mdr")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class BadgeCompatibility
diff --git a/main/app/revanced/patches/songpal/badge/fingerprints/CreateTabsFingerprint.kt b/main/app/revanced/patches/songpal/badge/fingerprints/CreateTabsFingerprint.kt
deleted file mode 100644
index 59f82c3aa9..0000000000
--- a/main/app/revanced/patches/songpal/badge/fingerprints/CreateTabsFingerprint.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package app.revanced.patches.songpal.badge.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.songpal.badge.patch.BadgeTabPatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-// Located @ ub.i0.h#p (9.5.0)
-object CreateTabsFingerprint : MethodFingerprint(
-    "Ljava/util/List",
-    accessFlags = AccessFlags.PRIVATE.value,
-    customFingerprint = { methodDef, _ ->
-        methodDef.implementation?.instructions?.any { instruction ->
-            if (instruction.opcode != Opcode.INVOKE_STATIC) return@any false
-
-            val reference = (instruction as ReferenceInstruction).reference as MethodReference
-
-            if (reference.parameterTypes.isNotEmpty()) return@any false
-            if (reference.definingClass != BadgeTabPatch.ACTIVITY_TAB_DESCRIPTOR) return@any false
-            if (reference.returnType != "[${BadgeTabPatch.ACTIVITY_TAB_DESCRIPTOR}") return@any false
-            true
-        } ?: false
-    }
-)
diff --git a/main/app/revanced/patches/songpal/badge/fingerprints/ShowNotificationFingerprint.kt b/main/app/revanced/patches/songpal/badge/fingerprints/ShowNotificationFingerprint.kt
deleted file mode 100644
index d480430de4..0000000000
--- a/main/app/revanced/patches/songpal/badge/fingerprints/ShowNotificationFingerprint.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.songpal.badge.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.songpal.badge.fingerprints.ShowNotificationFingerprint.expectedReference
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
-
-// Located @ com.sony.songpal.mdr.vim.activity.MdrRemoteBaseActivity.e#run (9.5.0)
-object ShowNotificationFingerprint : MethodFingerprint(
-    "V",
-    accessFlags = AccessFlags.PUBLIC.value,
-    customFingerprint = custom@{ methodDef, _ ->
-        methodDef.implementation?.instructions?.any { instruction ->
-            if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@any false
-
-            with(expectedReference) {
-                val currentReference = (instruction as ReferenceInstruction).reference as MethodReference
-                currentReference.let {
-                    if (it.definingClass != definingClass) return@any false
-                    if (it.parameterTypes != parameterTypes) return@any false
-                    if (it.returnType != returnType) return@any false
-                }
-            }
-            true
-        } ?: false
-    }
-) {
-    val expectedReference = ImmutableMethodReference(
-        "Lcom/google/android/material/bottomnavigation/BottomNavigationView;",
-        "getOrCreateBadge", // Non-obfuscated placeholder method name.
-        listOf("I"),
-        "Lcom/google/android/material/badge/BadgeDrawable;",
-    )
-}
diff --git a/main/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt b/main/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
deleted file mode 100644
index d4f7ffbdbf..0000000000
--- a/main/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package app.revanced.patches.songpal.badge.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.songpal.badge.annotations.BadgeCompatibility
-import app.revanced.patches.songpal.badge.fingerprints.CreateTabsFingerprint
-
-@Patch
-@Name("Remove badge tab")
-@Description("Removes the badge tab from the activity tab.")
-@BadgeCompatibility
-class BadgeTabPatch : BytecodePatch(
-    listOf(CreateTabsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CreateTabsFingerprint.result?.mutableMethod?.apply {
-            removeInstructions(0, 2)
-
-            val arrayRegister = 0
-            val indexRegister = 1
-            val arrayItemRegister = 2
-
-            // First insert the array of tabs...
-
-            arrayTabs.withIndex().forEach { (index, tab) ->
-                addInstructions(
-                    0,
-                    """
-                        const/4 v$indexRegister, $index
-                        sget-object v$arrayItemRegister, $ACTIVITY_TAB_DESCRIPTOR->$tab:$ACTIVITY_TAB_DESCRIPTOR
-                        aput-object v$arrayItemRegister, v$arrayRegister, v$indexRegister
-                    """
-                )
-            }
-
-            // Then add the instructions to initialize the array.
-            // This is done so that the order of instructions is correct.
-
-            addInstructions(
-                0,
-                """
-                    const/4 v$arrayRegister, ${arrayTabs.size}
-                    new-array v$arrayRegister, v$arrayRegister, [$ACTIVITY_TAB_DESCRIPTOR
-                 """
-            )
-
-        } ?: return CreateTabsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        const val ACTIVITY_TAB_DESCRIPTOR = "Ljp/co/sony/vim/framework/ui/yourheadphones/YhContract\$Tab;"
-        val arrayTabs = listOf("Log", "HealthCare")
-    }
-}
diff --git a/main/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt b/main/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt
deleted file mode 100644
index 59f626eb80..0000000000
--- a/main/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.songpal.badge.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.songpal.badge.annotations.BadgeCompatibility
-import app.revanced.patches.songpal.badge.fingerprints.ShowNotificationFingerprint
-
-@Patch
-@Name("Remove notification badge")
-@Description("Removes the red notification badge from the activity tab.")
-@BadgeCompatibility
-class RemoveNotificationBadgePatch : BytecodePatch(
-    listOf(ShowNotificationFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ShowNotificationFingerprint.result?.mutableMethod?.apply {
-            addInstructions(0, "return-void")
-        } ?: return ShowNotificationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt b/main/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt
deleted file mode 100644
index 5a855c9fd1..0000000000
--- a/main/app/revanced/patches/spotify/layout/theme/annotations/ThemeCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.spotify.layout.theme.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.spotify.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ThemeCompatibility
diff --git a/main/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt b/main/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
deleted file mode 100644
index 356a2d9e8e..0000000000
--- a/main/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package app.revanced.patches.spotify.layout.theme.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.spotify.layout.theme.annotations.ThemeCompatibility
-import org.w3c.dom.Element
-
-@Patch
-@Name("Spotify theme")
-@Description("Applies a custom theme.")
-@ThemeCompatibility
-class ThemePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor["res/values/colors.xml"].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
-
-            for (i in 0 until resourcesNode.childNodes.length) {
-                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-
-                node.textContent = when (node.getAttribute("name")) {
-                    "gray_7" -> backgroundColor!!
-                    "dark_brightaccent_background_base", "dark_base_text_brightaccent", "green_light" -> accentColor!!
-                    "dark_brightaccent_background_press" -> accentPressedColor!!
-                    else -> continue
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        var backgroundColor: String? by option(
-            PatchOption.StringOption(
-                key = "backgroundColor",
-                default = "@android:color/black",
-                title = "Background color",
-                description = "The background color. Can be a hex color or a resource reference.",
-            )
-        )
-        var accentColor: String? by option(
-            PatchOption.StringOption(
-                key = "accentColor",
-                default = "#ff1ed760",
-                title = "Accent color",
-                description = "The accent color ('spotify green' by default). Can be a hex color or a resource reference.",
-            )
-        )
-        var accentPressedColor: String? by option(
-            PatchOption.StringOption(
-                key = "accentPressedColor",
-                default = "#ff169c46",
-                title = "Pressed accent for the dark theme",
-                description = "The color when accented buttons are pressed, by default slightly darker than accent. Can be a hex color or a resource reference.",
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/spotify/lite/ondemand/annotations/OnDemandCompatibility.kt b/main/app/revanced/patches/spotify/lite/ondemand/annotations/OnDemandCompatibility.kt
deleted file mode 100644
index 2550824b2d..0000000000
--- a/main/app/revanced/patches/spotify/lite/ondemand/annotations/OnDemandCompatibility.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.spotify.lite.ondemand.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package("com.spotify.lite")]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class OnDemandCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/spotify/lite/ondemand/fingerprints/OnDemandFingerprint.kt b/main/app/revanced/patches/spotify/lite/ondemand/fingerprints/OnDemandFingerprint.kt
deleted file mode 100644
index 099eaa438a..0000000000
--- a/main/app/revanced/patches/spotify/lite/ondemand/fingerprints/OnDemandFingerprint.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.patches.spotify.lite.ondemand.fingerprints
-
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2)
-object OnDemandFingerprint : MethodFingerprint(
-    "L",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT,
-        Opcode.RETURN_OBJECT
-    )
-)
diff --git a/main/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt b/main/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt
deleted file mode 100644
index 0ee130dfbb..0000000000
--- a/main/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.spotify.lite.ondemand.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.spotify.lite.ondemand.annotations.OnDemandCompatibility
-import app.revanced.patches.spotify.lite.ondemand.fingerprints.OnDemandFingerprint
-
-@Patch
-@Name("Enable on demand")
-@Description("Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads.")
-@OnDemandCompatibility
-class OnDemandPatch : BytecodePatch(
-    listOf(
-        OnDemandFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        OnDemandFingerprint.result?.apply {
-            val insertIndex = scanResult.patternScanResult!!.endIndex - 1
-            // Spoof a premium account
-            mutableMethod.addInstruction(insertIndex, "const/4 v0, 0x2")
-        } ?: return OnDemandFingerprint.toErrorResult()
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt b/main/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
deleted file mode 100644
index 6924ba5d4a..0000000000
--- a/main/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.spotify.premium_navbar_tab.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.spotify.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PremiumNavbarTabCompatibility
diff --git a/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt b/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
deleted file mode 100644
index 296c87f8d0..0000000000
--- a/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AddPremiumNavbarTabFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L", "L", "L", "L")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt b/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
deleted file mode 100644
index e67bd8f6ba..0000000000
--- a/main/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
-     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt b/main/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
deleted file mode 100644
index 5c3376d636..0000000000
--- a/main/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package app.revanced.patches.spotify.premium_navbar_tab.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
-import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
-import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-
-@Patch
-@Name("Hide premium navbar")
-@Description("Removes the premium tab from the navbar.")
-@PremiumNavbarTabCompatibility
-@DependsOn([ResourceMappingPatch::class])
-class PremiumNavbarTabPatch : BytecodePatch(
-    listOf(
-        AddPremiumNavbarTabParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
-        AddPremiumNavbarTabFingerprint.resolve(context, parentResult.classDef)
-
-        val result = AddPremiumNavbarTabFingerprint.result!!
-
-        val method = result.mutableMethod
-        val methodInstructions = method.implementation!!.instructions
-        val lastInstructionIdx = methodInstructions.size - 1
-
-        val premiumTabId =
-            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id
-
-        var removeAmount = 2
-        // 2nd const remove method
-        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
-            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
-            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
-
-            val findThreshold = 10
-            val constIndex = lastInstructionIdx - i
-            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
-                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
-            }
-            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
-
-            if (--removeAmount == 0) break
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tasker/trial/unlock/annotations/UnlockTrialCompatibility.kt b/main/app/revanced/patches/tasker/trial/unlock/annotations/UnlockTrialCompatibility.kt
deleted file mode 100644
index 3f1c42eae8..0000000000
--- a/main/app/revanced/patches/tasker/trial/unlock/annotations/UnlockTrialCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.tasker.trial.unlock.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("net.dinglisch.android.taskerm")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockTrialCompatibility
diff --git a/main/app/revanced/patches/tasker/trial/unlock/fingerprints/CheckLicenseFingerprint.kt b/main/app/revanced/patches/tasker/trial/unlock/fingerprints/CheckLicenseFingerprint.kt
deleted file mode 100644
index d02ce92616..0000000000
--- a/main/app/revanced/patches/tasker/trial/unlock/fingerprints/CheckLicenseFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.tasker.trial.unlock.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckLicenseFingerprint : MethodFingerprint(
-    strings = listOf("Can't check license")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tasker/trial/unlock/patch/UnlockLicensePatch.kt b/main/app/revanced/patches/tasker/trial/unlock/patch/UnlockLicensePatch.kt
deleted file mode 100644
index b96823f02d..0000000000
--- a/main/app/revanced/patches/tasker/trial/unlock/patch/UnlockLicensePatch.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.tasker.trial.unlock.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tasker.trial.unlock.annotations.UnlockTrialCompatibility
-import app.revanced.patches.tasker.trial.unlock.fingerprints.CheckLicenseFingerprint
-
-@Patch
-@Name("Unlock trial")
-@Description("Unlocks the trial version.")
-@UnlockTrialCompatibility
-class UnlockLicensePatch : BytecodePatch(
-    listOf(
-        CheckLicenseFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext) = CheckLicenseFingerprint
-        .result
-        ?.mutableMethod
-        // Return the method early, which prompts the user with a non dismissible dialog, when the trial period is over.
-        ?.addInstruction(0, "return-void")
-        ?.let { PatchResultSuccess() }
-        ?: CheckLicenseFingerprint.toErrorResult()
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/ticktick/misc/themeunlock/annotations/UnlockThemesCompatibility.kt b/main/app/revanced/patches/ticktick/misc/themeunlock/annotations/UnlockThemesCompatibility.kt
deleted file mode 100644
index 3fa4619e6a..0000000000
--- a/main/app/revanced/patches/ticktick/misc/themeunlock/annotations/UnlockThemesCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.ticktick.misc.themeunlock.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.ticktick.task")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockThemesCompatibility
diff --git a/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/CheckLockedThemesFingerprint.kt b/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/CheckLockedThemesFingerprint.kt
deleted file mode 100644
index 0f019f078c..0000000000
--- a/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/CheckLockedThemesFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.ticktick.misc.themeunlock.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckLockedThemesFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("Theme;") && methodDef.name == "isLockedTheme"
-    }
-)
diff --git a/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/SetThemeFingerprint.kt b/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/SetThemeFingerprint.kt
deleted file mode 100644
index f5e8430d02..0000000000
--- a/main/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/SetThemeFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.ticktick.misc.themeunlock.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SetThemeFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ThemePreviewActivity;") && methodDef.name == "lambda\$updateUserBtn\$1"
-    }
-)
diff --git a/main/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt b/main/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
deleted file mode 100644
index c7e5023e6c..0000000000
--- a/main/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.ticktick.misc.themeunlock.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.ticktick.misc.themeunlock.annotations.UnlockThemesCompatibility
-import app.revanced.patches.ticktick.misc.themeunlock.fingerprints.CheckLockedThemesFingerprint
-import app.revanced.patches.ticktick.misc.themeunlock.fingerprints.SetThemeFingerprint
-
-@Patch
-@Name("Unlock themes")
-@Description("Unlocks all themes that are inaccessible until a certain level is reached.")
-@UnlockThemesCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        CheckLockedThemesFingerprint,
-        SetThemeFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val lockedThemesMethod = CheckLockedThemesFingerprint.result!!.mutableMethod
-        lockedThemesMethod.addInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """
-        )
-        
-        val setThemeMethod = SetThemeFingerprint.result!!.mutableMethod
-        setThemeMethod.removeInstructions(0, 10)
-        
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/tiktok/ad/annotations/HideAdsCompatibility.kt b/main/app/revanced/patches/tiktok/ad/annotations/HideAdsCompatibility.kt
deleted file mode 100644
index a6c21590f1..0000000000
--- a/main/app/revanced/patches/tiktok/ad/annotations/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
diff --git a/main/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt b/main/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
deleted file mode 100644
index 4f68c38193..0000000000
--- a/main/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.tiktok.ad.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ConvertHelpFeedItemListFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/ConvertHelp;") &&
-                methodDef.name.endsWith("${'$'}FeedItemList")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt b/main/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
deleted file mode 100644
index a3544cb1ce..0000000000
--- a/main/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.tiktok.ad.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object FeedItemListCloneFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt b/main/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt
deleted file mode 100644
index 84fedb65c3..0000000000
--- a/main/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package app.revanced.patches.tiktok.ad.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tiktok.ad.annotations.HideAdsCompatibility
-import app.revanced.patches.tiktok.ad.fingerprints.ConvertHelpFeedItemListFingerprint
-import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Patch
-@Name("Hide ads")
-@Description("Removes ads from TikTok.")
-@HideAdsCompatibility
-class HideAdsPatch : BytecodePatch(
-    listOf(
-        FeedItemListCloneFingerprint,
-        ConvertHelpFeedItemListFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        listOf(
-            FeedItemListCloneFingerprint,
-            ConvertHelpFeedItemListFingerprint
-        ).forEach { fingerprint ->
-            val method = fingerprint.result!!.mutableMethod
-            // iterate all instructions in the clone method
-            for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
-                // conditions for the instruction we need
-                if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
-                val preloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
-                if ((preloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue
-
-                // set null instead of the field "preloadAds"
-                val overrideRegister = (preloadAdsFieldInstruction as TwoRegisterInstruction).registerA
-                method.addInstruction(
-                    index,
-                    "const/4 v$overrideRegister, 0x0"
-                )
-                return@forEach
-            }
-            return PatchResultError("Can not find required instruction.")
-        }
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt b/main/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
deleted file mode 100644
index 64d56b2645..0000000000
--- a/main/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.feedfilter.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class FeedFilterCompatibility
diff --git a/main/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt b/main/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
deleted file mode 100644
index 30854e0c34..0000000000
--- a/main/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.tiktok.feedfilter.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object FeedApiServiceLIZFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.SYNTHETIC,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/FeedApiService;") && methodDef.name == "LIZ"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt b/main/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt
deleted file mode 100644
index 21fb62f1f9..0000000000
--- a/main/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package app.revanced.patches.tiktok.feedfilter.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
-import app.revanced.patches.tiktok.feedfilter.fingerprints.FeedApiServiceLIZFingerprint
-import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
-import app.revanced.patches.tiktok.misc.settings.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Feed filter")
-@Description("Filters tiktok videos: removing ads, removing livestreams.")
-@FeedFilterCompatibility
-class FeedFilterPatch : BytecodePatch(
-    listOf(
-        FeedApiServiceLIZFingerprint,
-        SettingsStatusLoadFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = FeedApiServiceLIZFingerprint.result!!.mutableMethod
-        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
-            if (instruction.opcode != Opcode.RETURN_OBJECT) continue
-            val feedItemsRegister = (instruction as OneRegisterInstruction).registerA
-            method.addInstruction(
-                index,
-                "invoke-static {v$feedItemsRegister}, Lapp/revanced/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
-            )
-            break
-        }
-        val method2 = SettingsStatusLoadFingerprint.result!!.mutableMethod
-        method2.addInstruction(
-            0,
-            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt b/main/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
deleted file mode 100644
index bb29206409..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class DownloadsCompatibility
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt b/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
deleted file mode 100644
index d5219ff3cf..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object ACLCommonShareFingerprint : MethodFingerprint(
-    "I",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
-                methodDef.name == "getCode"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt b/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
deleted file mode 100644
index a0e29c6a2d..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("Acl common share get show type")
-@DownloadsCompatibility
-object ACLCommonShareFingerprint2 : MethodFingerprint(
-    "I",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
-                methodDef.name == "getShowType"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt b/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
deleted file mode 100644
index df0c093cd8..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("Acl common share get transcode")
-@DownloadsCompatibility
-object ACLCommonShareFingerprint3 : MethodFingerprint(
-    "I",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
-                methodDef.name == "getTranscode"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt b/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
deleted file mode 100644
index 8daff09e4b..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object DownloadPathParentFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf(
-        "code",
-        "reason",
-        "params insufficient"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt b/main/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
deleted file mode 100644
index 9fc217eaae..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package app.revanced.patches.tiktok.interaction.downloads.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
-import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
-import app.revanced.patches.tiktok.misc.settings.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Downloads")
-@Description("Removes download restrictions and changes the default path to download to.")
-@DownloadsCompatibility
-class DownloadsPatch : BytecodePatch(
-    listOf(
-        ACLCommonShareFingerprint,
-        ACLCommonShareFingerprint2,
-        ACLCommonShareFingerprint3,
-        DownloadPathParentFingerprint,
-        SettingsStatusLoadFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
-        method1.replaceInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """
-        )
-        val method2 = ACLCommonShareFingerprint2.result!!.mutableMethod
-        method2.replaceInstructions(
-            0,
-            """
-                const/4 v0, 0x2
-                return v0
-            """
-        )
-        //Download videos without watermark.
-        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
-        method3.addInstructionsWithLabels(
-            0,
-            """
-                invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->shouldRemoveWatermark()Z
-                move-result v0
-                if-eqz v0, :noremovewatermark
-                const/4 v0, 0x1
-                return v0
-                :noremovewatermark
-                nop
-            """
-        )
-        //Change the download path patch
-        val method4 = DownloadPathParentFingerprint.result!!.mutableMethod
-        val implementation4 = method4.implementation
-        val instructions = implementation4!!.instructions
-        var targetOffset = -1
-        //Search for the target method called instruction offset.
-        for ((index, instruction) in instructions.withIndex()) {
-            if (instruction.opcode != Opcode.CONST_STRING) continue
-            val reference = (instruction as ReferenceInstruction).reference as StringReference
-            if (reference.string != "video/mp4") continue
-            val targetInstruction = instructions[index + 1]
-            if (targetInstruction.opcode != Opcode.INVOKE_STATIC) continue
-            targetOffset = index + 1
-            break
-        }
-        if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
-        //Change videos' download path.
-        val downloadUriMethod = context
-            .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
-            .nextMethod(targetOffset, true)
-            .getMethod() as MutableMethod
-        downloadUriMethod.implementation!!.instructions.forEachIndexed { index, instruction ->
-            if (instruction.opcode == Opcode.SGET_OBJECT) {
-                val overrideRegister = (instruction as OneRegisterInstruction).registerA
-                downloadUriMethod.addInstructions(
-                    index + 1,
-                    """
-                        invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
-                        move-result-object v$overrideRegister
-                    """
-                )
-            }
-            if (instruction.opcode == Opcode.CONST_STRING) {
-                val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-                if (string.contains("/Camera")) {
-                    val overrideRegister = (instruction as OneRegisterInstruction).registerA
-                    val overrideString = string.replace("/Camera", "")
-                    downloadUriMethod.replaceInstruction(
-                        index,
-                        """
-                            const-string v$overrideRegister, "$overrideString"
-                        """
-                    )
-                }
-            }
-        }
-        val method5 = SettingsStatusLoadFingerprint.result!!.mutableMethod
-        method5.addInstruction(
-            0,
-            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableDownload()V"
-        )
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/seekbar/annotations/ShowSeekbarCompatibility.kt b/main/app/revanced/patches/tiktok/interaction/seekbar/annotations/ShowSeekbarCompatibility.kt
deleted file mode 100644
index 3326e9f2a7..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/seekbar/annotations/ShowSeekbarCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.interaction.seekbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class ShowSeekbarCompatibility
diff --git a/main/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/SetSeekBarShowTypeFingerprint.kt b/main/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/SetSeekBarShowTypeFingerprint.kt
deleted file mode 100644
index 2056633e7d..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/SetSeekBarShowTypeFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.tiktok.interaction.seekbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SetSeekBarShowTypeFingerprint : MethodFingerprint(
-    strings = listOf(
-        "seekbar show type change, change to:"
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt b/main/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt
deleted file mode 100644
index f0cf943595..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package app.revanced.patches.tiktok.interaction.seekbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tiktok.interaction.seekbar.annotations.ShowSeekbarCompatibility
-import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.SetSeekBarShowTypeFingerprint
-import org.jf.dexlib2.iface.instruction.formats.Instruction22t
-
-@Patch
-@Name("Show seekbar")
-@Description("Shows progress bar for all video.")
-@ShowSeekbarCompatibility
-class ShowSeekbarPatch : BytecodePatch(
-    listOf(
-        SetSeekBarShowTypeFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SetSeekBarShowTypeFingerprint.result?.mutableMethod?.apply {
-            val typeRegister = getInstruction<Instruction22t>(1).registerB
-
-            addInstructions(
-                0,
-                """
-                    const/16 v$typeRegister, 0x64
-                """
-            )
-        } ?: return SetSeekBarShowTypeFingerprint.toErrorResult()
-        return PatchResultSuccess()
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/speed/annotations/PlaybackSpeedCompatibility.kt b/main/app/revanced/patches/tiktok/interaction/speed/annotations/PlaybackSpeedCompatibility.kt
deleted file mode 100644
index fbb92e8b13..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/speed/annotations/PlaybackSpeedCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.interaction.speed.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlaybackSpeedCompatibility
diff --git a/main/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt b/main/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
deleted file mode 100644
index 2a395194b3..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.tiktok.interaction.speed.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object SpeedControlParentFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    parameters = listOf(
-        "L"
-    ),
-    strings = listOf(
-        "playback_speed"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt b/main/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt
deleted file mode 100644
index f0a1c9eece..0000000000
--- a/main/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package app.revanced.patches.tiktok.interaction.speed.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.tiktok.interaction.speed.annotations.PlaybackSpeedCompatibility
-import app.revanced.patches.tiktok.interaction.speed.fingerprints.SpeedControlParentFingerprint
-import org.jf.dexlib2.Opcode
-
-@Patch
-@Name("Playback speed")
-@Description("Enables the playback speed option for all videos.")
-@PlaybackSpeedCompatibility
-class PlaybackSpeedPatch : BytecodePatch(
-    listOf(
-        SpeedControlParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val parentMethod = SpeedControlParentFingerprint.result!!.mutableMethod
-        val parentMethodInstructions = parentMethod.implementation!!.instructions
-        for ((index, instruction) in parentMethodInstructions.withIndex()) {
-            if (instruction.opcode != Opcode.INVOKE_VIRTUAL) continue
-            val isSpeedEnableMethod = context
-                .toMethodWalker(parentMethod)
-                .nextMethod(index, true)
-                .getMethod() as MutableMethod
-            isSpeedEnableMethod.addInstructions(
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """
-            )
-            break
-        }
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt b/main/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt
deleted file mode 100644
index 4ece97d66b..0000000000
--- a/main/app/revanced/patches/tiktok/misc/integrations/annotations/IntegrationsCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.misc.integrations.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class IntegrationsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt b/main/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
deleted file mode 100644
index b4d0959765..0000000000
--- a/main/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.tiktok.misc.integrations.fingerprints
-
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-
-object InitFingerprint : IntegrationsFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
-                methodDef.name == "onCreate"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt b/main/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt
deleted file mode 100644
index 8d777bc690..0000000000
--- a/main/app/revanced/patches/tiktok/misc/integrations/patch/IntegrationsPatch.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.tiktok.misc.integrations.patch
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
-import app.revanced.patches.tiktok.misc.integrations.annotations.IntegrationsCompatibility
-import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
-
-@Name("Integrations")
-@IntegrationsCompatibility
-@RequiresIntegrations
-class IntegrationsPatch : AbstractIntegrationsPatch(
-    "Lapp/revanced/tiktok/utils/ReVancedUtils;",
-    listOf(InitFingerprint)
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/annotations/DisableLoginRequirementCompatibility.kt b/main/app/revanced/patches/tiktok/misc/login/disablerequirement/annotations/DisableLoginRequirementCompatibility.kt
deleted file mode 100644
index faaaa0744e..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/annotations/DisableLoginRequirementCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.disablerequirement.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class DisableLoginRequirementCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint.kt b/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint.kt
deleted file mode 100644
index 950c258353..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.disablerequirement.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-object MandatoryLoginServiceFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
-                methodDef.name == "enableForcedLogin"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint2.kt b/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint2.kt
deleted file mode 100644
index 623e0359f0..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/fingerprints/MandatoryLoginServiceFingerprint2.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.disablerequirement.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.login.disablerequirement.annotations.DisableLoginRequirementCompatibility
-
-@Name("Mandatory login service fingerprint2")
-@DisableLoginRequirementCompatibility
-object MandatoryLoginServiceFingerprint2 : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
-                methodDef.name == "shouldShowForcedLogin"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt b/main/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt
deleted file mode 100644
index 51c02a321b..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.disablerequirement.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tiktok.misc.login.disablerequirement.annotations.DisableLoginRequirementCompatibility
-import app.revanced.patches.tiktok.misc.login.disablerequirement.fingerprints.MandatoryLoginServiceFingerprint
-import app.revanced.patches.tiktok.misc.login.disablerequirement.fingerprints.MandatoryLoginServiceFingerprint2
-
-@Patch
-@Name("Disable login requirement")
-@Description("Do not force login.")
-@DisableLoginRequirementCompatibility
-class DisableLoginRequirementPatch : BytecodePatch(
-    listOf(
-        MandatoryLoginServiceFingerprint,
-        MandatoryLoginServiceFingerprint2
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        listOf(
-            MandatoryLoginServiceFingerprint,
-            MandatoryLoginServiceFingerprint2
-        ).forEach { fingerprint ->
-            val method = fingerprint.result!!.mutableMethod
-            method.addInstructions(
-                0,
-                """
-                const/4 v0, 0x0
-                return v0
-            """
-            )
-        }
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/annotations/FixGoogleLoginCompatibility.kt b/main/app/revanced/patches/tiktok/misc/login/fixgoogle/annotations/FixGoogleLoginCompatibility.kt
deleted file mode 100644
index 62d7e57957..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/annotations/FixGoogleLoginCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.fixgoogle.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class FixGoogleLoginCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleAuthAvailableFingerprint.kt b/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleAuthAvailableFingerprint.kt
deleted file mode 100644
index 24dd8a7ded..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleAuthAvailableFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.fixgoogle.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object GoogleAuthAvailableFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/bytedance/lobby/google/GoogleAuth;"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleOneTapAuthAvailableFingerprint.kt b/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleOneTapAuthAvailableFingerprint.kt
deleted file mode 100644
index fb677fcb60..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/fingerprints/GoogleOneTapAuthAvailableFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.fixgoogle.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object GoogleOneTapAuthAvailableFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/bytedance/lobby/google/GoogleOneTapAuth;"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt b/main/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt
deleted file mode 100644
index c1f31787a1..0000000000
--- a/main/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package app.revanced.patches.tiktok.misc.login.fixgoogle.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tiktok.misc.login.fixgoogle.annotations.FixGoogleLoginCompatibility
-import app.revanced.patches.tiktok.misc.login.fixgoogle.fingerprints.GoogleAuthAvailableFingerprint
-import app.revanced.patches.tiktok.misc.login.fixgoogle.fingerprints.GoogleOneTapAuthAvailableFingerprint
-
-@Patch
-@Name("Fix google login")
-@Description("Allows logging in with a Google account.")
-@FixGoogleLoginCompatibility
-class FixGoogleLoginPatch : BytecodePatch(
-    listOf(
-        GoogleOneTapAuthAvailableFingerprint,
-        GoogleAuthAvailableFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        listOf(
-            GoogleOneTapAuthAvailableFingerprint,
-            GoogleAuthAvailableFingerprint
-        ).forEach {
-            with(it.result!!.mutableMethod) {
-                addInstructions(
-                    0,
-                    """
-                        const/4 v0, 0x0
-                        return v0
-                    """
-                )
-            }
-        }
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/annotations/SettingsCompatibility.kt b/main/app/revanced/patches/tiktok/misc/settings/annotations/SettingsCompatibility.kt
deleted file mode 100644
index b139f13282..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/annotations/SettingsCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class SettingsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityOnCreateFingerprint.kt b/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityOnCreateFingerprint.kt
deleted file mode 100644
index b9b524d6b6..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityOnCreateFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AdPersonalizationActivityOnCreateFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/AdPersonalizationActivity;") &&
-                methodDef.name == "onCreate"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AddSettingsEntryFingerprint.kt b/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AddSettingsEntryFingerprint.kt
deleted file mode 100644
index ca0e8129e5..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/AddSettingsEntryFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object AddSettingsEntryFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.CONST_CLASS,
-        Opcode.APUT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SettingNewVersionFragment;") &&
-                methodDef.name == "onViewCreated"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryFingerprint.kt b/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryFingerprint.kt
deleted file mode 100644
index 617a345ccf..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SettingsEntryFingerprint : MethodFingerprint(
-    strings = listOf(
-        "pls pass item or extends the EventUnit"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryInfoFingerprint.kt b/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryInfoFingerprint.kt
deleted file mode 100644
index f79126a530..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsEntryInfoFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SettingsEntryInfoFingerprint : MethodFingerprint(
-    strings = listOf(
-        "ExposeItem(title=",
-        ", icon="
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt b/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
deleted file mode 100644
index b1e3bb5d09..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SettingsStatusLoadFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("Lapp/revanced/tiktok/settingsmenu/SettingsStatus;") &&
-                methodDef.name == "load"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt b/main/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
deleted file mode 100644
index 633cf1e31b..0000000000
--- a/main/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.tiktok.misc.settings.annotations.SettingsCompatibility
-import app.revanced.patches.tiktok.misc.settings.fingerprints.*
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-@Patch
-@DependsOn([IntegrationsPatch::class])
-@Name("Settings")
-@Description("Adds ReVanced settings to TikTok.")
-@SettingsCompatibility
-class SettingsPatch : BytecodePatch(
-    listOf(
-        AdPersonalizationActivityOnCreateFingerprint,
-        AddSettingsEntryFingerprint,
-        SettingsEntryFingerprint,
-        SettingsEntryInfoFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Find the class name of classes which construct a settings entry
-        val settingsButtonClass = SettingsEntryFingerprint.result?.classDef?.type?.toClassName()
-            ?: return SettingsEntryFingerprint.toErrorResult()
-        val settingsButtonInfoClass = SettingsEntryInfoFingerprint.result?.classDef?.type?.toClassName()
-            ?: return SettingsEntryInfoFingerprint.toErrorResult()
-
-        // Create a settings entry for 'revanced settings' and add it to settings fragment
-        AddSettingsEntryFingerprint.result?.apply {
-            scanResult.patternScanResult?.startIndex?.let {
-                val settingsEntries = mutableMethod.getInstruction(it + 3)
-                val addEntry = mutableMethod.getInstruction<BuilderInstruction35c>(it + 5)
-                val register1 = addEntry.registerC
-                val register2 = addEntry.registerD
-                // Add the settings entry created to the settings fragment
-                mutableMethod.addInstructions(
-                    it + 6,
-                    listOf(
-                        settingsEntries,
-                        addEntry
-                    )
-                )
-                // These instructions call a method that create a settings entry use reflection base on the class name of classes that construct settings entry
-                mutableMethod.addInstructions(
-                    it + 6,
-                    """
-                        const-string v$register1, "$settingsButtonClass"
-                        const-string v$register2, "$settingsButtonInfoClass"
-                        invoke-static {v$register1, v$register2}, $CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR
-                        move-result-object v$register2
-                    """
-                )
-            }
-        } ?: return AddSettingsEntryFingerprint.toErrorResult()
-
-        // Initialize the settings menu once the replaced setting entry is clicked.
-        AdPersonalizationActivityOnCreateFingerprint.result?.mutableMethod?.apply {
-            val initializeSettingsIndex = implementation!!.instructions.indexOfFirst {
-                it.opcode == Opcode.INVOKE_SUPER
-            } + 1
-
-            val thisRegister = getInstruction<Instruction35c>(initializeSettingsIndex - 1).registerC
-            val usableRegister = implementation!!.registerCount - parameters.size - 2
-
-            addInstructionsWithLabels(
-                initializeSettingsIndex,
-                """
-                    invoke-static {v$thisRegister}, $INITIALIZE_SETTINGS_METHOD_DESCRIPTOR
-                    move-result v$usableRegister
-                    if-eqz v$usableRegister, :notrevanced
-                    return-void
-                """,
-                ExternalLabel("notrevanced", getInstruction(initializeSettingsIndex))
-            )
-        } ?: return AdPersonalizationActivityOnCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private fun String.toClassName(): String {
-        return substring(1, this.length - 1).replace("/", ".")
-    }
-
-    private companion object {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/tiktok/settingsmenu/SettingsMenu;"
-
-        private const val INITIALIZE_SETTINGS_METHOD_DESCRIPTOR =
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->initializeSettings(" +
-                    "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;" +
-                    ")Z"
-        private const val CREATE_SETTINGS_ENTRY_METHOD_DESCRIPTOR =
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->createSettingsEntry(" +
-                    "Ljava/lang/String;" +
-                    "Ljava/lang/String;" +
-                    ")Ljava/lang/Object;"
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/spoof/sim/annotations/SpoofSimCompatibility.kt b/main/app/revanced/patches/tiktok/misc/spoof/sim/annotations/SpoofSimCompatibility.kt
deleted file mode 100644
index b258cec9a3..0000000000
--- a/main/app/revanced/patches/tiktok/misc/spoof/sim/annotations/SpoofSimCompatibility.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.tiktok.misc.spoof.sim.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class SpoofSimCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt b/main/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
deleted file mode 100644
index cc9d2987f6..0000000000
--- a/main/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package app.revanced.patches.tiktok.misc.spoof.sim.patch
-
-import app.revanced.extensions.findMutableMethodOf
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
-import app.revanced.patches.tiktok.misc.settings.patch.SettingsPatch
-import app.revanced.patches.tiktok.misc.spoof.sim.annotations.SpoofSimCompatibility
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
-
-@Patch(false)
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Sim spoof")
-@Description("Spoofs the information which is retrieved from the sim-card.")
-@SpoofSimCompatibility
-class SpoofSimPatch : BytecodePatch() {
-    private companion object {
-        val replacements = hashMapOf(
-            "getSimCountryIso" to "getCountryIso",
-            "getNetworkCountryIso" to "getCountryIso",
-            "getSimOperator" to "getOperator",
-            "getNetworkOperator" to "getOperator",
-            "getSimOperatorName" to "getOperatorName",
-            "getNetworkOperatorName" to "getOperatorName"
-        )
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Find all api call to check sim information
-        buildMap {
-            context.classes.forEach { classDef ->
-                classDef.methods.let { methods ->
-                    buildMap methodList@{
-                        methods.forEach methods@{ method ->
-                            with(method.implementation?.instructions ?: return@methods) {
-                                ArrayDeque<Pair<Int, String>>().also { patchIndices ->
-                                    this.forEachIndexed { index, instruction ->
-                                        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
-
-                                        val methodRef =
-                                            (instruction as Instruction35c).reference as MethodReference
-                                        if (methodRef.definingClass != "Landroid/telephony/TelephonyManager;") return@forEachIndexed
-
-                                        replacements[methodRef.name]?.let { replacement ->
-                                            patchIndices.add(index to replacement)
-                                        }
-                                    }
-                                }.also { if (it.isEmpty()) return@methods }.let { patches ->
-                                    put(method, patches)
-                                }
-                            }
-                        }
-                    }
-                }.also { if (it.isEmpty()) return@forEach }.let { methodPatches ->
-                    put(classDef, methodPatches)
-                }
-            }
-        }.forEach { (classDef, methods) ->
-            with(context.proxy(classDef).mutableClass) {
-                methods.forEach { (method, patches) ->
-                    with(findMutableMethodOf(method)) {
-                        while (!patches.isEmpty()) {
-                            val (index, replacement) = patches.removeLast()
-                            replaceReference(index, replacement)
-                        }
-                    }
-                }
-            }
-        }
-
-        // Enable patch in settings
-        with(SettingsStatusLoadFingerprint.result!!.mutableMethod) {
-            addInstruction(
-                0,
-                "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableSimSpoof()V"
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-
-    // Patch Android API and return fake sim information
-    private fun MutableMethod.replaceReference(index: Int, replacement: String) {
-        val resultReg = getInstruction<OneRegisterInstruction>(index + 1).registerA
-
-        addInstructions(
-            index + 2,
-            """
-                invoke-static {v$resultReg}, Lapp/revanced/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String;
-                move-result-object v$resultReg
-            """
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/trakt/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/trakt/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index f68ab67328..0000000000
--- a/main/app/revanced/patches/trakt/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.trakt.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.trakt.trakt", arrayOf("1.1.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/trakt/fingerprints/IsVIPEPFingerprint.kt b/main/app/revanced/patches/trakt/fingerprints/IsVIPEPFingerprint.kt
deleted file mode 100644
index e596a52d2f..0000000000
--- a/main/app/revanced/patches/trakt/fingerprints/IsVIPEPFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.trakt.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsVIPEPFingerprint : MethodFingerprint(
-    customFingerprint = custom@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("RemoteUser;")) return@custom false
-
-        methodDef.name == "isVIPEP"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/trakt/fingerprints/IsVIPFingerprint.kt b/main/app/revanced/patches/trakt/fingerprints/IsVIPFingerprint.kt
deleted file mode 100644
index bf5c9feb1f..0000000000
--- a/main/app/revanced/patches/trakt/fingerprints/IsVIPFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.trakt.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsVIPFingerprint : MethodFingerprint(
-    customFingerprint = custom@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("RemoteUser;")) return@custom false
-
-        methodDef.name == "isVIP"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/trakt/fingerprints/RemoteUserFingerprint.kt b/main/app/revanced/patches/trakt/fingerprints/RemoteUserFingerprint.kt
deleted file mode 100644
index 0d072b7e93..0000000000
--- a/main/app/revanced/patches/trakt/fingerprints/RemoteUserFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.trakt.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object RemoteUserFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("RemoteUser;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/trakt/patch/UnlockProPatch.kt b/main/app/revanced/patches/trakt/patch/UnlockProPatch.kt
deleted file mode 100644
index d185635234..0000000000
--- a/main/app/revanced/patches/trakt/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package app.revanced.patches.trakt.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.trakt.annotations.UnlockProCompatibility
-import app.revanced.patches.trakt.fingerprints.IsVIPEPFingerprint
-import app.revanced.patches.trakt.fingerprints.IsVIPFingerprint
-import app.revanced.patches.trakt.fingerprints.RemoteUserFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(RemoteUserFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RemoteUserFingerprint.result?.classDef?.let { remoteUserClass ->
-            arrayOf(IsVIPFingerprint, IsVIPEPFingerprint).onEach { fingerprint ->
-                // Resolve both fingerprints on the same class.
-                if (!fingerprint.resolve(context, remoteUserClass))
-                    throw fingerprint.toErrorResult()
-            }.forEach { fingerprint ->
-                // Return true for both VIP check methods.
-                fingerprint.result?.mutableMethod?.addInstructions(0, RETURN_TRUE_INSTRUCTIONS)
-                    ?: return fingerprint.toErrorResult()
-            }
-        } ?: return RemoteUserFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val RETURN_TRUE_INSTRUCTIONS =
-            """
-                const/4 v0, 0x1
-                invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-                move-result-object v1
-                return-object v1
-            """
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt
deleted file mode 100644
index d3330bd5c1..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/AgendaDaysWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object AgendaDaysWidgetUnlockFingerprint : MethodUnlockFingerprint("AgendaDaysWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt
deleted file mode 100644
index ed930a26c2..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarBigWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object CalendarBigWidgetUnlockFingerprint : MethodUnlockFingerprint("CalendarBigWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt
deleted file mode 100644
index adf3b82a8e..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideDayEventsWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object CalendarWideDayEventsWidgetUnlockFingerprint :
-    MethodUnlockFingerprint("CalendarWideDayEventsWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt
deleted file mode 100644
index c4f79eff5d..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/CalendarWideTimelineWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object CalendarWideTimelineWidgetUnlockFingerprint :
-    MethodUnlockFingerprint("CalendarWideTimelineWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt
deleted file mode 100644
index 76821975f1..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/MethodUnlockFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-abstract class MethodUnlockFingerprint(private val className: String) : MethodFingerprint(
-    "L",
-    strings = listOf("binding.addButton"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/$className;")
-    }
-)
-
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt
deleted file mode 100644
index 7cfdc02460..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/ScreentimeSmallWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object ScreentimeSmallWidgetUnlockFingerprint : MethodUnlockFingerprint("ScreentimeSmallWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt b/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt
deleted file mode 100644
index 17bd9e951a..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/fingerprints/WeatherWidgetUnlockFingerprint.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.fingerprints
-
-object WeatherWidgetUnlockFingerprint : MethodUnlockFingerprint("WeatherWidgetConfigureActivity")
diff --git a/main/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt b/main/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt
deleted file mode 100644
index 715eba4313..0000000000
--- a/main/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package app.revanced.patches.twelvewidgets.unlock.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twelvewidgets.unlock.fingerprints.*
-
-@Patch
-@Name("Unlock paid widgets")
-@Description("Unlocks paid widgets of the app")
-@Compatibility([Package("com.dci.dev.androidtwelvewidgets")])
-class UnlockPaidWidgetsPatch : BytecodePatch(
-    listOf(
-        AgendaDaysWidgetUnlockFingerprint,
-        CalendarBigWidgetUnlockFingerprint,
-        CalendarWideDayEventsWidgetUnlockFingerprint,
-        CalendarWideTimelineWidgetUnlockFingerprint,
-        ScreentimeSmallWidgetUnlockFingerprint,
-        WeatherWidgetUnlockFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        listOf(
-            AgendaDaysWidgetUnlockFingerprint,
-            CalendarBigWidgetUnlockFingerprint,
-            CalendarWideDayEventsWidgetUnlockFingerprint,
-            CalendarWideTimelineWidgetUnlockFingerprint,
-            ScreentimeSmallWidgetUnlockFingerprint,
-            WeatherWidgetUnlockFingerprint
-        ).map { fingerprint ->
-            fingerprint.result?.mutableMethod ?: return fingerprint.toErrorResult()
-        }.forEach { method ->
-            method.apply {
-                removeInstructions(4, 3)
-                addInstructions(
-                    implementation?.instructions?.size!!,
-                    """
-                        const/4 v1, 0x0
-                        invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-                        return-object v0
-                    """
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt b/main/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt
deleted file mode 100644
index b0b80ec497..0000000000
--- a/main/app/revanced/patches/twitch/ad/audio/annotations/AudioAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.ad.audio.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AudioAdsCompatibility
-
diff --git a/main/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt b/main/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt
deleted file mode 100644
index fc7192cc1c..0000000000
--- a/main/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitch.ad.audio.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AudioAdsPresenterPlayFingerprint : MethodFingerprint(
-    customFingerprint = { method, _ ->
-        method.definingClass.endsWith("AudioAdsPlayerPresenter;") && method.name == "playAd"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt b/main/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt
deleted file mode 100644
index c9f22061a0..0000000000
--- a/main/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package app.revanced.patches.twitch.ad.audio.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.twitch.ad.audio.annotations.AudioAdsCompatibility
-import app.revanced.patches.twitch.ad.audio.fingerprints.AudioAdsPresenterPlayFingerprint
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Block audio ads")
-@Description("Blocks audio ads in streams and VODs.")
-@AudioAdsCompatibility
-class AudioAdsPatch : BytecodePatch(
-    listOf(AudioAdsPresenterPlayFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Block playAds call
-        with(AudioAdsPresenterPlayFingerprint.result!!) {
-            mutableMethod.addInstructionsWithLabels(
-                0,
-                """
-                    invoke-static { }, Lapp/revanced/twitch/patches/AudioAdsPatch;->shouldBlockAudioAds()Z
-                    move-result v0
-                    if-eqz v0, :show_audio_ads
-                    return-void
-                """,
-                ExternalLabel("show_audio_ads", mutableMethod.getInstruction(0))
-            )
-        }
-
-        SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences(
-            SwitchPreference(
-                "revanced_block_audio_ads",
-                StringResource(
-                    "revanced_block_audio_ads",
-                    "Block audio ads"
-                ),
-                StringResource(
-                    "revanced_block_audio_ads_on",
-                    "Audio ads are blocked"
-                ),
-                StringResource(
-                    "revanced_block_audio_ads_off",
-                    "Audio ads are unblocked"
-                ),
-                default = true,
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt b/main/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt
deleted file mode 100644
index 95a60c5b45..0000000000
--- a/main/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.ad.embedded.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class EmbeddedAdsCompatibility
-
diff --git a/main/app/revanced/patches/twitch/ad/embedded/fingerprints/CreateUsherClientFingerprint.kt b/main/app/revanced/patches/twitch/ad/embedded/fingerprints/CreateUsherClientFingerprint.kt
deleted file mode 100644
index d476288275..0000000000
--- a/main/app/revanced/patches/twitch/ad/embedded/fingerprints/CreateUsherClientFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.ad.embedded.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CreateUsherClientFingerprint : MethodFingerprint(
-    customFingerprint = { method, _ ->
-        method.definingClass.endsWith("Ltv/twitch/android/network/OkHttpClientFactory;") && method.name == "buildOkHttpClient"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt b/main/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
deleted file mode 100644
index 1c61a7adb7..0000000000
--- a/main/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package app.revanced.patches.twitch.ad.embedded.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.twitch.ad.embedded.annotations.EmbeddedAdsCompatibility
-import app.revanced.patches.twitch.ad.embedded.fingerprints.CreateUsherClientFingerprint
-import app.revanced.patches.twitch.ad.video.patch.VideoAdsPatch
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([VideoAdsPatch::class, IntegrationsPatch::class, SettingsPatch::class])
-@Name("Block embedded ads")
-@Description("Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker.")
-@EmbeddedAdsCompatibility
-class EmbeddedAdsPatch : BytecodePatch(
-    listOf(CreateUsherClientFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = CreateUsherClientFingerprint.result ?: return PatchResultError("${CreateUsherClientFingerprint.name} not found")
-
-        // Inject OkHttp3 application interceptor
-        result.mutableMethod.addInstructions(
-            3,
-            """
-                invoke-static  {}, Lapp/revanced/twitch/patches/EmbeddedAdsPatch;->createRequestInterceptor()Lapp/revanced/twitch/api/RequestInterceptor;
-                move-result-object v2
-                invoke-virtual {v0, v2}, Lokhttp3/OkHttpClient${"$"}Builder;->addInterceptor(Lokhttp3/Interceptor;)Lokhttp3/OkHttpClient${"$"}Builder;
-            """
-        )
-
-        SettingsPatch.PreferenceScreen.ADS.SURESTREAM.addPreferences(
-            ListPreference(
-                "revanced_block_embedded_ads",
-                StringResource(
-                    "revanced_block_embedded_ads",
-                    "Block embedded video ads"
-                ),
-                ArrayResource(
-                    "revanced_hls_proxies",
-                    listOf(
-                        StringResource("revanced_proxy_disabled", "Disabled"),
-                        StringResource("revanced_proxy_ttv_lol", "TTV LOL proxy"),
-                        StringResource("revanced_proxy_purpleadblock", "PurpleAdBlock proxy"),
-                    )
-                ),
-                ArrayResource(
-                    "revanced_hls_proxies_values",
-                    listOf(
-                        StringResource("key_revanced_proxy_disabled", "disabled"),
-                        StringResource("key_revanced_proxy_ttv_lol", "ttv-lol"),
-                        StringResource("key_revanced_proxy_purpleadblock", "purpleadblock")
-                    )
-                ),
-                default = "ttv-lol"
-            )
-        )
-
-        SettingsPatch.addString("revanced_embedded_ads_service_unavailable", "%s is unavailable. Ads may show. Try switching to another ad block service in settings.")
-        SettingsPatch.addString("revanced_embedded_ads_service_failed", "%s server returned an error. Ads may show. Try switching to another ad block service in settings.")
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/ad/shared/util/AbstractAdPatch.kt b/main/app/revanced/patches/twitch/ad/shared/util/AbstractAdPatch.kt
deleted file mode 100644
index 041570b205..0000000000
--- a/main/app/revanced/patches/twitch/ad/shared/util/AbstractAdPatch.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package app.revanced.patches.twitch.ad.shared.util
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.util.smali.ExternalLabel
-
-abstract class AbstractAdPatch(
-    val conditionCall: String,
-    val skipLabelName: String,
-    internal val fingerprints: Iterable<MethodFingerprint>? = null,
-) : BytecodePatch(fingerprints) {
-
-    protected fun createConditionInstructions(register: String = "v0") = """
-        invoke-static { }, $conditionCall
-        move-result $register
-        if-eqz $register, :$skipLabelName
-    """
-
-    protected data class ReturnMethod(val returnType: Char = 'V', val value: String = "")
-
-    protected fun BytecodeContext.blockMethods(clazz: String, vararg methodNames: String, returnMethod: ReturnMethod = ReturnMethod()): Boolean {
-
-        return with(findClass(clazz)?.mutableClass) {
-            this ?: return false
-
-            this.methods.filter { methodNames.contains(it.name) }.forEach {
-                val retInstruction = when (returnMethod.returnType) {
-                    'V' -> "return-void"
-                    'Z' -> """
-                        const/4 v0, ${returnMethod.value}
-                        return v0
-                    """
-                    else -> throw NotImplementedError()
-                }
-                it.addInstructionsWithLabels(
-                    0,
-                    """
-                        ${createConditionInstructions("v0")}
-                        $retInstruction
-                    """,
-                    ExternalLabel(skipLabelName, it.getInstruction(0))
-                )
-            }
-            true
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt b/main/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt
deleted file mode 100644
index a8d1f45825..0000000000
--- a/main/app/revanced/patches/twitch/ad/video/annotations/VideoAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.ad.video.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class VideoAdsCompatibility
-
diff --git a/main/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt b/main/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt
deleted file mode 100644
index c85dec1971..0000000000
--- a/main/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.twitch.ad.video.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckAdEligibilityLambdaFingerprint : MethodFingerprint(
-    returnType = "Lio/reactivex/Single;",
-    parameters = listOf("L"),
-    customFingerprint = { method, _ ->
-        method.definingClass.endsWith("/AdEligibilityFetcher;")
-                && method.name == "shouldRequestAd"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt b/main/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt
deleted file mode 100644
index 166e63b740..0000000000
--- a/main/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.twitch.ad.video.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ContentConfigShowAdsFingerprint : MethodFingerprint(
-    returnType = "Z",
-    parameters = listOf(),
-    customFingerprint = { method, _ ->
-        method.definingClass.endsWith("/ContentConfigData;") && method.name == "getShowAds"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/video/fingerprints/GetReadyToShowAdFingerprint.kt b/main/app/revanced/patches/twitch/ad/video/fingerprints/GetReadyToShowAdFingerprint.kt
deleted file mode 100644
index 8987b21930..0000000000
--- a/main/app/revanced/patches/twitch/ad/video/fingerprints/GetReadyToShowAdFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.twitch.ad.video.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetReadyToShowAdFingerprint : MethodFingerprint(
-    returnType = "Ltv/twitch/android/core/mvp/presenter/StateAndAction;",
-    parameters = listOf("L", "L"),
-    customFingerprint = { method, _ ->
-        method.definingClass.endsWith("/StreamDisplayAdsPresenter;") && method.name == "getReadyToShowAdOrAbort"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt b/main/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt
deleted file mode 100644
index 9f21b2589c..0000000000
--- a/main/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package app.revanced.patches.twitch.ad.video.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.twitch.ad.shared.util.AbstractAdPatch
-import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.twitch.ad.video.fingerprints.CheckAdEligibilityLambdaFingerprint
-import app.revanced.patches.twitch.ad.video.fingerprints.ContentConfigShowAdsFingerprint
-import app.revanced.patches.twitch.ad.video.fingerprints.GetReadyToShowAdFingerprint
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Block video ads")
-@Description("Blocks video ads in streams and VODs.")
-@VideoAdsCompatibility
-class VideoAdsPatch : AbstractAdPatch(
-    "Lapp/revanced/twitch/patches/VideoAdsPatch;->shouldBlockVideoAds()Z",
-    "show_video_ads",
-    listOf(
-        ContentConfigShowAdsFingerprint,
-        CheckAdEligibilityLambdaFingerprint,
-        GetReadyToShowAdFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        /* Amazon ads SDK */
-        context.blockMethods(
-            "Lcom/amazon/ads/video/player/AdsManagerImpl;",
-            "playAds"
-        )
-
-        /* Twitch ads manager */
-        context.blockMethods(
-            "Ltv/twitch/android/shared/ads/VideoAdManager;",
-            "checkAdEligibilityAndRequestAd", "requestAd", "requestAds"
-        )
-
-        /* Various ad presenters */
-        context.blockMethods(
-            "Ltv/twitch/android/shared/ads/AdsPlayerPresenter;",
-            "requestAd", "requestFirstAd", "requestFirstAdIfEligible", "requestMidroll", "requestAdFromMultiAdFormatEvent"
-        )
-
-        context.blockMethods(
-            "Ltv/twitch/android/shared/ads/AdsVodPlayerPresenter;",
-            "requestAd", "requestFirstAd",
-        )
-
-        context.blockMethods(
-            "Ltv/twitch/android/feature/theatre/ads/AdEdgeAllocationPresenter;",
-            "parseAdAndCheckEligibility", "requestAdsAfterEligibilityCheck", "showAd", "bindMultiAdFormatAllocation"
-        )
-
-        /* A/B ad testing experiments */
-        context.blockMethods(
-            "Ltv/twitch/android/provider/experiments/helpers/DisplayAdsExperimentHelper;",
-            "areDisplayAdsEnabled",
-            returnMethod = ReturnMethod('Z', "0")
-        )
-
-        context.blockMethods(
-            "Ltv/twitch/android/shared/ads/tracking/MultiFormatAdsTrackingExperiment;",
-            "shouldUseMultiAdFormatTracker", "shouldUseVideoAdTracker",
-            returnMethod = ReturnMethod('Z', "0")
-        )
-
-        context.blockMethods(
-            "Ltv/twitch/android/shared/ads/MultiformatAdsExperiment;",
-            "shouldDisableClientSideLivePreroll", "shouldDisableClientSideVodPreroll",
-            returnMethod = ReturnMethod('Z', "1")
-        )
-
-        // Pretend our player is ineligible for all ads
-        CheckAdEligibilityLambdaFingerprint.result?.apply {
-            mutableMethod.addInstructionsWithLabels(
-                0,
-                """
-                    ${createConditionInstructions()}
-                    const/4 v0, 0 
-                    invoke-static {v0}, Lio/reactivex/Single;->just(Ljava/lang/Object;)Lio/reactivex/Single;
-                    move-result-object p0
-                    return-object p0
-                """,
-                ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
-            )
-        } ?: return CheckAdEligibilityLambdaFingerprint.toErrorResult()
-
-        GetReadyToShowAdFingerprint.result?.apply {
-            val adFormatDeclined = "Ltv/twitch/android/shared/display/ads/theatre/StreamDisplayAdsPresenter\$Action\$AdFormatDeclined;"
-            mutableMethod.addInstructionsWithLabels(
-                0,
-                """
-                    ${createConditionInstructions()}
-                    sget-object p2, $adFormatDeclined->INSTANCE:$adFormatDeclined
-                    invoke-static {p1, p2}, Ltv/twitch/android/core/mvp/presenter/StateMachineKt;->plus(Ltv/twitch/android/core/mvp/presenter/PresenterState;Ltv/twitch/android/core/mvp/presenter/PresenterAction;)Ltv/twitch/android/core/mvp/presenter/StateAndAction;
-                    move-result-object p1
-                    return-object p1
-                """,
-                ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
-            )
-        } ?: return GetReadyToShowAdFingerprint.toErrorResult()
-
-        // Spoof showAds JSON field
-        ContentConfigShowAdsFingerprint.result?.apply {
-            mutableMethod.addInstructions(0, """
-                    ${createConditionInstructions()}
-                    const/4 v0, 0
-                    :$skipLabelName
-                    return v0
-                """
-            )
-        }  ?: return ContentConfigShowAdsFingerprint.toErrorResult()
-
-        SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences(
-            SwitchPreference(
-                "revanced_block_video_ads",
-                StringResource(
-                    "revanced_block_video_ads",
-                    "Block video ads"
-                ),
-                StringResource(
-                    "revanced_block_video_ads_on",
-                    "Video ads are blocked"
-                ),
-                StringResource(
-                    "revanced_block_video_ads_off",
-                    "Video ads are unblocked"
-                ),
-                default = true
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/chat/antidelete/annotations/ShowDeletedMessagesCompatibility.kt b/main/app/revanced/patches/twitch/chat/antidelete/annotations/ShowDeletedMessagesCompatibility.kt
deleted file mode 100644
index 7e864e55a0..0000000000
--- a/main/app/revanced/patches/twitch/chat/antidelete/annotations/ShowDeletedMessagesCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.chat.antidelete.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ShowDeletedMessagesCompatibility
-
diff --git a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/ChatUtilCreateDeletedSpanFingerprint.kt b/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/ChatUtilCreateDeletedSpanFingerprint.kt
deleted file mode 100644
index 5d5bfe492b..0000000000
--- a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/ChatUtilCreateDeletedSpanFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.chat.antidelete.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ChatUtilCreateDeletedSpanFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/ChatUtil\$Companion;") && methodDef.name == "createDeletedSpanFromChatMessageSpan"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/DeletedMessageClickableSpanCtorFingerprint.kt b/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/DeletedMessageClickableSpanCtorFingerprint.kt
deleted file mode 100644
index 49e02dd7a1..0000000000
--- a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/DeletedMessageClickableSpanCtorFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.twitch.chat.antidelete.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object DeletedMessageClickableSpanCtorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("DeletedMessageClickableSpan;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/SetHasModAccessFingerprint.kt b/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/SetHasModAccessFingerprint.kt
deleted file mode 100644
index 12ca4da9f7..0000000000
--- a/main/app/revanced/patches/twitch/chat/antidelete/fingerprints/SetHasModAccessFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitch.chat.antidelete.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SetHasModAccessFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("DeletedMessageClickableSpan;") && methodDef.name == "setHasModAccess"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt b/main/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
deleted file mode 100644
index 5ba5bfd87c..0000000000
--- a/main/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package app.revanced.patches.twitch.chat.antidelete.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.twitch.chat.antidelete.annotations.ShowDeletedMessagesCompatibility
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.ChatUtilCreateDeletedSpanFingerprint
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.DeletedMessageClickableSpanCtorFingerprint
-import app.revanced.patches.twitch.chat.antidelete.fingerprints.SetHasModAccessFingerprint
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Show deleted messages")
-@Description("Shows deleted chat messages behind a clickable spoiler.")
-@ShowDeletedMessagesCompatibility
-class ShowDeletedMessagesPatch : BytecodePatch(
-    listOf(
-        SetHasModAccessFingerprint,
-        DeletedMessageClickableSpanCtorFingerprint,
-        ChatUtilCreateDeletedSpanFingerprint
-    )
-) {
-    private fun createSpoilerConditionInstructions(register: String = "v0") = """
-        invoke-static {}, Lapp/revanced/twitch/patches/ShowDeletedMessagesPatch;->shouldUseSpoiler()Z
-        move-result $register
-        if-eqz $register, :no_spoiler
-    """
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Spoiler mode: Force set hasModAccess member to true in constructor
-        DeletedMessageClickableSpanCtorFingerprint.result?.mutableMethod?.apply {
-            addInstructionsWithLabels(
-                implementation!!.instructions.lastIndex, /* place in front of return-void */
-                """
-                    ${createSpoilerConditionInstructions()}
-                    const/4 v0, 1
-                    iput-boolean v0, p0, $definingClass->hasModAccess:Z
-                """,
-                ExternalLabel("no_spoiler", getInstruction(implementation!!.instructions.lastIndex))
-            )
-        } ?: return DeletedMessageClickableSpanCtorFingerprint.toErrorResult()
-
-        // Spoiler mode: Disable setHasModAccess setter
-        SetHasModAccessFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return SetHasModAccessFingerprint.toErrorResult()
-
-        // Cross-out mode: Reformat span of deleted message
-        ChatUtilCreateDeletedSpanFingerprint.result?.mutableMethod?.apply {
-            addInstructionsWithLabels(
-                0,
-                """
-                    invoke-static {p2}, Lapp/revanced/twitch/patches/ShowDeletedMessagesPatch;->reformatDeletedMessage(Landroid/text/Spanned;)Landroid/text/Spanned;
-                    move-result-object v0
-                    if-eqz v0, :no_reformat
-                    return-object v0
-                """,
-                ExternalLabel("no_reformat", getInstruction(0))
-            )
-        }  ?: return ChatUtilCreateDeletedSpanFingerprint.toErrorResult()
-
-        SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences(
-            ListPreference(
-                "revanced_show_deleted_messages",
-                StringResource(
-                    "revanced_show_deleted_messages_title",
-                    "Show deleted messages"
-                ),
-                ArrayResource(
-                    "revanced_deleted_messages",
-                    listOf(
-                        StringResource("revanced_deleted_messages_hide", "Do not show deleted messages"),
-                        StringResource("revanced_deleted_messages_spoiler", "Hide deleted messages behind a spoiler"),
-                        StringResource("revanced_deleted_messages_cross_out", "Show deleted messages as crossed-out text")
-                    )
-                ),
-                ArrayResource(
-                    "revanced_deleted_messages_values",
-                    listOf(
-                        StringResource("key_revanced_deleted_messages_hide", "hide"),
-                        StringResource("key_revanced_deleted_messages_spoiler", "spoiler"),
-                        StringResource("key_revanced_deleted_messages_cross_out", "cross-out")
-                    )
-                ),
-                default = "cross-out"
-            )
-        )
-
-        SettingsPatch.addString("revanced_deleted_msg", "message deleted")
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/chat/autoclaim/annotations/AutoClaimChannelPointsCompatibility.kt b/main/app/revanced/patches/twitch/chat/autoclaim/annotations/AutoClaimChannelPointsCompatibility.kt
deleted file mode 100644
index 2efc511bf5..0000000000
--- a/main/app/revanced/patches/twitch/chat/autoclaim/annotations/AutoClaimChannelPointsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitch.chat.autoclaim.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app", arrayOf("15.4.1"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AutoClaimChannelPointsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/chat/autoclaim/fingerprints/CommunityPointsButtonViewDelegateFingerprint.kt b/main/app/revanced/patches/twitch/chat/autoclaim/fingerprints/CommunityPointsButtonViewDelegateFingerprint.kt
deleted file mode 100644
index 5bbfaeb00d..0000000000
--- a/main/app/revanced/patches/twitch/chat/autoclaim/fingerprints/CommunityPointsButtonViewDelegateFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitch.chat.autoclaim.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CommunityPointsButtonViewDelegateFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("CommunityPointsButtonViewDelegate;")
-                && methodDef.name == "showClaimAvailable"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt b/main/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt
deleted file mode 100644
index 2947918469..0000000000
--- a/main/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package app.revanced.patches.twitch.chat.autoclaim.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.twitch.chat.autoclaim.annotations.AutoClaimChannelPointsCompatibility
-import app.revanced.patches.twitch.chat.autoclaim.fingerprints.CommunityPointsButtonViewDelegateFingerprint
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([SettingsPatch::class])
-@Name("Auto claim channel points")
-@Description("Automatically claim Channel Points.")
-@AutoClaimChannelPointsCompatibility
-class AutoClaimChannelPointPatch : BytecodePatch(
-    listOf(CommunityPointsButtonViewDelegateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences(
-            SwitchPreference(
-                "revanced_auto_claim_channel_points",
-                StringResource(
-                    "revanced_auto_claim_channel_points",
-                    "Automatically claim Channel Points"
-                ),
-                StringResource(
-                    "revanced_auto_claim_channel_points_on",
-                    "Channel Points are claimed automatically"
-                ),
-                StringResource(
-                    "revanced_auto_claim_channel_points_off",
-                    "Channel Points are not claimed automatically"
-                ),
-                default = true
-            )
-        )
-
-        CommunityPointsButtonViewDelegateFingerprint.result?.mutableMethod?.apply {
-            val lastIndex = implementation!!.instructions.lastIndex
-            addInstructionsWithLabels(
-                lastIndex, // place in front of return-void
-                """
-                    invoke-static {}, Lapp/revanced/twitch/patches/AutoClaimChannelPointsPatch;->shouldAutoClaim()Z
-                    move-result v0
-                    if-eqz v0, :auto_claim
-
-                    # Claim by calling the button's onClick method
-
-                    iget-object v0, p0, Ltv/twitch/android/shared/community/points/viewdelegate/CommunityPointsButtonViewDelegate;->buttonLayout:Landroid/view/ViewGroup;
-                    invoke-virtual { v0 }, Landroid/view/View;->callOnClick()Z
-                """,
-                ExternalLabel("auto_claim", getInstruction(lastIndex))
-            )
-        } ?: return CommunityPointsButtonViewDelegateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/debug/annotations/DebugModeCompatibility.kt b/main/app/revanced/patches/twitch/debug/annotations/DebugModeCompatibility.kt
deleted file mode 100644
index 078bae90d2..0000000000
--- a/main/app/revanced/patches/twitch/debug/annotations/DebugModeCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.debug.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DebugModeCompatibility
-
diff --git a/main/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt b/main/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt
deleted file mode 100644
index efb6effd10..0000000000
--- a/main/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.debug.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsDebugConfigEnabledFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "isDebugConfigEnabled"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt b/main/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt
deleted file mode 100644
index 99894998a8..0000000000
--- a/main/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.debug.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsOmVerificationEnabledFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "isOmVerificationEnabled"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt b/main/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt
deleted file mode 100644
index 9c91695e01..0000000000
--- a/main/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.debug.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ShouldShowDebugOptionsFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/BuildConfigUtil;") && methodDef.name == "shouldShowDebugOptions"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt b/main/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt
deleted file mode 100644
index 6453739f6b..0000000000
--- a/main/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package app.revanced.patches.twitch.debug.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.twitch.debug.annotations.DebugModeCompatibility
-import app.revanced.patches.twitch.debug.fingerprints.IsDebugConfigEnabledFingerprint
-import app.revanced.patches.twitch.debug.fingerprints.IsOmVerificationEnabledFingerprint
-import app.revanced.patches.twitch.debug.fingerprints.ShouldShowDebugOptionsFingerprint
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch(false)
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Debug mode")
-@Description("Enables Twitch's internal debugging mode.")
-@DebugModeCompatibility
-class DebugModePatch : BytecodePatch(
-    listOf(
-        IsDebugConfigEnabledFingerprint,
-        IsOmVerificationEnabledFingerprint,
-        ShouldShowDebugOptionsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        listOf(
-            IsDebugConfigEnabledFingerprint,
-            IsOmVerificationEnabledFingerprint,
-            ShouldShowDebugOptionsFingerprint
-        ).forEach {
-            it.result?.mutableMethod?.apply {
-                addInstructions(
-                    0,
-                    """
-                         invoke-static {}, Lapp/revanced/twitch/patches/DebugModePatch;->isDebugModeEnabled()Z
-                         move-result v0
-                         return v0
-                      """
-                )
-            } ?: return it.toErrorResult()
-        }
-
-        SettingsPatch.PreferenceScreen.MISC.OTHER.addPreferences(
-            SwitchPreference(
-                "revanced_debug_mode",
-                StringResource(
-                    "revanced_debug_mode_enable",
-                    "Enable debug mode"
-                ),
-                StringResource(
-                    "revanced_debug_mode_on",
-                    "Debug mode is enabled (not recommended)"
-                ),
-                StringResource(
-                    "revanced_debug_mode_off",
-                    "Debug mode is disabled"
-                ),
-                default = false,
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt b/main/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt
deleted file mode 100644
index 40778ece27..0000000000
--- a/main/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitch.misc.integrations.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class IntegrationsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt b/main/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt
deleted file mode 100644
index fbb3997b7e..0000000000
--- a/main/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.twitch.misc.integrations.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-
-@Name("Init fingerprint")
-@IntegrationsCompatibility
-object InitFingerprint : IntegrationsFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/TwitchApplication;") &&
-                methodDef.name == "onCreate"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt b/main/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt
deleted file mode 100644
index 1543c3dde4..0000000000
--- a/main/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.twitch.misc.integrations.patch
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
-import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
-import app.revanced.patches.twitch.misc.integrations.fingerprints.InitFingerprint
-
-@Name("Integrations")
-@IntegrationsCompatibility
-@RequiresIntegrations
-class IntegrationsPatch : AbstractIntegrationsPatch(
-    "Lapp/revanced/twitch/utils/ReVancedUtils;",
-    listOf(InitFingerprint)
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitch/misc/settings/annotations/SettingsCompatibility.kt b/main/app/revanced/patches/twitch/misc/settings/annotations/SettingsCompatibility.kt
deleted file mode 100644
index 2b632f8ee9..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/annotations/SettingsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("tv.twitch.android.app")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SettingsCompatibility
diff --git a/main/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt b/main/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
deleted file mode 100644
index fdcdcc8a97..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
+++ /dev/null
@@ -1,202 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen
-import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.twitch.misc.settings.annotations.SettingsCompatibility
-import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsOnClickFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsUpdatedFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsActivityOnCreateFingerprint
-import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsMenuItemEnumFingerprint
-import app.revanced.patches.twitch.misc.settings.resource.patch.SettingsResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.immutable.ImmutableField
-import java.io.Closeable
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsResourcePatch::class])
-@Name("Settings")
-@Description("Adds settings menu to Twitch.")
-@SettingsCompatibility
-class SettingsPatch : BytecodePatch(
-    listOf(
-        SettingsActivityOnCreateFingerprint,
-        SettingsMenuItemEnumFingerprint,
-        MenuGroupsUpdatedFingerprint,
-        MenuGroupsOnClickFingerprint
-    )
-), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Hook onCreate to handle fragment creation
-        SettingsActivityOnCreateFingerprint.result?.apply {
-            val insertIndex = mutableMethod.implementation!!.instructions.size - 2
-            mutableMethod.addInstructionsWithLabels(
-                insertIndex,
-                """
-                    invoke-static       {p0}, $SETTINGS_HOOKS_CLASS->handleSettingsCreation(Landroidx/appcompat/app/AppCompatActivity;)Z
-                    move-result         v0
-                    if-eqz              v0, :no_rv_settings_init
-                    return-void
-                """,
-                ExternalLabel("no_rv_settings_init", mutableMethod.getInstruction(insertIndex))
-            )
-        } ?: return SettingsActivityOnCreateFingerprint.toErrorResult()
-
-        // Create new menu item for settings menu
-        SettingsMenuItemEnumFingerprint.result?.apply {
-            injectMenuItem(
-                REVANCED_SETTINGS_MENU_ITEM_NAME,
-                REVANCED_SETTINGS_MENU_ITEM_ID,
-                REVANCED_SETTINGS_MENU_ITEM_TITLE_RES,
-                REVANCED_SETTINGS_MENU_ITEM_ICON_RES
-            )
-        } ?: return SettingsMenuItemEnumFingerprint.toErrorResult()
-
-        // Intercept settings menu creation and add new menu item
-        MenuGroupsUpdatedFingerprint.result?.apply {
-            mutableMethod.addInstructions(
-                0,
-                """
-                    sget-object             v0, $MENU_ITEM_ENUM_CLASS->$REVANCED_SETTINGS_MENU_ITEM_NAME:$MENU_ITEM_ENUM_CLASS 
-                    invoke-static           {p1, v0}, $SETTINGS_HOOKS_CLASS->handleSettingMenuCreation(Ljava/util/List;Ljava/lang/Object;)Ljava/util/List;
-                    move-result-object      p1
-                """
-            )
-        } ?: return MenuGroupsUpdatedFingerprint.toErrorResult()
-
-        // Intercept onclick events for the settings menu
-        MenuGroupsOnClickFingerprint.result?.apply {
-            val insertIndex = 0
-            mutableMethod.addInstructionsWithLabels(
-                insertIndex,
-                """
-                        invoke-static       {p1}, $SETTINGS_HOOKS_CLASS->handleSettingMenuOnClick(Ljava/lang/Enum;)Z
-                        move-result         p2
-                        if-eqz              p2, :no_rv_settings_onclick
-                        sget-object         p1, $MENU_DISMISS_EVENT_CLASS->INSTANCE:$MENU_DISMISS_EVENT_CLASS
-                        invoke-virtual      {p0, p1}, Ltv/twitch/android/core/mvp/viewdelegate/RxViewDelegate;->pushEvent(Ltv/twitch/android/core/mvp/viewdelegate/ViewDelegateEvent;)V
-                        return-void
-                """,
-                ExternalLabel("no_rv_settings_onclick", mutableMethod.getInstruction(insertIndex))
-            )
-        }  ?: return MenuGroupsOnClickFingerprint.toErrorResult()
-
-        addString("revanced_settings", "ReVanced Settings", false)
-        addString("revanced_reboot_message", "Twitch needs to restart to apply your changes. Restart now?", false)
-        addString("revanced_reboot", "Restart", false)
-        addString("revanced_cancel", "Cancel", false)
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        fun addString(identifier: String, value: String, formatted: Boolean = true) =
-            SettingsResourcePatch.addString(identifier, value, formatted)
-
-        fun addPreferenceScreen(preferenceScreen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) =
-            SettingsResourcePatch.addPreferenceScreen(preferenceScreen)
-
-        /* Private members */
-        private const val REVANCED_SETTINGS_MENU_ITEM_NAME = "RevancedSettings"
-        private const val REVANCED_SETTINGS_MENU_ITEM_ID = 0x7
-        private const val REVANCED_SETTINGS_MENU_ITEM_TITLE_RES = "revanced_settings"
-        private const val REVANCED_SETTINGS_MENU_ITEM_ICON_RES = "ic_settings"
-
-        private const val MENU_ITEM_ENUM_CLASS = "Ltv/twitch/android/feature/settings/menu/SettingsMenuItem;"
-        private const val MENU_DISMISS_EVENT_CLASS = "Ltv/twitch/android/feature/settings/menu/SettingsMenuViewDelegate\$Event\$OnDismissClicked;"
-
-        private const val INTEGRATIONS_PACKAGE = "app/revanced/twitch"
-        private const val SETTINGS_HOOKS_CLASS = "L$INTEGRATIONS_PACKAGE/settingsmenu/SettingsHooks;"
-        private const val REVANCED_UTILS_CLASS = "L$INTEGRATIONS_PACKAGE/utils/ReVancedUtils;"
-
-        private fun MethodFingerprintResult.injectMenuItem(
-            name: String,
-            value: Int,
-            titleResourceName: String,
-            iconResourceName: String
-        ) {
-            // Add new static enum member field
-            mutableClass.staticFields.add(
-                ImmutableField(
-                    mutableMethod.definingClass,
-                    name,
-                    MENU_ITEM_ENUM_CLASS,
-                    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.ENUM or AccessFlags.STATIC,
-                    null,
-                    null,
-                    null
-                ).toMutable()
-            )
-
-            // Add initializer for the new enum member
-            mutableMethod.addInstructions(
-                mutableMethod.implementation!!.instructions.size - 4,
-                """   
-                new-instance        v0, $MENU_ITEM_ENUM_CLASS
-                const-string        v1, "$titleResourceName"
-                invoke-static       {v1}, $REVANCED_UTILS_CLASS->getStringId(Ljava/lang/String;)I
-                move-result         v1
-                const-string        v3, "$iconResourceName"
-                invoke-static       {v3}, $REVANCED_UTILS_CLASS->getDrawableId(Ljava/lang/String;)I
-                move-result         v3
-                const-string        v4, "$name"
-                const/4             v5, $value
-                invoke-direct       {v0, v4, v5, v1, v3}, $MENU_ITEM_ENUM_CLASS-><init>(Ljava/lang/String;III)V 
-                sput-object         v0, $MENU_ITEM_ENUM_CLASS->$name:$MENU_ITEM_ENUM_CLASS
-            """
-            )
-        }
-    }
-
-    /**
-     * Preference screens patches should add their settings to.
-     */
-    internal object PreferenceScreen : AbstractPreferenceScreen() {
-        val ADS = CustomScreen("ads", "Ads", "Ad blocking settings")
-        val CHAT = CustomScreen("chat", "Chat", "Chat settings")
-        val MISC = CustomScreen("misc", "Misc", "Miscellaneous patches")
-
-        internal class CustomScreen(key: String, title: String, summary: String) : Screen(key, title, summary) {
-            /* Categories */
-            val GENERAL = CustomCategory("general", "General settings")
-            val OTHER = CustomCategory("other", "Other settings")
-            val CLIENT_SIDE = CustomCategory("client_ads", "Client-side ads")
-            val SURESTREAM = CustomCategory("surestream_ads", "Server-side surestream ads")
-
-            internal inner class CustomCategory(key: String, title: String) : Screen.Category(key, title) {
-                /* For Twitch, we need to load our CustomPreferenceCategory class instead of the default one. */
-                override fun transform(): PreferenceCategory {
-                    return PreferenceCategory(
-                        key,
-                        StringResource("${key}_title", title),
-                        preferences.sortedBy { it.title.value },
-                        "app.revanced.twitch.settingsmenu.preference.CustomPreferenceCategory"
-                    )
-                }
-            }
-        }
-
-        override fun commit(screen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) {
-            addPreferenceScreen(screen)
-        }
-    }
-
-    override fun close() = PreferenceScreen.close()
-}
diff --git a/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsOnClickFingerprint.kt b/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsOnClickFingerprint.kt
deleted file mode 100644
index 6bf971dd60..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsOnClickFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object MenuGroupsOnClickFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PRIVATE or AccessFlags.STATIC or AccessFlags.FINAL,
-    listOf("L", "L", "L"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SettingsMenuViewDelegate;")
-                && methodDef.name.contains("render")
-    }
-)
diff --git a/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsUpdatedFingerprint.kt b/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsUpdatedFingerprint.kt
deleted file mode 100644
index 42cc4e466a..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/fingerprints/MenuGroupsUpdatedFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object MenuGroupsUpdatedFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SettingsMenuPresenter\$Event\$MenuGroupsUpdated;")
-                && methodDef.name == "<init>"
-    }
-)
diff --git a/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsActivityOnCreateFingerprint.kt b/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsActivityOnCreateFingerprint.kt
deleted file mode 100644
index ed30aa4eb0..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsActivityOnCreateFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SettingsActivityOnCreateFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SettingsActivity;") &&
-                methodDef.name == "onCreate"
-    }
-)
diff --git a/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsMenuItemEnumFingerprint.kt b/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsMenuItemEnumFingerprint.kt
deleted file mode 100644
index cbee9a584b..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/fingerprints/SettingsMenuItemEnumFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SettingsMenuItemEnumFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SettingsMenuItem;") && methodDef.name == "<clinit>"
-    }
-)
diff --git a/main/app/revanced/patches/twitch/misc/settings/resource/patch/SettingsResourcePatch.kt b/main/app/revanced/patches/twitch/misc/settings/resource/patch/SettingsResourcePatch.kt
deleted file mode 100644
index 46feadd4ac..0000000000
--- a/main/app/revanced/patches/twitch/misc/settings/resource/patch/SettingsResourcePatch.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package app.revanced.patches.twitch.misc.settings.resource.patch
-
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.resource.patch.AbstractSettingsResourcePatch
-
-class SettingsResourcePatch : AbstractSettingsResourcePatch(
-"revanced_prefs",
-"twitch/settings"
-) {
-    internal companion object {
-        /* Companion delegates */
-
-        /**
-         * Add a new string to the resources.
-         *
-         * @param identifier The key of the string.
-         * @param value The value of the string.
-         * @throws IllegalArgumentException if the string already exists.
-         */
-        fun addString(identifier: String, value: String, formatted: Boolean) =
-            AbstractSettingsResourcePatch.addString(identifier, value, formatted)
-
-        /**
-         * Add an array to the resources.
-         *
-         * @param arrayResource The array resource to add.
-         */
-        fun addArray(arrayResource: ArrayResource) = AbstractSettingsResourcePatch.addArray(arrayResource)
-
-        /**
-         * Add a preference to the settings.
-         *
-         * @param preferenceScreen The name of the preference screen.
-         */
-        fun addPreferenceScreen(preferenceScreen: PreferenceScreen) = AbstractSettingsResourcePatch.addPreference(preferenceScreen)
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt b/main/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt
deleted file mode 100644
index 3015f29f06..0000000000
--- a/main/app/revanced/patches/twitter/misc/dynamiccolor/annotations/DynamicColorCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitter.misc.dynamiccolor.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.twitter.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DynamicColorCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt b/main/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
deleted file mode 100644
index 190bd09409..0000000000
--- a/main/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package app.revanced.patches.twitter.misc.dynamiccolor.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twitter.misc.dynamiccolor.annotations.DynamicColorCompatibility
-import java.io.FileWriter
-import java.nio.file.Files
-
-@Patch
-@Name("Dynamic color")
-@Description("Replaces the default Twitter Blue with the users Material You palette.")
-@DynamicColorCompatibility
-class DynamicColorPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        val resDirectory = context["res"]
-        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
-
-        val valuesV31Directory = resDirectory.resolve("values-v31")
-        if (!valuesV31Directory.isDirectory) Files.createDirectories(valuesV31Directory.toPath())
-
-        val valuesNightV31Directory = resDirectory.resolve("values-night-v31")
-        if (!valuesNightV31Directory.isDirectory) Files.createDirectories(valuesNightV31Directory.toPath())
-
-        listOf(valuesV31Directory, valuesNightV31Directory).forEach { it ->
-            val colorsXml = it.resolve("colors.xml")
-
-            if(!colorsXml.exists()) {
-                FileWriter(colorsXml).use {
-                    it.write("<?xml version=\"1.0\" encoding=\"utf-8\"?><resources></resources>")
-                }
-            }
-        }
-
-        context.xmlEditor["res/values-v31/colors.xml"].use { editor ->
-            val document = editor.file
-
-            mapOf(
-                "ps__twitter_blue" to "@color/twitter_blue",
-                "ps__twitter_blue_pressed" to "@color/twitter_blue_fill_pressed",
-                "twitter_blue" to "@android:color/system_accent1_400",
-                "twitter_blue_fill_pressed" to "@android:color/system_accent1_300",
-                "twitter_blue_opacity_30" to "@android:color/system_accent1_100",
-                "twitter_blue_opacity_50" to "@android:color/system_accent1_200",
-                "twitter_blue_opacity_58" to "@android:color/system_accent1_300",
-                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200",
-                "ic_launcher_background" to "#1DA1F2"
-            ).forEach { (k, v) ->
-                val colorElement = document.createElement("color")
-
-                colorElement.setAttribute("name", k)
-                colorElement.textContent = v
-
-                document.getElementsByTagName("resources").item(0).appendChild(colorElement)
-            }
-        }
-
-        context.xmlEditor["res/values-night-v31/colors.xml"].use { editor ->
-            val document = editor.file
-
-            mapOf(
-                "twitter_blue" to "@android:color/system_accent1_200",
-                "twitter_blue_fill_pressed" to "@android:color/system_accent1_300",
-                "twitter_blue_opacity_30" to "@android:color/system_accent1_50",
-                "twitter_blue_opacity_50" to "@android:color/system_accent1_100",
-                "twitter_blue_opacity_58" to "@android:color/system_accent1_200",
-                "deep_transparent_twitter_blue" to "@android:color/system_accent1_200"
-            ).forEach { (k, v) ->
-                val colorElement = document.createElement("color")
-
-                colorElement.setAttribute("name", k)
-                colorElement.textContent = v
-
-                document.getElementsByTagName("resources").item(0).appendChild(colorElement)
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonHookPatchFingerprint.kt b/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonHookPatchFingerprint.kt
deleted file mode 100644
index 732e7fb6fc..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonHookPatchFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.json.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object JsonHookPatchFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ -> methodDef.name == "<clinit>" },
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE, // Add dummy hook to hooks list.
-        // Add hooks to the hooks list.
-        Opcode.INVOKE_STATIC // Call buildList.
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonInputStreamFingerprint.kt b/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonInputStreamFingerprint.kt
deleted file mode 100644
index f8f1b4c8d5..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/JsonInputStreamFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.json.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object JsonInputStreamFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        if (methodDef.parameterTypes.size == 0) false
-        else methodDef.parameterTypes.first() == "Ljava/io/InputStream;"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/LoganSquareFingerprint.kt b/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/LoganSquareFingerprint.kt
deleted file mode 100644
index 5eb6f5aeca..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/json/fingerprints/LoganSquareFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.json.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object LoganSquareFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("LoganSquare;") }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt b/main/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt
deleted file mode 100644
index 18cad27977..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.json.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonHookPatchFingerprint
-import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonInputStreamFingerprint
-import app.revanced.patches.twitter.misc.hook.json.fingerprints.LoganSquareFingerprint
-import java.io.Closeable
-import java.io.InvalidClassException
-
-@Name("Json hook")
-@Description("Hooks the stream which reads JSON responses.")
-@RequiresIntegrations
-class JsonHookPatch : BytecodePatch(
-    listOf(LoganSquareFingerprint)
-), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
-        JsonHookPatchFingerprint.also {
-            // Make sure the integrations are present.
-            val jsonHookPatch = context.findClass { classDef -> classDef.type == JSON_HOOK_PATCH_CLASS_DESCRIPTOR }
-                ?: throw PatchResultError("Could not find integrations.")
-
-            if (!it.resolve(context, jsonHookPatch.immutableClass))
-                throw PatchResultError("Unexpected integrations.")
-        }.let { hooks = JsonHookPatchHook(it) }
-
-        // Conveniently find the type to hook a method in, via a named field.
-        val jsonFactory = LoganSquareFingerprint.result
-            ?.classDef
-            ?.fields
-            ?.firstOrNull { it.name == "JSON_FACTORY" }
-            ?.type
-            .let { type ->
-                context.findClass { it.type == type }?.mutableClass
-            } ?: return PatchResultError("Could not find required class.")
-
-        // Hook the methods first parameter.
-        JsonInputStreamFingerprint
-            .also { it.resolve(context, jsonFactory) }
-            .result
-            ?.mutableMethod
-            ?.addInstructions(
-                0,
-                """
-                    invoke-static { p1 }, $JSON_HOOK_PATCH_CLASS_DESCRIPTOR->parseJsonHook(Ljava/io/InputStream;)Ljava/io/InputStream;
-                    move-result-object p1
-                """
-            ) ?: return PatchResultError("Could not find method to hook.")
-
-        return PatchResultSuccess()
-    }
-
-    /**
-     * Create a hook class.
-     * The class has to extend on **JsonHook**.
-     * The class has to be a Kotlin object class, or at least have an INSTANCE field of itself.
-     *
-     * @param context The [BytecodeContext] of the current patch.
-     * @param descriptor The class descriptor of the hook.
-     * @throws ClassNotFoundException If the class could not be found.
-     */
-    internal class Hook(context: BytecodeContext, internal val descriptor: String) {
-        internal var added = false
-
-        init {
-            context.findClass { it.type == descriptor }?.let {
-                it.mutableClass.also { classDef ->
-                    if (
-                        classDef.superclass != JSON_HOOK_CLASS_DESCRIPTOR ||
-                        !classDef.fields.any { field -> field.name == "INSTANCE" }
-                    ) throw InvalidClassException(classDef.type, "Not a hook class")
-
-                }
-            } ?: throw ClassNotFoundException("Failed to find hook class")
-        }
-    }
-
-    /**
-     * A hook for the [JsonHookPatch].
-     *
-     * @param jsonHookPatchFingerprint The [JsonHookPatchFingerprint] to hook.
-     */
-    internal class JsonHookPatchHook(jsonHookPatchFingerprint: MethodFingerprint): Closeable {
-        private val jsonHookPatchFingerprintResult = jsonHookPatchFingerprint.result!!
-        private val jsonHookPatchIndex = jsonHookPatchFingerprintResult.scanResult.patternScanResult!!.endIndex
-
-        /**
-         * Add a hook to the [JsonHookPatch].
-         * Will not add the hook if it's already added.
-         *
-         * @param hook The [Hook] to add.
-         */
-        fun addHook(hook: Hook) {
-            if (hook.added) return
-
-            jsonHookPatchFingerprintResult.mutableMethod.apply {
-                // Insert hooks right before calling buildList.
-                val insertIndex = jsonHookPatchIndex
-
-                addInstructions(
-                    insertIndex,
-                    """
-                            sget-object v1, ${hook.descriptor}->INSTANCE:${hook.descriptor}
-                            invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-                        """
-                )
-            }
-
-            hook.added = true
-        }
-
-        override fun close() {
-            // Remove hooks.add(dummyHook).
-            jsonHookPatchFingerprintResult.mutableMethod.apply {
-                val addDummyHookIndex = jsonHookPatchIndex - 2
-
-                removeInstructions(addDummyHookIndex, 2)
-            }
-        }
-    }
-
-    override fun close() = hooks.close()
-
-    internal companion object {
-        private const val JSON_HOOK_CLASS_NAMESPACE = "app/revanced/twitter/patches/hook/json"
-
-        private const val JSON_HOOK_PATCH_CLASS_DESCRIPTOR = "L$JSON_HOOK_CLASS_NAMESPACE/JsonHookPatch;"
-
-        private const val BASE_PATCH_CLASS_NAME = "BaseJsonHook"
-
-        private const val JSON_HOOK_CLASS_DESCRIPTOR = "L$JSON_HOOK_CLASS_NAMESPACE/$BASE_PATCH_CLASS_NAME;"
-
-        /**
-         * The [JsonHookPatchHook] of the [JsonHookPatch].
-         *
-         * @see JsonHookPatchHook
-         */
-        internal lateinit var hooks: JsonHookPatchHook
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt b/main/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt
deleted file mode 100644
index 4b71bc2abb..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.patch
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
-
-abstract class BaseHookPatchPatch(private val hookClassDescriptor: String) : BytecodePatch() {
-    override fun execute(context: BytecodeContext) = try {
-        JsonHookPatch.hooks.addHook(JsonHookPatch.Hook(context, hookClassDescriptor))
-
-        PatchResultSuccess()
-    } catch (ex: Exception) {
-        PatchResultError(ex)
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/patch/ads/annotations/HideAdsCompatibility.kt b/main/app/revanced/patches/twitter/misc/hook/patch/ads/annotations/HideAdsCompatibility.kt
deleted file mode 100644
index d44fa95e08..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/patch/ads/annotations/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.patch.ads.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.twitter.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/patch/ads/patch/HideAdsPatch.kt b/main/app/revanced/patches/twitter/misc/hook/patch/ads/patch/HideAdsPatch.kt
deleted file mode 100644
index e978c5d679..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/patch/ads/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.patch.ads.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
-import app.revanced.patches.twitter.misc.hook.patch.BaseHookPatchPatch
-import app.revanced.patches.twitter.misc.hook.patch.ads.annotations.HideAdsCompatibility
-
-@Patch
-@Name("Hide ads")
-@DependsOn([JsonHookPatch::class])
-@Description("Hides ads.")
-@HideAdsCompatibility
-class HideAdsPatch : BaseHookPatchPatch("Lapp/revanced/twitter/patches/hook/patch/ads/AdsHook;")
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/annotations/HideRecommendedUsersCompatibility.kt b/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/annotations/HideRecommendedUsersCompatibility.kt
deleted file mode 100644
index 196482e919..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/annotations/HideRecommendedUsersCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.patch.recommendation.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.twitter.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideRecommendedUsersCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/patch/HideRecommendedUsersPatch.kt b/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/patch/HideRecommendedUsersPatch.kt
deleted file mode 100644
index c4c9bc0842..0000000000
--- a/main/app/revanced/patches/twitter/misc/hook/patch/recommendation/patch/HideRecommendedUsersPatch.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.twitter.misc.hook.patch.recommendation.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
-import app.revanced.patches.twitter.misc.hook.patch.BaseHookPatchPatch
-import app.revanced.patches.twitter.misc.hook.patch.recommendation.annotations.HideRecommendedUsersCompatibility
-
-@Patch
-@Name("Hide recommended users")
-@DependsOn([JsonHookPatch::class])
-@Description("Hides recommended users.")
-@HideRecommendedUsersCompatibility
-class HideRecommendedUsersPatch : BaseHookPatchPatch(
-    "Lapp/revanced/twitter/patches/hook/patch/recommendation/RecommendedUsersHook;"
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/vsco/misc/pro/fingerprints/RevCatSubscriptionFingerprint.kt b/main/app/revanced/patches/vsco/misc/pro/fingerprints/RevCatSubscriptionFingerprint.kt
deleted file mode 100644
index 871b6dcf04..0000000000
--- a/main/app/revanced/patches/vsco/misc/pro/fingerprints/RevCatSubscriptionFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.vsco.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object RevCatSubscriptionFingerprint : MethodFingerprint(
-    returnType = "V",
-    strings = listOf("use_debug_subscription_settings"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/RevCatSubscriptionSettingsRepository;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt b/main/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt
deleted file mode 100644
index a96f53dc4e..0000000000
--- a/main/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.vsco.misc.pro.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.*
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.vsco.misc.pro.fingerprints.RevCatSubscriptionFingerprint
-
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks pro features.")
-@Compatibility([Package("com.vsco.cam")])
-class UnlockProPatch : BytecodePatch(
-    listOf(RevCatSubscriptionFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RevCatSubscriptionFingerprint.result?.mutableMethod?.apply {
-            // Set isSubscribed to true.
-            addInstruction(
-                0,
-                """
-                    const p1, 0x1
-                """
-            )
-        } ?: return RevCatSubscriptionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt b/main/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
deleted file mode 100644
index 2a8f63791c..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.warnwetter.misc.firebasegetcert.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("de.dwd.warnapp")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class FirebaseGetCertPatchCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt b/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
deleted file mode 100644
index 196f649cf2..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetMessagingCertFingerprint : MethodFingerprint(
-    "Ljava/lang/String;",
-    strings = listOf(
-        "ContentValues",
-        "Could not get fingerprint hash for package: ",
-        "No such package: "
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt b/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
deleted file mode 100644
index 8c1fb8c55e..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetReqistrationCertFingerprint : MethodFingerprint(
-    "Ljava/lang/String;",
-    strings = listOf(
-        "FirebaseRemoteConfig",
-        "Could not get fingerprint hash for package: ",
-        "No such package: "
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt b/main/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt
deleted file mode 100644
index c481655ceb..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package app.revanced.patches.warnwetter.misc.firebasegetcert.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
-import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetMessagingCertFingerprint
-import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetReqistrationCertFingerprint
-
-@Name("Spoof cert patch")
-@Description("Spoofs the X-Android-Cert header.")
-@FirebaseGetCertPatchCompatibility
-class FirebaseGetCertPatch : BytecodePatch(
-    listOf(
-        GetReqistrationCertFingerprint,
-        GetMessagingCertFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val spoofedInstruction =
-            """
-                const-string v0, "0799DDF0414D3B3475E88743C91C0676793ED450"
-                return-object v0
-            """
-
-        val registrationCertMethod = GetReqistrationCertFingerprint.result!!.mutableMethod
-        val messagingCertMethod = GetMessagingCertFingerprint.result!!.mutableMethod
-
-        registrationCertMethod.addInstructions(
-            0,
-            spoofedInstruction
-        )
-        messagingCertMethod.addInstructions(
-            0,
-            spoofedInstruction
-        )
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt b/main/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
deleted file mode 100644
index c82c22c02a..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.warnwetter.misc.promocode.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("de.dwd.warnapp")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PromoCodeUnlockCompatibility
diff --git a/main/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt b/main/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
deleted file mode 100644
index 31f02ab5e9..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.warnwetter.misc.promocode.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PromoCodeUnlockFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt b/main/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt
deleted file mode 100644
index 4d8b84a405..0000000000
--- a/main/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package app.revanced.patches.warnwetter.misc.promocode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.warnwetter.misc.firebasegetcert.patch.FirebaseGetCertPatch
-import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
-import app.revanced.patches.warnwetter.misc.promocode.fingerprints.PromoCodeUnlockFingerprint
-
-@DependsOn(
-    [
-        FirebaseGetCertPatch::class
-    ]
-)
-@Patch
-@Name("Promo code unlock")
-@Description("Disables the validation of promo code. Any code will work to unlock all features.")
-@PromoCodeUnlockCompatibility
-class PromoCodeUnlockPatch : BytecodePatch(
-    listOf(
-        PromoCodeUnlockFingerprint
-    )
-) {
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = PromoCodeUnlockFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/windyapp/misc/unlockpro/annotations/UnlockProCompatibility.kt b/main/app/revanced/patches/windyapp/misc/unlockpro/annotations/UnlockProCompatibility.kt
deleted file mode 100644
index fecdfb21c9..0000000000
--- a/main/app/revanced/patches/windyapp/misc/unlockpro/annotations/UnlockProCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.windyapp.misc.unlockpro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("co.windyapp.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockProCompatibility
diff --git a/main/app/revanced/patches/windyapp/misc/unlockpro/fingerprints/CheckProFingerprint.kt b/main/app/revanced/patches/windyapp/misc/unlockpro/fingerprints/CheckProFingerprint.kt
deleted file mode 100644
index 3dafd79eaf..0000000000
--- a/main/app/revanced/patches/windyapp/misc/unlockpro/fingerprints/CheckProFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.windyapp.misc.unlockpro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckProFingerprint : MethodFingerprint(
-    "I",
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("RawUserData;") && methodDef.name == "isPro"
-    }
-)
diff --git a/main/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt b/main/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt
deleted file mode 100644
index 5827a324b4..0000000000
--- a/main/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.windyapp.misc.unlockpro.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.windyapp.misc.unlockpro.annotations.UnlockProCompatibility
-import app.revanced.patches.windyapp.misc.unlockpro.fingerprints.CheckProFingerprint
-
-@Patch
-@Name("Unlock pro")
-@Description("Unlocks all pro features.")
-@UnlockProCompatibility
-class UnlockProPatch : BytecodePatch(
-    listOf(
-        CheckProFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-         val method = CheckProFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/16 v0, 0x1
-                return v0
-            """
-        )
-        
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/ad/general/annotation/HideAdsCompatibility.kt b/main/app/revanced/patches/youtube/ad/general/annotation/HideAdsCompatibility.kt
deleted file mode 100644
index 5f90c5019e..0000000000
--- a/main/app/revanced/patches/youtube/ad/general/annotation/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.ad.general.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
-
diff --git a/main/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt b/main/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
deleted file mode 100644
index db9b4045bb..0000000000
--- a/main/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package app.revanced.patches.youtube.ad.general.bytecode.patch
-
-import app.revanced.extensions.findMutableMethodOf
-import app.revanced.extensions.injectHideViewCall
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
-import app.revanced.patches.youtube.ad.general.annotation.HideAdsCompatibility
-import app.revanced.patches.youtube.ad.general.resource.patch.HideAdsResourcePatch
-import app.revanced.patches.youtube.ad.getpremium.bytecode.patch.HideGetPremiumPatch
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction31i
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-
-@Patch
-@DependsOn(
-    [
-        HideGetPremiumPatch::class,
-        HideAdsResourcePatch::class,
-        VerticalScrollPatch::class,
-        FixBackToExitGesturePatch::class
-    ]
-)
-@Name("Hide ads")
-@Description("Removes general ads.")
-@HideAdsCompatibility
-class HideAdsPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
-        context.classes.forEach { classDef ->
-            classDef.methods.forEach { method ->
-                with(method.implementation) {
-                    this?.instructions?.forEachIndexed { index, instruction ->
-                        if (instruction.opcode != org.jf.dexlib2.Opcode.CONST)
-                            return@forEachIndexed
-                        // Instruction to store the id adAttribution into a register
-                        if ((instruction as Instruction31i).wideLiteral != HideAdsResourcePatch.adAttributionId)
-                            return@forEachIndexed
-
-                        val insertIndex = index + 1
-
-                        // Call to get the view with the id adAttribution
-                        with(instructions.elementAt(insertIndex)) {
-                            if (opcode != org.jf.dexlib2.Opcode.INVOKE_VIRTUAL)
-                                return@forEachIndexed
-
-                            // Hide the view
-                            val viewRegister = (this as Instruction35c).registerC
-                            context.proxy(classDef)
-                                .mutableClass
-                                .findMutableMethodOf(method)
-                                .injectHideViewCall(
-                                    insertIndex,
-                                    viewRegister,
-                                    "Lapp/revanced/integrations/patches/components/AdsFilter;",
-                                    "hideAdAttributionView"
-                                )
-                        }
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt b/main/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
deleted file mode 100644
index b021d523ef..0000000000
--- a/main/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package app.revanced.patches.youtube.ad.general.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.ad.general.annotation.HideAdsCompatibility
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.PreferenceScreen
-
-@DependsOn(
-    [
-        LithoFilterPatch::class,
-        SettingsPatch::class,
-        ResourceMappingPatch::class
-    ]
-)
-@HideAdsCompatibility
-class HideAdsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        PreferenceScreen.ADS.addPreferences(
-            SwitchPreference(
-                "revanced_hide_general_ads",
-                StringResource("revanced_hide_general_ads_title", "Hide general ads"),
-                StringResource("revanced_hide_general_ads_summary_on", "General ads are hidden"),
-                StringResource("revanced_hide_general_ads_summary_off", "General ads are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_buttoned_ads",
-                StringResource("revanced_hide_buttoned_ads_title", "Hide buttoned ad"),
-                StringResource("revanced_hide_buttoned_ads_summary_on", "Buttoned ads are hidden"),
-                StringResource("revanced_hide_buttoned_ads_summary_off", "Buttoned ads are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_paid_content_ads",
-                StringResource("revanced_hide_paid_content_ads_title", "Hide paid content"),
-                StringResource("revanced_hide_paid_content_ads_summary_on", "Paid content is hidden"),
-                StringResource("revanced_hide_paid_content_ads_summary_off", "Paid content is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_self_sponsor_ads",
-                StringResource("revanced_hide_self_sponsor_ads_title", "Hide self sponsored cards"),
-                StringResource("revanced_hide_self_sponsor_ads_summary_on", "Self sponsored cards are hidden"),
-                StringResource("revanced_hide_self_sponsor_ads_summary_off", "Self sponsored cards are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_products_banner",
-                StringResource("revanced_hide_products_banner_title", "Hide banner to view products"),
-                StringResource("revanced_hide_products_banner_summary_on", "Banner is hidden"),
-                StringResource("revanced_hide_products_banner_summary_off", "Banner is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_web_search_results",
-                StringResource("revanced_hide_web_search_results_title", "Hide web search results"),
-                StringResource("revanced_hide_web_search_results_summary_on", "Web search results are hidden"),
-                StringResource("revanced_hide_web_search_results_summary_off", "Web search results are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_merchandise_banners",
-                StringResource("revanced_hide_merchandise_banners_title", "Hide merchandise banners"),
-                StringResource("revanced_hide_merchandise_banners_summary_on", "Merchandise banners are hidden"),
-                StringResource("revanced_hide_merchandise_banners_summary_off", "Merchandise banners are shown")
-            )
-        )
-
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        adAttributionId = ResourceMappingPatch.resourceMappings.single { it.name == "ad_attribution" }.id
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var adAttributionId: Long = -1
-
-        private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/AdsFilter;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/ad/getpremium/annotations/HideGetPremiumCompatibility.kt b/main/app/revanced/patches/youtube/ad/getpremium/annotations/HideGetPremiumCompatibility.kt
deleted file mode 100644
index f17ebada9e..0000000000
--- a/main/app/revanced/patches/youtube/ad/getpremium/annotations/HideGetPremiumCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.ad.getpremium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideGetPremiumCompatibility
diff --git a/main/app/revanced/patches/youtube/ad/getpremium/bytecode/fingerprints/GetPremiumViewFingerprint.kt b/main/app/revanced/patches/youtube/ad/getpremium/bytecode/fingerprints/GetPremiumViewFingerprint.kt
deleted file mode 100644
index 0f32e3e6a4..0000000000
--- a/main/app/revanced/patches/youtube/ad/getpremium/bytecode/fingerprints/GetPremiumViewFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.ad.getpremium.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object GetPremiumViewFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("I", "I"),
-    opcodes = listOf(
-        Opcode.ADD_INT_2ADDR,
-        Opcode.ADD_INT_2ADDR,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/apps/youtube/app/red/presenter/CompactYpcOfferModuleView;"
-                && methodDef.name == "onMeasure"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt b/main/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
deleted file mode 100644
index 1aed888953..0000000000
--- a/main/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package app.revanced.patches.youtube.ad.getpremium.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.ad.getpremium.annotations.HideGetPremiumCompatibility
-import app.revanced.patches.youtube.ad.getpremium.bytecode.fingerprints.GetPremiumViewFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide get premium")
-@HideGetPremiumCompatibility
-class HideGetPremiumPatch : BytecodePatch(listOf(GetPremiumViewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.ADS.addPreferences(
-            SwitchPreference(
-                "revanced_hide_get_premium",
-                StringResource(
-                    "revanced_hide_get_premium_title",
-                    "Hide YouTube premium advertisement"
-                ),
-                StringResource(
-                    "revanced_hide_get_premium_summary_on",
-                    "YouTube Premium advertisements under video player are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_get_premium_summary_off",
-                    "YouTube Premium advertisements under video player are shown"
-                )
-            )
-        )
-
-        GetPremiumViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val startIndex = it.scanResult.patternScanResult!!.startIndex
-                val measuredWidthRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
-                val measuredHeightInstruction = getInstruction<TwoRegisterInstruction>(startIndex + 1)
-
-                val measuredHeightRegister = measuredHeightInstruction.registerA
-                val tempRegister = measuredHeightInstruction.registerB
-
-                addInstructionsWithLabels(
-                    startIndex + 2,
-                    """
-                        # Override the internal measurement of the layout with zero values.
-                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->hideGetPremiumView()Z
-                        move-result v$tempRegister
-                        if-eqz v$tempRegister, :allow
-                        const/4 v$measuredWidthRegister, 0x0
-                        const/4 v$measuredHeightRegister, 0x0
-                        :allow
-                        nop
-                        # Layout width/height is then passed to a protected class method.
-                    """
-                )
-            }
-        } ?: return GetPremiumViewFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideGetPremiumPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt b/main/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
deleted file mode 100644
index 9226b6f44e..0000000000
--- a/main/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.ad.video.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class VideoAdsCompatibility
-
diff --git a/main/app/revanced/patches/youtube/ad/video/fingerprints/LoadVideoAdsFingerprint.kt b/main/app/revanced/patches/youtube/ad/video/fingerprints/LoadVideoAdsFingerprint.kt
deleted file mode 100644
index b5a4c70e90..0000000000
--- a/main/app/revanced/patches/youtube/ad/video/fingerprints/LoadVideoAdsFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.ad.video.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object LoadVideoAdsFingerprint : MethodFingerprint(
-    strings = listOf(
-        "TriggerBundle doesn't have the required metadata specified by the trigger ",
-        "Tried to enter slot with no assigned slotAdapter",
-        "Trying to enter a slot when a slot of same type and physical position is already active. Its status: ",
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt b/main/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
deleted file mode 100644
index b26d8b3ba6..0000000000
--- a/main/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package app.revanced.patches.youtube.ad.video.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.youtube.ad.video.fingerprints.LoadVideoAdsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Video ads")
-@Description("Removes ads in the video player.")
-@VideoAdsCompatibility
-class VideoAdsPatch : BytecodePatch(
-    listOf(
-        LoadVideoAdsFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.ADS.addPreferences(
-            SwitchPreference(
-                "revanced_hide_video_ads",
-                StringResource("revanced_hide_video_ads_title", "Hide video ads"),
-                StringResource("revanced_hide_video_ads_summary_on", "Video ads are hidden"),
-                StringResource("revanced_hide_video_ads_summary_off", "Video ads are shown")
-            )
-        )
-
-        val loadVideoAdsFingerprintMethod = LoadVideoAdsFingerprint.result!!.mutableMethod
-
-        loadVideoAdsFingerprintMethod.addInstructionsWithLabels(
-            0, """
-                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
-                move-result v0
-                if-nez v0, :show_video_ads
-                return-void
-            """,
-            ExternalLabel("show_video_ads", loadVideoAdsFingerprintMethod.getInstruction(0))
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt b/main/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
deleted file mode 100644
index 93058c8969..0000000000
--- a/main/app/revanced/patches/youtube/interaction/copyvideourl/annotation/CopyVideoUrlCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CopyVideoUrlCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt b/main/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
deleted file mode 100644
index a6db2560ce..0000000000
--- a/main/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.interaction.copyvideourl.annotation.CopyVideoUrlCompatibility
-import app.revanced.patches.youtube.interaction.copyvideourl.resource.patch.CopyVideoUrlResourcePatch
-import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-
-@Patch
-@Name("Copy video url")
-@Description("Adds buttons in player to copy video links.")
-@DependsOn([
-    CopyVideoUrlResourcePatch::class,
-    PlayerControlsBytecodePatch::class,
-    VideoInformationPatch::class
-])
-@CopyVideoUrlCompatibility
-class CopyVideoUrlBytecodePatch : BytecodePatch() {
-    private companion object {
-        const val INTEGRATIONS_PLAYER_PACKAGE = "Lapp/revanced/integrations/videoplayer"
-        val BUTTONS_DESCRIPTORS = listOf(
-            "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlButton;",
-            "$INTEGRATIONS_PLAYER_PACKAGE/CopyVideoUrlTimestampButton;"
-        )
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        // Initialize buttons and inject visibility control
-        BUTTONS_DESCRIPTORS.forEach { descriptor ->
-            PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
-            PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt b/main/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt
deleted file mode 100644
index 74565636b0..0000000000
--- a/main/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package app.revanced.patches.youtube.interaction.copyvideourl.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-
-@DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
-class CopyVideoUrlResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
-            PreferenceScreen(
-                "revanced_copy_video_url_preference_screen",
-                StringResource("revanced_copy_video_url_preference_screen_title", "Copy video URL settings"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_copy_video_url",
-                        StringResource("revanced_copy_video_url_title", "Show copy video URL button"),
-                        StringResource("revanced_copy_video_url_summary_on", "Button is shown. Tap to copy video URL. Tap and hold to copy video URL with timestamp"),
-                        StringResource("revanced_copy_video_url_summary_off", "Button is not shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_copy_video_url_timestamp",
-                        StringResource("revanced_copy_video_url_timestamp_title", "Show copy timestamp URL button"),
-                        StringResource("revanced_copy_video_url_timestamp_summary_on", "Button is shown.  Tap to copy video URL with timestamp. Tap and hold to copy video without timestamp"),
-                        StringResource("revanced_copy_video_url_timestamp_summary_off", "Button is not shown")
-                    )
-                ),
-                StringResource("revanced_copy_video_url_preference_screen_summary", "Settings related to copy URL buttons in video player")
-            )
-        )
-
-        context.copyResources("copyvideourl", ResourceUtils.ResourceGroup(
-            resourceDirectoryName = "drawable",
-            "revanced_yt_copy.xml",
-            "revanced_yt_copy_timestamp.xml"
-        ))
-
-        // merge strings
-        context.mergeStrings("copyvideourl/host/values/strings.xml")
-
-        BottomControlsResourcePatch.addControls("copyvideourl/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/downloads/annotation/ExternalDownloadsCompatibility.kt b/main/app/revanced/patches/youtube/interaction/downloads/annotation/ExternalDownloadsCompatibility.kt
deleted file mode 100644
index be32f73c86..0000000000
--- a/main/app/revanced/patches/youtube/interaction/downloads/annotation/ExternalDownloadsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ExternalDownloadsCompatibility
-
diff --git a/main/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt b/main/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt
deleted file mode 100644
index 1b7a82ac4a..0000000000
--- a/main/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.interaction.downloads.annotation.ExternalDownloadsCompatibility
-import app.revanced.patches.youtube.interaction.downloads.resource.patch.ExternalDownloadsResourcePatch
-import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-
-@Patch
-@Name("External downloads")
-@DependsOn([ExternalDownloadsResourcePatch::class, PlayerControlsBytecodePatch::class, VideoInformationPatch::class])
-@Description("Adds support to download and save YouTube videos using an external app.")
-@ExternalDownloadsCompatibility
-class ExternalDownloadsBytecodePatch : BytecodePatch() {
-    private companion object {
-        const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/videoplayer/ExternalDownloadButton;"
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        /*
-        initialize the control
-         */
-
-        PlayerControlsBytecodePatch.initializeControl(
-            "$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
-
-        /*
-         add code to change the visibility of the control
-         */
-
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall(
-            "$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt b/main/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt
deleted file mode 100644
index e50b8cc9fb..0000000000
--- a/main/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-
-@DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
-class ExternalDownloadsResourcePatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
-            PreferenceScreen(
-                "revanced_external_downloader_preference_screen",
-                StringResource("revanced_external_downloader_preference_screen_title", "External download settings"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_external_downloader",
-                        StringResource("revanced_external_downloader_title", "Show external download button"),
-                        StringResource("revanced_external_downloader_summary_on", "Download button shown in player"),
-                        StringResource("revanced_external_downloader_summary_off", "Download button not shown in player")
-                    ),
-                    TextPreference(
-                        "revanced_external_downloader_name",
-                        StringResource("revanced_external_downloader_name_title", "Downloader package name"),
-                        StringResource("revanced_external_downloader_name_summary", "Package name of your installed external downloader app, such as NewPipe or PowerTube"),
-                        InputType.TEXT
-                    )
-                ),
-                StringResource("revanced_external_downloader_preference_screen_summary", "Settings for using an external downloader")
-            )
-        )
-
-
-        // Copy strings
-        context.mergeStrings("downloads/host/values/strings.xml")
-
-        // Copy resources
-        context.copyResources("downloads", ResourceUtils.ResourceGroup("drawable", "revanced_yt_download_button.xml"))
-
-        // Add download button node
-        BottomControlsResourcePatch.addControls("downloads/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt b/main/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
deleted file mode 100644
index cd1b8ca071..0000000000
--- a/main/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SeekbarTappingCompatibility
-
diff --git a/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AccessibilityPlayerProgressTimeFingerprint.kt b/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AccessibilityPlayerProgressTimeFingerprint.kt
deleted file mode 100644
index 8b2f5243f9..0000000000
--- a/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AccessibilityPlayerProgressTimeFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.interaction.seekbar.patch.EnableSeekbarTappingResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object AccessibilityPlayerProgressTimeFingerprint : LiteralValueFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    literal = EnableSeekbarTappingResourcePatch.accessibilityPlayerProgressTime
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt b/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
deleted file mode 100644
index 3c8f3ed0b4..0000000000
--- a/main/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
-
-
-object SeekbarTappingFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        // Insert seekbar tapping instructions here.
-        Opcode.RETURN,
-        Opcode.INVOKE_VIRTUAL,
-    ),
-    customFingerprint = custom@{ methodDef, _ ->
-        if (methodDef.name != "onTouchEvent") return@custom false
-
-        methodDef.implementation!!.instructions.any { instruction ->
-            if (instruction.opcode != Opcode.CONST) return@any false
-
-            val literal = (instruction as NarrowLiteralInstruction).narrowLiteral
-
-            // onTouchEvent method contains a CONST instruction
-            // with this literal making it unique with the rest of the properties of this fingerprint.
-            literal == Integer.MAX_VALUE
-        }
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt b/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
deleted file mode 100644
index 51a6b89ff7..0000000000
--- a/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
-import app.revanced.patches.youtube.interaction.seekbar.fingerprints.AccessibilityPlayerProgressTimeFingerprint
-import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-@Patch
-@DependsOn([IntegrationsPatch::class, EnableSeekbarTappingResourcePatch::class])
-@Name("Seekbar tapping")
-@Description("Enables tap-to-seek on the seekbar of the video player.")
-@SeekbarTappingCompatibility
-class EnableSeekbarTappingPatch : BytecodePatch(
-    listOf(AccessibilityPlayerProgressTimeFingerprint, SeekbarTappingFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Find the required methods to tap the seekbar.
-        val seekbarTappingMethods =
-            AccessibilityPlayerProgressTimeFingerprint.result?.classDef?.methods?.let { methods ->
-                buildMap {
-                    // find the methods which tap the seekbar
-                    methods.forEach { method ->
-                        if (method.implementation == null) return@forEach
-
-                        val instructions = method.implementation!!.instructions
-
-                        // The method has more than 7 instructions.
-                        if (instructions.count() < 7) return@forEach
-
-                        // The 7th instruction has the opcode CONST_4.
-                        val instruction = instructions.elementAt(6)
-                        if (instruction.opcode != Opcode.CONST_4) return@forEach
-
-                        // the literal for this instruction has to be either 1 or 2.
-                        val literal = (instruction as NarrowLiteralInstruction).narrowLiteral
-
-                        // Based on the literal, determine which method is which.
-                        if (literal == 1) this["P"] = method
-                        if (literal == 2) this["O"] = method
-                    }
-                }
-            }
-
-        seekbarTappingMethods ?: return AccessibilityPlayerProgressTimeFingerprint.toErrorResult()
-
-        SeekbarTappingFingerprint.result?.let {
-            val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
-
-            it.mutableMethod.apply {
-                val thisInstanceRegister = getInstruction<Instruction35c>(insertIndex - 1).registerC
-
-                val freeRegister = 0
-                val xAxisRegister = 2
-
-                val pMethod = seekbarTappingMethods["P"]!!
-                val oMethod = seekbarTappingMethods["O"]!!
-
-                fun Method.toInvokeInstructionString() =
-                    "invoke-virtual { v$thisInstanceRegister, v$xAxisRegister }, $definingClass->$name(I)V"
-
-                addInstructionsWithLabels(
-                    insertIndex,
-                    """
-                        invoke-static { }, Lapp/revanced/integrations/patches/SeekbarTappingPatch;->seekbarTappingEnabled()Z
-                        move-result v$freeRegister
-                        if-eqz v$freeRegister, :disabled
-                        ${oMethod.toInvokeInstructionString()}
-                        ${pMethod.toInvokeInstructionString()}
-                    """,
-                    ExternalLabel("disabled", getInstruction(insertIndex))
-                )
-            }
-        } ?: return SeekbarTappingFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt b/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt
deleted file mode 100644
index 29c62c377d..0000000000
--- a/main/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class EnableSeekbarTappingResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
-            SwitchPreference(
-                "revanced_seekbar_tapping",
-                StringResource("revanced_seekbar_tapping_title", "Enable seekbar tapping"),
-                StringResource("revanced_seekbar_tapping_summary_on", "Seekbar tapping is enabled"),
-                StringResource("revanced_seekbar_tapping_summary_off", "Seekbar tapping is disabled")
-            )
-        )
-
-        accessibilityPlayerProgressTime = ResourceMappingPatch.resourceMappings.find {
-            it.name == "accessibility_player_progress_time"
-        }?.id ?: return PatchResultError("Failed to find required resource")
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var accessibilityPlayerProgressTime = -1L
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt b/main/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
deleted file mode 100644
index ad2ec1770d..0000000000
--- a/main/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SwipeControlsCompatibility
diff --git a/main/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt b/main/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
deleted file mode 100644
index ad6de5cc3b..0000000000
--- a/main/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object SwipeControlsHostActivityFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;"
-    }
-)
diff --git a/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt b/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
deleted file mode 100644
index 198fe8c479..0000000000
--- a/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch.bytecode
-
-import app.revanced.extensions.transformMethods
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.TypeUtil.traverseClassHierarchy
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
-import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
-import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.SwipeControlsHostActivityFingerprint
-import app.revanced.patches.youtube.interaction.swipecontrols.patch.resource.SwipeControlsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.immutable.ImmutableMethod
-
-@Patch
-@Name("Swipe controls")
-@Description("Adds volume and brightness swipe controls.")
-@SwipeControlsCompatibility
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        PlayerTypeHookPatch::class,
-        SwipeControlsResourcePatch::class
-    ]
-)
-class SwipeControlsBytecodePatch : BytecodePatch(
-    listOf(
-        WatchWhileActivityFingerprint,
-        SwipeControlsHostActivityFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val wrapperClass = SwipeControlsHostActivityFingerprint.result!!.mutableClass
-        val targetClass = WatchWhileActivityFingerprint.result!!.mutableClass
-
-        // inject the wrapper class from integrations into the class hierarchy of WatchWhileActivity
-        wrapperClass.setSuperClass(targetClass.superclass)
-        targetClass.setSuperClass(wrapperClass.type)
-
-        // ensure all classes and methods in the hierarchy are non-final, so we can override them in integrations
-        context.traverseClassHierarchy(targetClass) {
-            accessFlags = accessFlags and AccessFlags.FINAL.value.inv()
-            transformMethods {
-                ImmutableMethod(
-                    definingClass,
-                    name,
-                    parameters,
-                    returnType,
-                    accessFlags and AccessFlags.FINAL.value.inv(),
-                    annotations,
-                    hiddenApiRestrictions,
-                    implementation
-                ).toMutable()
-            }
-        }
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt b/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
deleted file mode 100644
index 5d67f72152..0000000000
--- a/main/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-
-@DependsOn([SettingsPatch::class])
-class SwipeControlsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
-            PreferenceScreen(
-                "revanced_swipe_controls_preference_screen",
-                StringResource("revanced_swipe_controls_preference_screen_title", "Swipe controls"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_swipe_brightness",
-                        StringResource("revanced_swipe_brightness_title", "Enable brightness gesture"),
-                        StringResource("revanced_swipe_brightness_summary_on", "Brightness swipe is enabled"),
-                        StringResource("revanced_swipe_brightness_summary_off", "Brightness swipe is disabled")
-                    ),
-                    SwitchPreference(
-                        "revanced_swipe_volume",
-                        StringResource("revanced_swipe_volume_title", "Enable volume gesture"),
-                        StringResource("revanced_swipe_volume_summary_on", "Volume swipe is enabled"),
-                        StringResource("revanced_swipe_volume_summary_off", "Volume swipe is disabled")
-                    ),
-                    SwitchPreference(
-                        "revanced_swipe_press_to_engage",
-                        StringResource("revanced_swipe_press_to_engage_title", "Enable press-to-swipe gesture"),
-                        StringResource("revanced_swipe_press_to_engage_summary_on", "Press-to-swipe is enabled"),
-                        StringResource("revanced_swipe_press_to_engage_summary_off", "Press-to-swipe is disabled")
-                    ),
-                    SwitchPreference(
-                        "revanced_swipe_haptic_feedback",
-                        StringResource("revanced_swipe_haptic_feedback_title", "Enable haptic feedback"),
-                        StringResource("revanced_swipe_haptic_feedback_summary_on", "Haptic feedback is enabled"),
-                        StringResource("revanced_swipe_haptic_feedback_summary_off", "Haptic feedback is disabled")
-                    ),
-                    SwitchPreference(
-                        "revanced_swipe_save_and_restore_brightness",
-                        StringResource("revanced_swipe_save_and_restore_brightness_title", "Save and restore brightness"),
-                        StringResource(
-                            "revanced_swipe_save_and_restore_brightness_summary_on",
-                            "Save and restore brightness when exiting or entering fullscreen"
-                        ),
-                        StringResource(
-                            "revanced_swipe_save_and_restore_brightness_summary_off",
-                            "Do not save and restore brightness when exiting or entering fullscreen"
-                        )
-                    ),
-                    TextPreference(
-                        "revanced_swipe_overlay_timeout",
-                        StringResource("revanced_swipe_overlay_timeout_title", "Swipe overlay timeout"),
-                        StringResource(
-                            "revanced_swipe_overlay_timeout_summary",
-                            "The amount of milliseconds the overlay is visible"
-                        ),
-                        InputType.NUMBER
-                    ),
-                    TextPreference(
-                        "revanced_swipe_text_overlay_size",
-                        StringResource("revanced_swipe_text_overlay_size_title", "Swipe overlay text size"),
-                        StringResource("revanced_swipe_text_overlay_size_summary", "The text size for swipe overlay"),
-                        InputType.NUMBER
-                    ),
-                    TextPreference(
-                        "revanced_swipe_overlay_background_alpha",
-                        StringResource("revanced_swipe_overlay_background_alpha_title", "Swipe background visibility"),
-                        StringResource(
-                            "revanced_swipe_overlay_background_alpha_summary",
-                            "The visibility of swipe overlay background"
-                        ),
-                        InputType.NUMBER
-                    ),
-                    TextPreference(
-                        "revanced_swipe_threshold",
-                        StringResource("revanced_swipe_threshold_title", "Swipe magnitude threshold"),
-                        StringResource(
-                            "revanced_swipe_threshold_summary",
-                            "The amount of threshold for swipe to occur"
-                        ),
-                        InputType.NUMBER
-                    )
-                ),
-                StringResource("revanced_swipe_controls_preference_screen_summary","Control volume and brightness")
-            )
-        )
-
-        context.copyResources(
-            "swipecontrols",
-            ResourceUtils.ResourceGroup(
-                "drawable",
-                "ic_sc_brightness_auto.xml",
-                "ic_sc_brightness_manual.xml",
-                "ic_sc_volume_mute.xml",
-                "ic_sc_volume_normal.xml"
-            )
-        )
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt b/main/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
deleted file mode 100644
index 81fb60d327..0000000000
--- a/main/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.autocaptions.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AutoCaptionsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt b/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
deleted file mode 100644
index 1b1cd10883..0000000000
--- a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.youtube.layout.autocaptions.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object StartVideoInformerFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IF_EQZ,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.GOTO,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt b/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
deleted file mode 100644
index 48d98f4f39..0000000000
--- a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package app.revanced.patches.youtube.layout.autocaptions.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SubtitleButtonControllerFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Lcom/google/android/libraries/youtube/player/subtitles/model/SubtitleTrack;"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.RETURN_VOID,
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("SubtitleButtonController;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt b/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
deleted file mode 100644
index 66ac4f6172..0000000000
--- a/main/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package app.revanced.patches.youtube.layout.autocaptions.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SubtitleTrackFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN,
-    ),
-    strings = listOf("DISABLE_CAPTIONS_OPTION"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("SubtitleTrack;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt b/main/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
deleted file mode 100644
index ae4048adae..0000000000
--- a/main/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package app.revanced.patches.youtube.layout.autocaptions.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleButtonControllerFingerprint
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleTrackFingerprint
-import app.revanced.patches.youtube.layout.buttons.captions.annotations.HideCaptionsButtonCompatibility
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Disable auto captions")
-@Description("Disable forced captions from being automatically enabled.")
-@HideCaptionsButtonCompatibility
-class AutoCaptionsPatch : BytecodePatch(
-    listOf(
-        StartVideoInformerFingerprint, SubtitleButtonControllerFingerprint, SubtitleTrackFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_auto_captions",
-                StringResource("revanced_auto_captions_title", "Disable auto captions"),
-                StringResource("revanced_auto_captions_summary_on", "Auto captions are disabled"),
-                StringResource("revanced_auto_captions_summary_off", "Auto captions are enabled")
-            )
-        )
-
-        val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
-
-        startVideoInformerMethod.addInstructions(
-            0, """
-            const/4 v0, 0x0
-            sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
-        """
-        )
-
-        val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
-
-        subtitleButtonControllerMethod.addInstructions(
-            0, """
-            const/4 v0, 0x1
-            sput-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
-        """
-        )
-
-        val subtitleTrackMethod = SubtitleTrackFingerprint.result!!.mutableMethod
-
-        subtitleTrackMethod.addInstructionsWithLabels(
-            0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->autoCaptionsEnabled()Z
-            move-result v0
-            if-eqz v0, :auto_captions_enabled
-            sget-boolean v0, Lapp/revanced/integrations/patches/DisableAutoCaptionsPatch;->captionsButtonDisabled:Z
-            if-nez v0, :auto_captions_enabled
-            const/4 v0, 0x1
-            return v0
-            :auto_captions_enabled
-            nop
-        """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt b/main/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
deleted file mode 100644
index c021de553d..0000000000
--- a/main/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.branding.header.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PremiumHeadingCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt b/main/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt
deleted file mode 100644
index 74c52a4bc8..0000000000
--- a/main/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package app.revanced.patches.youtube.layout.branding.header.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.branding.header.annotations.PremiumHeadingCompatibility
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-import kotlin.io.path.exists
-
-@Patch
-@Name("Premium heading")
-@Description("Shows premium branding on the home screen.")
-@PremiumHeadingCompatibility
-class PremiumHeadingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        val resDirectory = context["res"]
-        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
-
-        val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
-        val modes = arrayOf("light", "dark")
-
-        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi").forEach { size ->
-            val headingDirectory = resDirectory.resolve("drawable-$size")
-            modes.forEach { mode ->
-                val fromPath = headingDirectory.resolve("${original}_$mode.png").toPath()
-                val toPath = headingDirectory.resolve("${replacement}_$mode.png").toPath()
-
-                if (!fromPath.exists())
-                    return PatchResultError("The file $fromPath does not exist in the resources. Therefore, this patch can not succeed.")
-                Files.copy(
-                    fromPath,
-                    toPath,
-                    StandardCopyOption.REPLACE_EXISTING
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt b/main/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
deleted file mode 100644
index ec6b73b27b..0000000000
--- a/main/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.branding.icon.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CustomBrandingCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt b/main/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
deleted file mode 100644
index cc01995ae5..0000000000
--- a/main/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package app.revanced.patches.youtube.layout.branding.icon.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import java.io.File
-import java.nio.file.Files
-
-@Patch
-@Name("Custom branding")
-@Description("Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).")
-@CustomBrandingCompatibility
-class CustomBrandingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        fun copyResources(resourceGroups: List<ResourceUtils.ResourceGroup>) {
-            iconPath?.let { iconPathString ->
-                val iconPath = File(iconPathString)
-                val resourceDirectory = context["res"]
-
-                resourceGroups.forEach { group ->
-                    val fromDirectory = iconPath.resolve(group.resourceDirectoryName)
-                    val toDirectory = resourceDirectory.resolve(group.resourceDirectoryName)
-
-                    group.resources.forEach { iconFileName ->
-                        Files.write(
-                            toDirectory.resolve(iconFileName).toPath(),
-                            fromDirectory.resolve(iconFileName).readBytes()
-                        )
-                    }
-                }
-            } ?: resourceGroups.forEach { context.copyResources("branding", it) }
-        }
-
-        val iconResourceFileNames = arrayOf(
-            "adaptiveproduct_youtube_background_color_108",
-            "adaptiveproduct_youtube_foreground_color_108",
-            "ic_launcher",
-            "ic_launcher_round"
-        ).map { "$it.png" }.toTypedArray()
-
-        fun createGroup(directory: String) = ResourceUtils.ResourceGroup(
-            directory, *iconResourceFileNames
-        )
-
-        // change the app icon
-        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi")
-            .map { "mipmap-$it" }
-            .map(::createGroup)
-            .let(::copyResources)
-
-        // change the name of the app
-        val manifest = context["AndroidManifest.xml"]
-        manifest.writeText(
-            manifest.readText()
-                .replace(
-                    "android:label=\"@string/application_name",
-                    "android:label=\"$appName"
-                )
-        )
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        private var appName: String? by option(
-            PatchOption.StringOption(
-                key = "appName",
-                default = "YouTube ReVanced",
-                title = "Application Name",
-                description = "The name of the application it will show on your home screen.",
-                required = true
-            )
-        )
-
-        private var iconPath: String? by option(
-            PatchOption.StringOption(
-                key = "iconPath",
-                default = null,
-                title = "App Icon Path",
-                description = "A path containing mipmap resource folders with icons."
-            )
-        )
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
deleted file mode 100644
index 1c521c5475..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/action/annotations/HideButtonsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.action.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideButtonsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
deleted file mode 100644
index 855d4ecc8b..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.action.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.action.annotations.HideButtonsCompatibility
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([ResourceMappingPatch::class, LithoFilterPatch::class])
-@Name("Hide video action buttons")
-@Description("Adds the options to hide action buttons under a video.")
-@HideButtonsCompatibility
-class HideButtonsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_hide_buttons_preference_screen",
-                StringResource("revanced_hide_buttons_preference_screen_title", "Hide action buttons"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_like_dislike_button",
-                        StringResource("revanced_hide_like_dislike_button_title", "Hide like and dislike buttons"),
-                        StringResource("revanced_hide_like_dislike_button_summary_on", "Like and dislike buttons are hidden"),
-                        StringResource("revanced_hide_like_dislike_button_summary_off", "Like and dislike buttons are shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_download_button",
-                        StringResource("revanced_hide_download_button_title", "Hide download button"),
-                        StringResource("revanced_hide_download_button_summary_on", "Download button is hidden"),
-                        StringResource("revanced_hide_download_button_summary_off", "Download button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_playlist_button",
-                        StringResource("revanced_hide_playlist_button_title", "Hide playlist button"),
-                        StringResource("revanced_hide_playlist_button_summary_on", "Playlist button is hidden"),
-                        StringResource("revanced_hide_playlist_button_summary_off", "Playlist button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_clip_button",
-                        StringResource("revanced_hide_clip_button_title", "Hide clip button"),
-                        StringResource("revanced_hide_clip_button_summary_on", "Clip button is hidden"),
-                        StringResource("revanced_hide_clip_button_summary_off", "Clip button is shown"),
-                        StringResource("revanced_hide_clip_button_user_dialog_message",
-                            "Hiding the clip button might not work reliably. In the case it does not work, it can only be hidden by enabling \\'Hide all other action buttons\\'")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_action_buttons",
-                        StringResource("revanced_hide_action_buttons_title", "Hide all other action buttons"),
-                        StringResource("revanced_hide_action_buttons_summary_on", "Share, remix, thanks, shop, live chat buttons are hidden"),
-                        StringResource("revanced_hide_action_buttons_summary_off", "Share, remix, thanks, shop, live chat buttons are shown")
-                    )
-                ),
-                StringResource("revanced_hide_buttons_preference_screen_summary", "Hide or show buttons under videos")
-            )
-        )
-
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/ButtonsFilter;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
deleted file mode 100644
index bb95ff0381..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/autoplay/annotations/AutoplayButtonCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.autoplay.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AutoplayButtonCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/buttons/autoplay/fingerprints/LayoutConstructorFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/autoplay/fingerprints/LayoutConstructorFingerprint.kt
deleted file mode 100644
index 92d33ce317..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/autoplay/fingerprints/LayoutConstructorFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object LayoutConstructorFingerprint : MethodFingerprint(
-    strings = listOf("1.0x"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
deleted file mode 100644
index 39ae7b3c52..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.autoplay.patch
-
-import app.revanced.extensions.findIndexForIdResource
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.autoplay.annotations.AutoplayButtonCompatibility
-import app.revanced.patches.youtube.layout.buttons.autoplay.fingerprints.LayoutConstructorFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingPatch::class])
-@Name("Hide autoplay button")
-@Description("Hides the autoplay button in the video player.")
-@AutoplayButtonCompatibility
-class HideAutoplayButtonPatch : BytecodePatch(
-    listOf(LayoutConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_autoplay_button",
-                StringResource("revanced_hide_autoplay_button_title", "Hide autoplay button"),
-                StringResource("revanced_hide_autoplay_button_summary_on", "Autoplay button is hidden"),
-                StringResource("revanced_hide_autoplay_button_summary_off", "Autoplay button is shown")
-            ),
-        )
-
-        LayoutConstructorFingerprint.result?.mutableMethod?.apply {
-            val layoutGenMethodInstructions = implementation!!.instructions
-
-            // resolve the offsets of where to insert the branch instructions and ...
-            val insertIndex = findIndexForIdResource("autonav_preview_stub")
-
-            // where to branch away
-            val branchIndex =
-                layoutGenMethodInstructions.subList(insertIndex + 1, layoutGenMethodInstructions.size - 1)
-                    .indexOfFirst {
-                        ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "addOnLayoutChangeListener"
-                    } + 2
-
-            val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction
-
-            // can be clobbered because this register is overwritten after the injected code
-            val clobberRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
-
-            addInstructionsWithLabels(
-                insertIndex,
-                """
-                    invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
-                    move-result v$clobberRegister
-                    if-eqz v$clobberRegister, :hidden
-                """,
-                ExternalLabel("hidden", jumpInstruction)
-            )
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
deleted file mode 100644
index fc1e112a0a..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/captions/annotations/HideCaptionsButtonCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.captions.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideCaptionsButtonCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt
deleted file mode 100644
index 62452075d5..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.captions.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.autocaptions.fingerprints.SubtitleButtonControllerFingerprint
-import app.revanced.patches.youtube.layout.buttons.captions.annotations.HideCaptionsButtonCompatibility
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide captions button")
-@Description("Hides the captions button on video player.")
-@HideCaptionsButtonCompatibility
-class HideCaptionsButtonPatch : BytecodePatch(listOf(
-    SubtitleButtonControllerFingerprint,
-)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_captions_button",
-                StringResource("revanced_hide_captions_button_title", "Hide captions button"),
-                StringResource("revanced_hide_captions_button_summary_on", "Captions button is hidden"),
-                StringResource("revanced_hide_captions_button_summary_off", "Captions button is shown")
-            )
-        )
-
-        val subtitleButtonControllerMethod = SubtitleButtonControllerFingerprint.result!!.mutableMethod
-
-        // Due to previously applied patches, scanResult index cannot be used in this context
-        val igetBooleanIndex = subtitleButtonControllerMethod.implementation!!.instructions.indexOfFirst {
-            it.opcode == Opcode.IGET_BOOLEAN
-        }
-
-        subtitleButtonControllerMethod.addInstruction(
-            igetBooleanIndex + 1,
-            """
-                invoke-static {v0}, Lapp/revanced/integrations/patches/HideCaptionsButtonPatch;->hideCaptionsButton(Landroid/widget/ImageView;)V
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/buttons/cast/annotations/CastPatchCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/cast/annotations/CastPatchCompatibility.kt
deleted file mode 100644
index 8aace10288..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/cast/annotations/CastPatchCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.cast.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CastButtonCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt
deleted file mode 100644
index 966dfd7df0..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.cast.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.cast.annotations.CastButtonCompatibility
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide cast button")
-@Description("Hides the cast button in the video player.")
-@CastButtonCompatibility
-class HideCastButtonPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_cast_button",
-                StringResource("revanced_hide_cast_button_title", "Hide cast button"),
-                StringResource("revanced_hide_cast_button_summary_on", "Cast button is hidden"),
-                StringResource("revanced_hide_cast_button_summary_off", "Cast button is shown")
-            )
-        )
-
-        val buttonClass = context.findClass("MediaRouteButton")
-            ?: return PatchResultError("MediaRouteButton class not found.")
-
-        buttonClass.mutableClass.methods.find { it.name == "setVisibility" }?.apply {
-            addInstructions(
-                0,
-                """
-                    invoke-static {p1}, Lapp/revanced/integrations/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
-                    move-result p1
-                """
-            )
-        } ?: return PatchResultError("setVisibility method not found.")
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/annotations/NavigationButtonsCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/annotations/NavigationButtonsCompatibility.kt
deleted file mode 100644
index 393ac1366b..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/annotations/NavigationButtonsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class NavigationButtonsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/AddCreateButtonViewFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/AddCreateButtonViewFingerprint.kt
deleted file mode 100644
index 5e205ea49e..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/AddCreateButtonViewFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-internal const val ANDROID_AUTOMOTIVE_STRING = "Android Automotive"
-
-object AddCreateButtonViewFingerprint : MethodFingerprint(
-    strings = listOf(
-        "Android Wear",
-        ANDROID_AUTOMOTIVE_STRING,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/InitializeButtonsFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/InitializeButtonsFingerprint.kt
deleted file mode 100644
index 1b22411535..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/InitializeButtonsFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.buttons.navigation.patch.ResolvePivotBarFingerprintsPatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object InitializeButtonsFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf(),
-    literal = ResolvePivotBarFingerprintsPatch.imageOnlyTabResourceId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarButtonsViewFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarButtonsViewFingerprint.kt
deleted file mode 100644
index 82fd7e1c63..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarButtonsViewFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object PivotBarButtonsViewFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL_RANGE,
-        Opcode.MOVE_RESULT_OBJECT, // target reference
-        Opcode.GOTO,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarConstructorFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarConstructorFingerprint.kt
deleted file mode 100644
index 4500faf65e..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarConstructorFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object PivotBarConstructorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    strings = listOf("com.google.android.apps.youtube.app.endpoint.flags")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarCreateButtonViewFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarCreateButtonViewFingerprint.kt
deleted file mode 100644
index 21635ef0f2..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarCreateButtonViewFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarEnumFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarEnumFingerprint.kt
deleted file mode 100644
index af6bb087ef..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/PivotBarEnumFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object PivotBarEnumFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_NEZ, // target reference
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
deleted file mode 100644
index ef8fd1fa0e..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.navigation.annotations.NavigationButtonsCompatibility
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.*
-import app.revanced.patches.youtube.layout.buttons.navigation.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
-import app.revanced.patches.youtube.layout.buttons.navigation.utils.InjectionUtils.injectHook
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        SettingsPatch::class,
-        ResolvePivotBarFingerprintsPatch::class,
-    ]
-)
-@Name("Navigation buttons")
-@Description("Adds options to hide or change navigation buttons.")
-@NavigationButtonsCompatibility
-class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_navigation_buttons_preference_screen",
-                StringResource("revanced_navigation_buttons_preference_screen_title", "Navigation buttons"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_home_button",
-                        StringResource("revanced_hide_home_button_title", "Hide home button"),
-                        StringResource("revanced_hide_home_button_summary_on", "Home button is hidden"),
-                        StringResource("revanced_hide_home_button_summary_off", "Home button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_button",
-                        StringResource("revanced_hide_shorts_button_title", "Hide Shorts button"),
-                        StringResource("revanced_hide_shorts_button_summary_on", "Shorts button is hidden"),
-                        StringResource("revanced_hide_shorts_button_summary_off", "Shorts button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_subscriptions_button",
-                        StringResource("revanced_hide_subscriptions_button_title", "Hide subscriptions button"),
-                        StringResource(
-                            "revanced_hide_subscriptions_button_summary_on",
-                            "Home subscriptions is hidden"
-                        ),
-                        StringResource("revanced_hide_subscriptions_button_summary_off", "Home subscriptions is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_create_button",
-                        StringResource("revanced_hide_create_button_title", "Hide create button"),
-                        StringResource("revanced_hide_create_button_summary_on", "Create button is hidden"),
-                        StringResource("revanced_hide_create_button_summary_off", "Create button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_switch_create_with_notifications_button",
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_title",
-                            "Switch create with notifications button"
-                        ),
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_summary_on",
-                            "Create button is switched with notifications"
-                        ),
-                        StringResource(
-                            "revanced_switch_create_with_notifications_button_summary_off",
-                            "Create button is not switched with notifications"
-                        ),
-                    ),
-                ),
-            )
-        )
-
-        /*
-         * Resolve fingerprints
-         */
-
-        val initializeButtonsResult = InitializeButtonsFingerprint.result!!
-
-        val fingerprintResults =
-            arrayOf(PivotBarEnumFingerprint, PivotBarButtonsViewFingerprint)
-                .onEach {
-                    if (!it.resolve(
-                            context,
-                            initializeButtonsResult.mutableMethod,
-                            initializeButtonsResult.mutableClass
-                        )
-                    )
-                        return it.toErrorResult()
-                }
-                .map { it.result!!.scanResult.patternScanResult!! }
-
-
-        val enumScanResult = fingerprintResults[0]
-        val buttonViewResult = fingerprintResults[1]
-
-        val enumHookInsertIndex = enumScanResult.startIndex + 2
-        val buttonHookInsertIndex = buttonViewResult.endIndex
-
-        /*
-         * Inject hooks
-         */
-
-        val enumHook = "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, " +
-                "$INTEGRATIONS_CLASS_DESCRIPTOR->lastNavigationButton:Ljava/lang/Enum;"
-        val buttonHook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
-                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideButton(Landroid/view/View;)V"
-
-        // Inject bottom to top to not mess up the indices
-        mapOf(
-            buttonHook to buttonHookInsertIndex,
-            enumHook to enumHookInsertIndex
-        ).forEach { (hook, insertIndex) ->
-            initializeButtonsResult.mutableMethod.injectHook(hook, insertIndex)
-        }
-
-        /*
-         * Hide create or switch it with notifications buttons.
-         */
-
-        AddCreateButtonViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val stringIndex = it.scanResult.stringsScanResult!!.matches.find {
-                        match -> match.string == ANDROID_AUTOMOTIVE_STRING
-                }!!.index
-
-                val conditionalCheckIndex = stringIndex - 1
-                val conditionRegister = getInstruction<OneRegisterInstruction>(conditionalCheckIndex).registerA
-
-                addInstructions(
-                    conditionalCheckIndex,
-                    """
-                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->switchCreateWithNotificationButton()Z
-                        move-result v$conditionRegister
-                    """
-                )
-            }
-        } ?: return AddCreateButtonViewFingerprint.toErrorResult()
-
-        /*
-         * Resolve fingerprints
-         */
-
-        InitializeButtonsFingerprint.result!!.let {
-            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
-                return PivotBarCreateButtonViewFingerprint.toErrorResult()
-        }
-
-        PivotBarCreateButtonViewFingerprint.result!!.apply {
-            val insertIndex = mutableMethod.implementation!!.instructions.let {
-                val scanStart = scanResult.patternScanResult!!.endIndex
-
-                scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction ->
-                    instruction.opcode == Opcode.INVOKE_STATIC
-                }
-            }
-
-            /*
-             * Inject hooks
-             */
-            val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
-                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
-
-            mutableMethod.injectHook(hook, insertIndex)
-        }
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/NavigationButtonsPatch;"
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt
deleted file mode 100644
index 74f89732c9..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.InitializeButtonsFingerprint
-import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.PivotBarConstructorFingerprint
-
-@DependsOn([ResourceMappingPatch::class])
-@Description("Resolves necessary fingerprints.")
-class ResolvePivotBarFingerprintsPatch : BytecodePatch(
-    listOf(PivotBarConstructorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // imageOnlyTabResourceId is used in InitializeButtonsFingerprint fingerprint
-        ResourceMappingPatch.resourceMappings.find { it.type == "layout" && it.name == "image_only_tab" }
-            ?.let { imageOnlyTabResourceId = it.id } ?: return PatchResultError("Failed to find resource")
-
-        PivotBarConstructorFingerprint.result?.let {
-            // Resolve InitializeButtonsFingerprint on the class of the method
-            // which PivotBarConstructorFingerprint resolved to
-            if (!InitializeButtonsFingerprint.resolve(
-                    context,
-                    it.classDef
-                )
-            ) return InitializeButtonsFingerprint.toErrorResult()
-        } ?: return PivotBarConstructorFingerprint.toErrorResult()
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var imageOnlyTabResourceId: Long = -1
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt b/main/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt
deleted file mode 100644
index 4b0c9f4ca7..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.navigation.utils
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.Opcode.MOVE_RESULT_OBJECT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-internal object InjectionUtils {
-    const val REGISTER_TEMPLATE_REPLACEMENT: String = "REGISTER_INDEX"
-
-    /**
-     * Injects an instruction into insertIndex of the hook.
-     * @param hook The hook to insert.
-     * @param insertIndex The index to insert the instruction at.
-     * [MOVE_RESULT_OBJECT] has to be the previous instruction before [insertIndex].
-     */
-    fun MutableMethod.injectHook(hook: String, insertIndex: Int) {
-        val injectTarget = this
-
-        // Register to pass to the hook
-        val registerIndex = insertIndex - 1 // MOVE_RESULT_OBJECT is always the previous instruction
-        val register = injectTarget.getInstruction<OneRegisterInstruction>(registerIndex).registerA
-
-        injectTarget.addInstruction(
-            insertIndex,
-            hook.replace("REGISTER_INDEX", register.toString()),
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/player/hide/annotations/HidePlayerButtonsCompatibility.kt b/main/app/revanced/patches/youtube/layout/buttons/player/hide/annotations/HidePlayerButtonsCompatibility.kt
deleted file mode 100644
index 15330096ca..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/player/hide/annotations/HidePlayerButtonsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.player.hide.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HidePlayerButtonsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt b/main/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt
deleted file mode 100644
index bf9d48e44d..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object PlayerControlsVisibilityModelFingerprint : MethodFingerprint(
-    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE),
-    strings = listOf("Missing required properties:", "hasNext", "hasPrevious")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt b/main/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
deleted file mode 100644
index 5c90712952..0000000000
--- a/main/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.player.hide.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.player.hide.annotations.HidePlayerButtonsCompatibility
-import app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints.PlayerControlsVisibilityModelFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction3rc
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide player buttons")
-@Description("Adds the option to hide video player previous and next buttons.")
-@HidePlayerButtonsCompatibility
-class HidePlayerButtonsPatch : BytecodePatch(
-    listOf(PlayerControlsVisibilityModelFingerprint)
-) {
-    private object ParameterOffsets {
-        const val HAS_NEXT = 5
-        const val HAS_PREVIOUS = 6
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_player_buttons",
-                StringResource(
-                    "revanced_hide_player_buttons_title",
-                    "Hide previous & next video buttons"
-                ),
-                StringResource(
-                    "revanced_hide_player_buttons_summary_on",
-                    "Buttons are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_player_buttons_summary_off",
-                    "Buttons are shown"
-                )
-            )
-        )
-
-        PlayerControlsVisibilityModelFingerprint.result?.apply {
-            val callIndex = scanResult.patternScanResult!!.endIndex
-            val callInstruction = mutableMethod.getInstruction<Instruction3rc>(callIndex)
-
-            // overriding this parameter register hides the previous and next buttons
-            val hasNextParameterRegister = callInstruction.startRegister + ParameterOffsets.HAS_NEXT
-            val hasPreviousParameterRegister = callInstruction.startRegister + ParameterOffsets.HAS_PREVIOUS
-
-            mutableMethod.addInstructions(
-                callIndex,
-                """
-                    invoke-static { v$hasNextParameterRegister }, Lapp/revanced/integrations/patches/HidePlayerButtonsPatch;->previousOrNextButtonIsVisible(Z)Z
-                    move-result v$hasNextParameterRegister
-                    
-                    invoke-static { v$hasPreviousParameterRegister }, Lapp/revanced/integrations/patches/HidePlayerButtonsPatch;->previousOrNextButtonIsVisible(Z)Z
-                    move-result v$hasPreviousParameterRegister
-                """
-            )
-        } ?: return PlayerControlsVisibilityModelFingerprint.toErrorResult()
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
deleted file mode 100644
index 889695eaab..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/albumcards/annotations/AlbumCardsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.albumcards.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AlbumCardsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/fingerprints/AlbumCardsFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/fingerprints/AlbumCardsFingerprint.kt
deleted file mode 100644
index 6d8cad5c35..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/fingerprints/AlbumCardsFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.albumcards.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.albumcards.resource.patch.AlbumCardsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object AlbumCardsFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    ),
-    literal = AlbumCardsResourcePatch.albumCardId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
deleted file mode 100644
index e4322b9e1b..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.albumcards.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.albumcards.annotations.AlbumCardsCompatibility
-import app.revanced.patches.youtube.layout.hide.albumcards.bytecode.fingerprints.AlbumCardsFingerprint
-import app.revanced.patches.youtube.layout.hide.albumcards.resource.patch.AlbumCardsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, AlbumCardsResourcePatch::class])
-@Name("Hide album cards")
-@Description("Hides the album cards below the artist description.")
-@AlbumCardsCompatibility
-class AlbumCardsPatch : BytecodePatch(
-    listOf(
-        AlbumCardsFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        AlbumCardsFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val checkCastAnchorIndex = it.scanResult.patternScanResult!!.endIndex
-                val insertIndex = checkCastAnchorIndex + 1
-
-                val albumCardViewRegister = getInstruction<OneRegisterInstruction>(checkCastAnchorIndex).registerA
-
-                addInstruction(
-                    insertIndex,
-                    "invoke-static {v$albumCardViewRegister}, " +
-                            "Lapp/revanced/integrations/patches/HideAlbumCardsPatch;" +
-                            "->" +
-                            "hideAlbumCard(Landroid/view/View;)V"
-                )
-            }
-        } ?: return AlbumCardsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt
deleted file mode 100644
index 3c3359f3eb..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.albumcards.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class AlbumCardsResourcePatch : ResourcePatch {
-    companion object {
-        internal var albumCardId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_album_cards",
-                StringResource("revanced_hide_album_cards_title", "Hide album cards"),
-                StringResource("revanced_hide_album_cards_summary_on", "Album cards are hidden"),
-                StringResource("revanced_hide_album_cards_summary_off", "Album cards are shown")
-            )
-        )
-
-        albumCardId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "album_card"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
deleted file mode 100644
index 635820ab5b..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/breakingnews/annotations/BreakingNewsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class BreakingNewsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/fingerprints/BreakingNewsFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/fingerprints/BreakingNewsFingerprint.kt
deleted file mode 100644
index 16ae7019d4..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/fingerprints/BreakingNewsFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.breakingnews.resource.patch.BreakingNewsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object BreakingNewsFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT,
-    ),
-    literal = BreakingNewsResourcePatch.horizontalCardListId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
deleted file mode 100644
index c9ababc1f7..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.breakingnews.annotations.BreakingNewsCompatibility
-import app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.fingerprints.BreakingNewsFingerprint
-import app.revanced.patches.youtube.layout.hide.breakingnews.resource.patch.BreakingNewsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, BreakingNewsResourcePatch::class])
-@Name("Hide breaking news shelf")
-@Description("Hides the breaking news shelf on the homepage tab.")
-@BreakingNewsCompatibility
-class BreakingNewsPatch : BytecodePatch(
-    listOf(BreakingNewsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        BreakingNewsFingerprint.result?.let {
-            val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
-            val moveResultIndex = insertIndex - 1
-
-            it.mutableMethod.apply {
-                val breakingNewsViewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-
-                addInstruction(
-                    insertIndex,
-                    """
-                        invoke-static {v$breakingNewsViewRegister}, 
-                        Lapp/revanced/integrations/patches/HideBreakingNewsPatch;
-                        ->
-                        hideBreakingNews(Landroid/view/View;)V
-                    """
-                )
-            }
-
-        } ?: return BreakingNewsFingerprint.toErrorResult()
-
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt
deleted file mode 100644
index 9a9235a6f8..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class BreakingNewsResourcePatch : ResourcePatch {
-    companion object {
-        internal var horizontalCardListId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_breaking_news",
-                StringResource("revanced_hide_breaking_news_title", "Hide breaking news"),
-                StringResource("revanced_hide_breaking_news_summary_on", "Breaking news are hidden"),
-                StringResource("revanced_hide_breaking_news_summary_off", "Breaking news are shown")
-            )
-        )
-
-        horizontalCardListId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "horizontal_card_list"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/comments/annotations/HideCommentsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/comments/annotations/HideCommentsCompatibility.kt
deleted file mode 100644
index 6d8b3b3e3d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/comments/annotations/HideCommentsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.comments.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideCommentsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt
deleted file mode 100644
index cbee512211..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.comments.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.comments.annotations.HideCommentsCompatibility
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@Name("Comments")
-@Description("Hides components related to comments.")
-@HideCommentsCompatibility
-@DependsOn([SettingsPatch::class, LithoFilterPatch::class])
-class CommentsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-        
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_comments_preference_screen",
-                StringResource("revanced_comments_preference_screen_title", "Comments"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_comments_section",
-                        StringResource("revanced_hide_comments_section_title", "Hide comments section"),
-                        StringResource("revanced_hide_comments_section_summary_on", "Comment section is hidden"),
-                        StringResource("revanced_hide_comments_section_summary_off", "Comment section is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_preview_comment",
-                        StringResource("revanced_hide_preview_comment_title", "Hide preview comment"),
-                        StringResource("revanced_hide_preview_comment_on", "Preview comment is hidden"),
-                        StringResource("revanced_hide_preview_comment_off", "Preview comment is shown")
-                    )
-                ),
-                StringResource("revanced_comments_preference_screen_summary", "Manage the visibility of comments section components")
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-    
-    private companion object {
-        const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/CommentsFilter;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt
deleted file mode 100644
index fe6894aa3a..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.crowdfundingbox.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CrowdfundingBoxCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/fingerprints/CrowdfundingBoxFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/fingerprints/CrowdfundingBoxFingerprint.kt
deleted file mode 100644
index 30dc121c3d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/fingerprints/CrowdfundingBoxFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.crowdfundingbox.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.crowdfundingbox.resource.patch.CrowdfundingBoxResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object CrowdfundingBoxFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT,
-    ),
-    literal = CrowdfundingBoxResourcePatch.crowdfundingBoxId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt b/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
deleted file mode 100644
index df3d6d1fd4..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.crowdfundingbox.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.crowdfundingbox.annotations.CrowdfundingBoxCompatibility
-import app.revanced.patches.youtube.layout.hide.crowdfundingbox.bytecode.fingerprints.CrowdfundingBoxFingerprint
-import app.revanced.patches.youtube.layout.hide.crowdfundingbox.resource.patch.CrowdfundingBoxResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, CrowdfundingBoxResourcePatch::class])
-@Name("Hide crowdfunding box")
-@Description("Hides the crowdfunding box between the player and video description.")
-@CrowdfundingBoxCompatibility
-class CrowdfundingBoxPatch : BytecodePatch(
-    listOf(
-        CrowdfundingBoxFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CrowdfundingBoxFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val insertIndex = it.scanResult.patternScanResult!!.endIndex
-                val objectRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
-
-                addInstruction(insertIndex, "invoke-static {v$objectRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR")
-            }
-        } ?: return CrowdfundingBoxFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_METHOD_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideCrowdfundingBoxPatch;->hideCrowdfundingBox(Landroid/view/View;)V"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt
deleted file mode 100644
index b6af990588..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.crowdfundingbox.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class CrowdfundingBoxResourcePatch : ResourcePatch {
-    companion object {
-        internal var crowdfundingBoxId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_crowdfunding_box",
-                StringResource("revanced_hide_crowdfunding_box_title", "Hide crowdfunding box"),
-                StringResource("revanced_hide_crowdfunding_box_summary_on", "Crowdfunding box is hidden"),
-                StringResource("revanced_hide_crowdfunding_box_summary_off", "Crowdfunding box is shown")
-            )
-        )
-
-        crowdfundingBoxId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "donation_companion"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndscreenCardsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndscreenCardsCompatibility.kt
deleted file mode 100644
index 2062758960..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/annotations/HideEndscreenCardsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideEndscreenCardsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutCircleFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutCircleFingerprint.kt
deleted file mode 100644
index 5469dc111c..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutCircleFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints
-
-import app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch.HideEndscreenCardsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.Opcode
-
-object LayoutCircleFingerprint : LiteralValueFingerprint(
-    returnType = "Landroid/view/View;",
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    ),
-    literal = HideEndscreenCardsResourcePatch.layoutCircle
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutIconFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutIconFingerprint.kt
deleted file mode 100644
index 90350f4c06..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutIconFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints
-
-import app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch.HideEndscreenCardsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.Opcode
-
-object LayoutIconFingerprint : LiteralValueFingerprint(
-    returnType = "Landroid/view/View;",
-    opcodes = listOf(
-        Opcode.CONST_4,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    ),
-    literal = HideEndscreenCardsResourcePatch.layoutIcon
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutVideoFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutVideoFingerprint.kt
deleted file mode 100644
index 22c9b07b9e..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/fingerprints/LayoutVideoFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints
-
-import app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch.HideEndscreenCardsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.Opcode
-
-object LayoutVideoFingerprint : LiteralValueFingerprint(
-    returnType = "Landroid/view/View;",
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    ),
-    literal = HideEndscreenCardsResourcePatch.layoutVideo
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
deleted file mode 100644
index acfd9113bf..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.endscreencards.annotations.HideEndscreenCardsCompatibility
-import app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints.LayoutCircleFingerprint
-import app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints.LayoutIconFingerprint
-import app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.fingerprints.LayoutVideoFingerprint
-import app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch.HideEndscreenCardsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-
-@Patch
-@DependsOn([IntegrationsPatch::class, HideEndscreenCardsResourcePatch::class])
-@Name("Hide endscreen cards")
-@Description("Hides the suggested video cards at the end of a video in fullscreen.")
-@HideEndscreenCardsCompatibility
-class HideEndscreenCardsPatch : BytecodePatch(
-    listOf(
-        LayoutCircleFingerprint,
-        LayoutIconFingerprint,
-        LayoutVideoFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        fun MethodFingerprint.injectHideCall() {
-            val layoutResult = result ?: throw toErrorResult()
-            layoutResult.mutableMethod.apply {
-                val insertIndex = layoutResult.scanResult.patternScanResult!!.endIndex + 1
-                val viewRegister = getInstruction<Instruction21c>(insertIndex - 1).registerA
-
-                addInstruction(
-                    insertIndex,
-                    "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V"
-                )
-            }
-        }
-
-        listOf(
-            LayoutCircleFingerprint,
-            LayoutIconFingerprint,
-            LayoutVideoFingerprint
-        ).forEach(MethodFingerprint::injectHideCall)
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt
deleted file mode 100644
index 577a7f1972..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideEndscreenCardsResourcePatch : ResourcePatch {
-    internal companion object {
-        var layoutCircle: Long = -1
-        var layoutIcon: Long = -1
-        var layoutVideo: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_endscreen_cards",
-                StringResource("revanced_hide_endscreen_cards_title", "Hide end screen cards"),
-                StringResource("revanced_hide_endscreen_cards_summary_on", "End screen cards are hidden"),
-                StringResource("revanced_hide_endscreen_cards_summary_off", "End screen cards are shown")
-            ),
-        )
-
-        fun findEndscreenResourceId(name: String) = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "endscreen_element_layout_$name"
-        }.id
-
-        layoutCircle = findEndscreenResourceId("circle")
-        layoutIcon = findEndscreenResourceId("icon")
-        layoutVideo = findEndscreenResourceId("video")
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/annotations/HideFilterBar.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/annotations/HideFilterBar.kt
deleted file mode 100644
index 95aa29f64e..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/annotations/HideFilterBar.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideFilterBar
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/FilterBarHeightFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/FilterBarHeightFingerprint.kt
deleted file mode 100644
index 7307754d03..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/FilterBarHeightFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.filterbar.patch.HideFilterBarResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object FilterBarHeightFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT
-    ),
-    literal = HideFilterBarResourcePatch.filterBarHeightId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/RelatedChipCloudFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/RelatedChipCloudFingerprint.kt
deleted file mode 100644
index a5d47dbd39..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/RelatedChipCloudFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.filterbar.patch.HideFilterBarResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object RelatedChipCloudFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    literal = HideFilterBarResourcePatch.relatedChipCloudMarginId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/SearchResultsChipBarFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/SearchResultsChipBarFingerprint.kt
deleted file mode 100644
index 9dc8f93593..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/SearchResultsChipBarFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.filterbar.patch.HideFilterBarResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SearchResultsChipBarFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    literal = HideFilterBarResourcePatch.barContainerHeightId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt
deleted file mode 100644
index 45d2f6ae9d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.filterbar.annotations.HideFilterBar
-import app.revanced.patches.youtube.layout.hide.filterbar.fingerprints.FilterBarHeightFingerprint
-import app.revanced.patches.youtube.layout.hide.filterbar.fingerprints.RelatedChipCloudFingerprint
-import app.revanced.patches.youtube.layout.hide.filterbar.fingerprints.SearchResultsChipBarFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@Name("Hide filter bar")
-@Description("Hides the filter bar in video feeds.")
-@DependsOn([HideFilterBarResourcePatch::class])
-@HideFilterBar
-class HideFilterBarPatch : BytecodePatch(
-    listOf(
-        RelatedChipCloudFingerprint,
-        SearchResultsChipBarFingerprint,
-        FilterBarHeightFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        FilterBarHeightFingerprint.patch<TwoRegisterInstruction> { register ->
-            """
-                invoke-static { v$register }, $INTEGRATIONS_CLASS_DESCRIPTOR->hideInFeed(I)I
-                move-result v$register
-            """
-        }
-
-        RelatedChipCloudFingerprint.patch<OneRegisterInstruction>(1) { register ->
-            "invoke-static { v$register }, " +
-                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideInRelatedVideos(Landroid/view/View;)V"
-        }
-
-        SearchResultsChipBarFingerprint.patch<OneRegisterInstruction>(-1, -2) { register ->
-            """
-                invoke-static { v$register }, $INTEGRATIONS_CLASS_DESCRIPTOR->hideInSearch(I)I
-                move-result v$register
-            """
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideFilterBarPatch;"
-
-        /**
-         * Patch a [MethodFingerprint] with a given [instructions].
-         *
-         * @param RegisterInstruction The type of instruction to get the register from.
-         * @param insertIndexOffset The offset to add to the end index of the [MethodFingerprint].
-         * @param hookRegisterOffset The offset to add to the register of the hook.
-         * @param instructions The instructions to add with the register as a parameter.
-         */
-        private fun <RegisterInstruction: OneRegisterInstruction> MethodFingerprint.patch(
-            insertIndexOffset: Int = 0,
-            hookRegisterOffset: Int = 0,
-            instructions: (Int) -> String
-        ) =
-            result?.let {
-                it.mutableMethod.apply {
-                    val endIndex = it.scanResult.patternScanResult!!.endIndex
-
-                    val insertIndex = endIndex + insertIndexOffset
-                    val register = getInstruction<RegisterInstruction>(endIndex + hookRegisterOffset).registerA
-
-                    addInstructions(insertIndex, instructions(register))
-                }
-            } ?: throw toErrorResult()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt
deleted file mode 100644
index ab0e32411f..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.filterbar.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideFilterBarResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_hide_filter_bar_preference",
-                StringResource(
-                    "revanced_hide_filter_bar_preference_title",
-                    "Hide filter bar"
-                ),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_filter_bar_feed_in_feed",
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_feed_title",
-                            "Hide in feed"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_feed_summary_on",
-                            "Hidden in feed"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_feed_summary_off",
-                            "Shown in feed"
-                        )
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_filter_bar_feed_in_search",
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_search_title",
-                            "Hide in search"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_search_summary_on",
-                            "Hidden in search"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_search_summary_off",
-                            "Shown in search"
-                        )
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_filter_bar_feed_in_related_videos",
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_related_videos_title",
-                            "Hide in related videos"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_related_videos_summary_on",
-                            "Hidden in related videos"
-                        ),
-                        StringResource(
-                            "revanced_hide_filter_bar_feed_in_related_videos_summary_off",
-                            "Shown in related videos"
-                        )
-                    ),
-                ),
-                StringResource(
-                    "revanced_hide_filter_bar_preference_summary",
-                    "Manage the visibility of the filter bar in the feed, search and related videos"
-                )
-            )
-        )
-
-        relatedChipCloudMarginId = "related_chip_cloud_reduced_margins".layoutResourceId("layout")
-        filterBarHeightId = "filter_bar_height".layoutResourceId()
-        barContainerHeightId = "bar_container_height".layoutResourceId()
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var filterBarHeightId = -1L
-        var relatedChipCloudMarginId = -1L
-        var barContainerHeightId = -1L
-
-        private fun String.layoutResourceId(type: String = "dimen") =
-            ResourceMappingPatch.resourceMappings.single { it.type == type && it.name == this }.id
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt
deleted file mode 100644
index b5f04f78a0..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/annotations/HideFloatingMicrophoneButtonCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.floatingmicrophone.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideFloatingMicrophoneButtonCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/fingerprints/ShowFloatingMicrophoneButtonFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/fingerprints/ShowFloatingMicrophoneButtonFingerprint.kt
deleted file mode 100644
index b471d6473f..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/fingerprints/ShowFloatingMicrophoneButtonFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.floatingmicrophone.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.floatingmicrophone.patch.HideFloatingMicrophoneButtonResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ShowFloatingMicrophoneButtonFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.RETURN_VOID
-    ),
-    literal = HideFloatingMicrophoneButtonResourcePatch.fabButtonId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt b/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
deleted file mode 100644
index 5e8fd945fd..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.floatingmicrophone.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.floatingmicrophone.annotations.HideFloatingMicrophoneButtonCompatibility
-import app.revanced.patches.youtube.layout.hide.floatingmicrophone.fingerprints.ShowFloatingMicrophoneButtonFingerprint
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@Name("Hide floating microphone button")
-@Description("Hides the floating microphone button which appears in search.")
-@DependsOn([HideFloatingMicrophoneButtonResourcePatch::class])
-@HideFloatingMicrophoneButtonCompatibility
-class HideFloatingMicrophoneButtonPatch : BytecodePatch(
-    listOf(ShowFloatingMicrophoneButtonFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ShowFloatingMicrophoneButtonFingerprint.result?.let { result ->
-            with(result.mutableMethod) {
-                val insertIndex = result.scanResult.patternScanResult!!.startIndex + 1
-                val showButtonRegister = getInstruction<TwoRegisterInstruction>(insertIndex - 1).registerA
-
-                addInstructions(
-                    insertIndex,
-                    """
-                        invoke-static {v$showButtonRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->hideFloatingMicrophoneButton(Z)Z
-                        move-result v$showButtonRegister
-                        """
-                )
-            }
-        } ?: return ShowFloatingMicrophoneButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideFloatingMicrophoneButtonPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt
deleted file mode 100644
index e3e03d9807..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.floatingmicrophone.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.floatingmicrophone.annotations.HideFloatingMicrophoneButtonCompatibility
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-@HideFloatingMicrophoneButtonCompatibility
-class HideFloatingMicrophoneButtonResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_floating_microphone_button",
-                StringResource(
-                    "revanced_hide_floating_microphone_button_enabled_title",
-                    "Hide floating microphone button"
-                ),
-                StringResource("revanced_hide_floating_microphone_button_summary_on", "Microphone button hidden"),
-                StringResource("revanced_hide_floating_microphone_button_summary_off", "Microphone button shown")
-            )
-        )
-
-        fabButtonId = ResourceMappingPatch.resourceMappings.find { it.type == "id" && it.name == "fab" }?.id
-            ?: return PatchResultError("Can not find required fab button resource id")
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var fabButtonId: Long = -1
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/general/annotations/HideLayoutComponentsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/general/annotations/HideLayoutComponentsCompatibility.kt
deleted file mode 100644
index a685bf3ee9..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/general/annotations/HideLayoutComponentsCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.general.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideLayoutComponentsCompatibility
-
diff --git a/main/app/revanced/patches/youtube/layout/hide/general/fingerprints/ConvertElementToFlatBufferFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/general/fingerprints/ConvertElementToFlatBufferFingerprint.kt
deleted file mode 100644
index a9ada6da1c..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/general/fingerprints/ConvertElementToFlatBufferFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.general.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object ConvertElementToFlatBufferFingerprint : MethodFingerprint(
-    strings = listOf("Failed to convert Element to Flatbuffers: %s"),
-    opcodes = listOf(Opcode.IGET_OBJECT) // Patched at this opcodes index
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt
deleted file mode 100644
index 640479490d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt
+++ /dev/null
@@ -1,288 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.general.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.shared.settings.preference.impl.TextPreference
-import app.revanced.patches.youtube.layout.hide.general.annotations.HideLayoutComponentsCompatibility
-import app.revanced.patches.youtube.layout.hide.general.fingerprints.ConvertElementToFlatBufferFingerprint
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.PreferenceScreen
-
-@Patch
-@Name("Hide layout components")
-@Description("Hides general layout components.")
-@DependsOn([LithoFilterPatch::class, SettingsPatch::class])
-@HideLayoutComponentsCompatibility
-class HideLayoutComponentsPatch : BytecodePatch(
-    listOf(ConvertElementToFlatBufferFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_gray_separator",
-                StringResource("revanced_hide_gray_separator_title", "Hide gray separator"),
-                StringResource("revanced_hide_gray_separator_summary_on", "Gray separators are hidden"),
-                StringResource("revanced_hide_gray_separator_summary_off", "Gray separators are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_channel_guidelines",
-                StringResource("revanced_hide_channel_guidelines_title", "Hide channel guidelines"),
-                StringResource(
-                    "revanced_hide_channel_guidelines_summary_on",
-                    "Channel guidelines are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_channel_guidelines_summary_off",
-                    "Channel guidelines are shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_expandable_chip",
-                StringResource(
-                    "revanced_hide_expandable_chip_title",
-                    "Hide the expandable chip under videos"
-                ),
-                StringResource(
-                    "revanced_hide_expandable_chip_summary_on",
-                    "Expandable chips are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_expandable_chip_summary_off",
-                    "Expandable chips are shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_chapters",
-                StringResource(
-                    "revanced_hide_chapters_title",
-                    "Hide chapters in the video description"
-                ),
-                StringResource(
-                    "revanced_hide_chapters_summary_on",
-                    "Chapters are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_chapters_summary_off",
-                    "Chapters are shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_community_posts",
-                StringResource("revanced_hide_community_posts_title", "Hide community posts"),
-                StringResource("revanced_hide_community_posts_summary_on", "Community posts are hidden"),
-                StringResource("revanced_hide_community_posts_summary_off", "Community posts are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_compact_banner",
-                StringResource("revanced_hide_compact_banner_title", "Hide compact banners"),
-                StringResource("revanced_hide_compact_banner_summary_on", "Compact banners are hidden"),
-                StringResource("revanced_hide_compact_banner_summary_off", "Compact banners are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_movies_section",
-                StringResource("revanced_hide_movies_section_title", "Hide movies section"),
-                StringResource("revanced_hide_movies_section_summary_on", "Movies section is hidden"),
-                StringResource("revanced_hide_movies_section_summary_off", "Movies section is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_feed_survey",
-                StringResource("revanced_hide_feed_survey_title", "Hide feed surveys"),
-                StringResource("revanced_hide_feed_survey_summary_on", "Feed surveys are hidden"),
-                StringResource("revanced_hide_feed_survey_summary_off", "Feed surveys are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_community_guidelines",
-                StringResource("revanced_hide_community_guidelines_title", "Hide community guidelines"),
-                StringResource(
-                    "revanced_hide_community_guidelines_summary_on",
-                    "Community guidelines are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_community_guidelines_summary_off",
-                    "Community guidelines are shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_subscribers_community_guidelines",
-                StringResource(
-                    "revanced_hide_subscribers_community_guidelines_title",
-                    "Hide subscribers community guidelines"
-                ),
-                StringResource(
-                    "revanced_hide_subscribers_community_guidelines_summary_on",
-                    "Subscribers community guidelines are hidden"
-                ),
-                StringResource(
-                    "revanced_hide_subscribers_community_guidelines_summary_off",
-                    "Subscribers community guidelines are shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_channel_member_shelf",
-                StringResource("revanced_hide_channel_member_shelf_title", "Hide channel member shelf"),
-                StringResource(
-                    "revanced_hide_channel_member_shelf_summary_on",
-                    "Channel member shelf is hidden"
-                ),
-                StringResource(
-                    "revanced_hide_channel_member_shelf_summary_off",
-                    "Channel member shelf is shown"
-                )
-            ),
-            SwitchPreference(
-                "revanced_hide_emergency_box",
-                StringResource("revanced_hide_emergency_box_title", "Hide emergency boxes"),
-                StringResource("revanced_hide_emergency_box_summary_on", "Emergency boxes are hidden"),
-                StringResource("revanced_hide_emergency_box_summary_off", "Emergency boxes are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_info_panels",
-                StringResource("revanced_hide_info_panels_title", "Hide info panels"),
-                StringResource("revanced_hide_info_panels_summary_on", "Info panels are hidden"),
-                StringResource("revanced_hide_info_panels_summary_off", "Info panels are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_medical_panels",
-                StringResource("revanced_hide_medical_panels_title", "Hide medical panels"),
-                StringResource("revanced_hide_medical_panels_summary_on", "Medical panels are hidden"),
-                StringResource("revanced_hide_medical_panels_summary_off", "Medical panels are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_channel_bar",
-                StringResource("revanced_hide_channel_bar_title", "Hide channel bar"),
-                StringResource("revanced_hide_channel_bar_summary_on", "Channel bar is hidden"),
-                StringResource("revanced_hide_channel_bar_summary_off", "Channel bar is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_quick_actions",
-                StringResource("revanced_hide_quick_actions_title", "Hide quick actions in fullscreen"),
-                StringResource("revanced_hide_quick_actions_summary_on", "Quick actions are hidden"),
-                StringResource("revanced_hide_quick_actions_summary_off", "Quick actions are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_related_videos",
-                StringResource("revanced_hide_related_videos_title", "Hide related videos in quick actions"),
-                StringResource("revanced_hide_related_videos_summary_on", "Related videos are hidden"),
-                StringResource("revanced_hide_related_videos_summary_off", "Related videos are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_image_shelf",
-                StringResource("revanced_hide_image_shelf", "Hide image shelf in search results"),
-                StringResource("revanced_hide_image_shelf_summary_on", "Image shelf is hidden"),
-                StringResource("revanced_hide_image_shelf_summary_off", "Image shelf is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_audio_track_button",
-                StringResource("revanced_hide_audio_track_button_title", "Hide audio track button"),
-                StringResource("revanced_hide_audio_track_button_on", "Audio track button is hidden"),
-                StringResource("revanced_hide_audio_track_button_off", "Audio track button is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_latest_posts_ads",
-                StringResource("revanced_hide_latest_posts_ads_title", "Hide latest posts"),
-                StringResource("revanced_hide_latest_posts_ads_summary_on", "Latest posts are hidden"),
-                StringResource("revanced_hide_latest_posts_ads_summary_off", "Latest posts are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_mix_playlists",
-                StringResource("revanced_hide_mix_playlists_title", "Hide mix playlists"),
-                StringResource("revanced_hide_mix_playlists_summary_on", "Mix playlists are hidden"),
-                StringResource("revanced_hide_mix_playlists_summary_off", "Mix playlists are shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_artist_cards",
-                StringResource("revanced_hide_artist_cards_title", "Hide artist cards"),
-                StringResource("revanced_hide_artist_cards_on", "Artist cards is hidden"),
-                StringResource("revanced_hide_artist_cards_off", "Artist cards is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_chips_shelf",
-                StringResource("revanced_hide_chips_shelf_title", "Hide chips shelf"),
-                StringResource("revanced_hide_chips_shelf_on", "Chips shelf is hidden"),
-                StringResource("revanced_hide_chips_shelf_off", "Chips shelf is shown")
-            ),
-            app.revanced.patches.shared.settings.preference.impl.PreferenceScreen(
-                "revanced_custom_filter_preference_screen",
-                StringResource("revanced_custom_filter_preference_screen_title", "Custom filter"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_custom_filter",
-                        StringResource(
-                            "revanced_custom_filter_title",
-                            "Enable custom filter"
-                        ),
-                        StringResource(
-                            "revanced_custom_filter_summary_on",
-                            "Custom filter is enabled"
-                        ),
-                        StringResource(
-                            "revanced_custom_filter_summary_off",
-                            "Custom filter is disabled"
-                        )
-                    ),
-                    // TODO: This should be a dynamic ListPreference, which does not exist yet
-                    TextPreference(
-                        "revanced_custom_filter_strings",
-                        StringResource("revanced_custom_filter_strings_title", "Custom filter"),
-                        StringResource(
-                            "revanced_custom_filter_strings_summary",
-                            "Filter components by their name separated by a comma"
-                        )
-                    )
-                )
-            )
-        )
-
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        // region Mix playlists
-
-        ConvertElementToFlatBufferFingerprint.result?.let {
-            val returnEmptyComponentIndex = it.scanResult.stringsScanResult!!.matches.first().index + 2
-
-            it.mutableMethod.apply {
-                // The last virtual register (not parameter). Used to store the byte array
-                // that may contain information about a mix playlist.
-                val freeRegister = (implementation!!.registerCount - 1) - parameterTypes.size - 1
-
-                // Check if the byte array contains anything about a mix playlist.
-                addInstructionsWithLabels(
-                    it.scanResult.patternScanResult!!.startIndex,
-                    """
-                        invoke-static {v$freeRegister}, $FILTER_CLASS_DESCRIPTOR->filterMixPlaylists([B)Z
-                        move-result v$freeRegister
-                        if-nez v$freeRegister, :return_empty_component
-                    """,
-                    ExternalLabel("return_empty_component", getInstruction(returnEmptyComponentIndex))
-                )
-
-                // Move the byte array to a free register.
-                addInstruction(0, "move-object/from16 v$freeRegister, p3")
-            }
-
-        } ?: return ConvertElementToFlatBufferFingerprint.toErrorResult()
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/LayoutComponentsFilter;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt
deleted file mode 100644
index 520f038f63..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/annotations/HideInfocardsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideInfocardsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoFingerprint.kt
deleted file mode 100644
index d59f8bff20..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object InfocardsIncognitoFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Ljava/lang/Boolean;",
-    parameters = listOf("L", "J"),
-    strings = listOf("vibrator")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoParentFingerprint.kt
deleted file mode 100644
index 815b37d806..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsIncognitoParentFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object InfocardsIncognitoParentFingerprint : MethodFingerprint(
-    "Ljava/lang/String;",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf("player_overlay_info_card_teaser"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsMethodCallFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsMethodCallFingerprint.kt
deleted file mode 100644
index 48bef700aa..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsMethodCallFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.fingerprints
-
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.infocards.resource.patch.HideInfocardsResourcePatch
-import org.jf.dexlib2.Opcode
-
-object InfocardsMethodCallFingerprint : LiteralValueFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-    ),
-    strings = listOf("Missing ControlsOverlayPresenter for InfoCards to work."),
-    literal = HideInfocardsResourcePatch.drawerResourceId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
deleted file mode 100644
index 2d39ae8e54..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.layout.hide.infocards.annotations.HideInfocardsCompatibility
-import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsIncognitoFingerprint
-import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsIncognitoParentFingerprint
-import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsMethodCallFingerprint
-import app.revanced.patches.youtube.layout.hide.infocards.resource.patch.HideInfocardsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, HideInfocardsResourcePatch::class])
-@Name("Hide info cards")
-@Description("Hides info cards in videos.")
-@HideInfocardsCompatibility
-class HideInfoCardsPatch : BytecodePatch(
-    listOf(
-        InfocardsIncognitoParentFingerprint,
-        InfocardsMethodCallFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-       InfocardsIncognitoFingerprint.also {
-            it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
-        }.result!!.mutableMethod.apply {
-            val invokeInstructionIndex = implementation!!.instructions.indexOfFirst {
-                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal &&
-                        ((it as ReferenceInstruction).reference.toString() == "Landroid/view/View;->setVisibility(I)V")
-            }
-
-           addInstruction(
-               invokeInstructionIndex,
-               "invoke-static {v${getInstruction<FiveRegisterInstruction>(invokeInstructionIndex).registerC}}," +
-                       " Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsIncognito(Landroid/view/View;)V"
-           )
-        }
-
-        with(InfocardsMethodCallFingerprint.result!!) {
-            val hideInfoCardsCallMethod = mutableMethod
-
-            val invokeInterfaceIndex = scanResult.patternScanResult!!.endIndex
-            val toggleRegister = hideInfoCardsCallMethod.implementation!!.registerCount - 1
-
-            hideInfoCardsCallMethod.addInstructionsWithLabels(
-                invokeInterfaceIndex,
-                """
-                    invoke-static {}, Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsMethodCall()Z
-                    move-result v$toggleRegister
-                    if-nez v$toggleRegister, :hide_info_cards
-                """,
-                ExternalLabel(
-                    "hide_info_cards", hideInfoCardsCallMethod.getInstruction(invokeInterfaceIndex + 1)
-                )
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt
deleted file mode 100644
index 9b36d35f4f..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.infocards.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.infocards.annotations.HideInfocardsCompatibility
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@HideInfocardsCompatibility
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideInfocardsResourcePatch : ResourcePatch {
-    internal companion object {
-        var drawerResourceId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_info_cards",
-                StringResource("revanced_hide_info_cards_title", "Hide info cards"),
-                StringResource("revanced_hide_info_cards_summary_on", "Info cards are hidden"),
-                StringResource("revanced_hide_info_cards_summary_off", "Info cards are shown")
-            )
-        )
-
-        drawerResourceId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "id" && it.name == "info_cards_drawer_header"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/annotations/HideLoadMoreButtonCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/annotations/HideLoadMoreButtonCompatibility.kt
deleted file mode 100644
index a9c4bcea73..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/annotations/HideLoadMoreButtonCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideLoadMoreButtonCompatibility
-
diff --git a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/fingerprints/HideLoadMoreButtonFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/fingerprints/HideLoadMoreButtonFingerprint.kt
deleted file mode 100644
index 8a01d22247..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/fingerprints/HideLoadMoreButtonFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch.HideLoadMoreButtonResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object HideLoadMoreButtonFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf("L", "L", "L", "L"),
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    literal = HideLoadMoreButtonResourcePatch.expandButtonDownId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt b/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
deleted file mode 100644
index 3f0d69ee80..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.fingerprints.HideLoadMoreButtonFingerprint
-import app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch.HideLoadMoreButtonResourcePatch
-import app.revanced.patches.youtube.layout.hide.loadmorebutton.annotations.HideLoadMoreButtonCompatibility
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Hide load more button")
-@Description("Hides the button under videos that loads similar videos.")
-@DependsOn([HideLoadMoreButtonResourcePatch::class])
-@HideLoadMoreButtonCompatibility
-class HideLoadMoreButtonPatch : BytecodePatch(listOf(HideLoadMoreButtonFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        HideLoadMoreButtonFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveRegisterIndex = it.scanResult.patternScanResult!!.endIndex
-                val viewRegister = getInstruction<OneRegisterInstruction>(moveRegisterIndex).registerA
-
-                val insertIndex = moveRegisterIndex + 1
-                addInstruction(
-                    insertIndex,
-                    "invoke-static { v$viewRegister }, " +
-                            "$INTEGRATIONS_CLASS_DESCRIPTOR->hideLoadMoreButton(Landroid/view/View;)V"
-                )
-            }
-        } ?: return HideLoadMoreButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/HideLoadMoreButtonPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
deleted file mode 100644
index d74dd3d7a5..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideLoadMoreButtonResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_load_more_button",
-                StringResource("revanced_hide_load_more_button_title", "Hide Load More button"),
-                StringResource("revanced_hide_load_more_button_summary_on", "Load More button is hidden"),
-                StringResource("revanced_hide_load_more_button_summary_off", "Load More button is shown")
-            )
-        )
-
-        expandButtonDownId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "expand_button_down"
-        }.id
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var expandButtonDownId: Long = -1
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt
deleted file mode 100644
index 3d7193394a..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/personalinformation/annotations/HideEmailAddressCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.personalinformation.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideEmailAddressCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt
deleted file mode 100644
index 372c21c5e2..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.personalinformation.bytecode.fingerprints
-
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.personalinformation.resource.patch.HideEmailAddressResourcePatch
-import org.jf.dexlib2.Opcode
-
-object AccountSwitcherAccessibilityLabelFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    parameters = listOf("L", "Ljava/lang/Object;"),
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.NEW_ARRAY,
-        Opcode.CONST_4,
-        Opcode.APUT_OBJECT,
-        Opcode.CONST,
-    ),
-    literal = HideEmailAddressResourcePatch.accountSwitcherAccessibilityLabelId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt b/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
deleted file mode 100644
index 1314b56c57..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.personalinformation.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.personalinformation.annotations.HideEmailAddressCompatibility
-import app.revanced.patches.youtube.layout.hide.personalinformation.bytecode.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
-import app.revanced.patches.youtube.layout.hide.personalinformation.resource.patch.HideEmailAddressResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, HideEmailAddressResourcePatch::class])
-@Name("Hide email address")
-@Description("Hides the email address in the account switcher.")
-@HideEmailAddressCompatibility
-class HideEmailAddressPatch : BytecodePatch(
-    listOf(
-        AccountSwitcherAccessibilityLabelFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        AccountSwitcherAccessibilityLabelFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val setVisibilityConstIndex = it.scanResult.patternScanResult!!.endIndex
-
-                val setVisibilityConstRegister =
-                    getInstruction<OneRegisterInstruction>(setVisibilityConstIndex - 2).registerA
-
-                addInstructions(
-                    setVisibilityConstIndex,
-                    """
-                        invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I
-                        move-result v$setVisibilityConstRegister
-                    """
-                )
-            }
-        } ?: return AccountSwitcherAccessibilityLabelFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt
deleted file mode 100644
index dd9ed27158..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.personalinformation.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideEmailAddressResourcePatch : ResourcePatch {
-    companion object {
-        internal var accountSwitcherAccessibilityLabelId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_email_address",
-                StringResource("revanced_hide_email_address_title", "Hide email in account switcher"),
-                StringResource("revanced_hide_email_address_summary_on", "Email address is hidden"),
-                StringResource("revanced_hide_email_address_summary_off", "Email address is shown")
-            )
-        )
-
-        accountSwitcherAccessibilityLabelId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "string" && it.name == "account_switcher_accessibility_label"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/annotations/HidePlayerFlyoutMenuItemsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/annotations/HidePlayerFlyoutMenuItemsCompatibility.kt
deleted file mode 100644
index c9dcebc192..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/annotations/HidePlayerFlyoutMenuItemsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HidePlayerFlyoutMenuItemsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt b/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt
deleted file mode 100644
index 49848fd325..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.annotations.HidePlayerFlyoutMenuItemsCompatibility
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@Name("Player flyout menu")
-@Description("Hides player flyout menu items.")
-@DependsOn([LithoFilterPatch::class, SettingsPatch::class])
-@HidePlayerFlyoutMenuItemsCompatibility
-class HidePlayerFlyoutMenuPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                KEY,
-                StringResource("${KEY}_title", "Player flyout menu items"),
-                listOf(
-                    SwitchPreference(
-                        "${KEY}_quality",
-                        StringResource("${KEY}_quality_title", "Hide Quality menu"),
-                        StringResource("${KEY}_quality_on", "Quality menu item is hidden"),
-                        StringResource("${KEY}_quality_off", "Quality menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_captions",
-                        StringResource("${KEY}_captions_title", "Hide Captions menu"),
-                        StringResource("${KEY}_captions_on", "Captions menu item is hidden"),
-                        StringResource("${KEY}_captions_off", "Captions menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_loop_video",
-                        StringResource("${KEY}_loop_video_title", "Hide Loop video menu"),
-                        StringResource("${KEY}_loop_video_on", "Loop video menu item is hidden"),
-                        StringResource("${KEY}_loop_video_off", "Loop video menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_ambient_mode",
-                        StringResource("${KEY}_ambient_mode_title", "Hide Ambient mode menu"),
-                        StringResource("${KEY}_ambient_mode_on", "Ambient mode menu item is hidden"),
-                        StringResource("${KEY}_ambient_mode_off", "Ambient mode menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_report",
-                        StringResource("${KEY}_report_title", "Hide Report menu"),
-                        StringResource("${KEY}_report_on", "Report menu item is hidden"),
-                        StringResource("${KEY}_report_off", "Report menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_help",
-                        StringResource("${KEY}_help_title", "Hide Help menu"),
-                        StringResource("${KEY}_help_on", "Help menu item is hidden"),
-                        StringResource("${KEY}_help_off", "Help menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_speed",
-                        StringResource("${KEY}_speed_title", "Hide Speed menu"),
-                        StringResource("${KEY}_speed_on", "Speed menu item is hidden"),
-                        StringResource("${KEY}_speed_off", "Speed menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_more_info",
-                        StringResource("${KEY}_more_info_title", "Hide More info menu"),
-                        StringResource("${KEY}_more_info_on", "More info menu item is hidden"),
-                        StringResource("${KEY}_more_info_off", "More info menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_audio_track",
-                        StringResource("${KEY}_audio_track_title", "Hide Audio track menu"),
-                        StringResource("${KEY}_audio_track_on", "Audio track menu item is hidden"),
-                        StringResource("${KEY}_audio_track_off", "Audio track menu item is shown")
-                    ),
-                    SwitchPreference(
-                        "${KEY}_watch_in_vr",
-                        StringResource("${KEY}_watch_in_vr_title", "Hide Watch in VR menu"),
-                        StringResource("${KEY}_watch_in_vr_on", "Watch in VR menu item is hidden"),
-                        StringResource("${KEY}_watch_in_vr_off", "Watch in VR menu item is shown")
-                    ),
-                ),
-                StringResource("${KEY}_summary", "Manage the visibility of player flyout menu items")
-            )
-        )
-
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val KEY = "revanced_hide_player_flyout"
-
-        const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/PlayerFlyoutMenuItemsFilter;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt
deleted file mode 100644
index 9ca55f5234..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HidePlayerOverlayPatchCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/fingerprints/CreatePlayerOverviewFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/fingerprints/CreatePlayerOverviewFingerprint.kt
deleted file mode 100644
index 1325bee978..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/fingerprints/CreatePlayerOverviewFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.fingerprints
-
-import app.revanced.extensions.containsConstantInstructionValue
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch.HidePlayerOverlayResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object CreatePlayerOverviewFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-                &&  methodDef.containsConstantInstructionValue(HidePlayerOverlayResourcePatch.scrimOverlayId)
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt b/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt
deleted file mode 100644
index d802ae3b1c..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.patch
-
-import app.revanced.extensions.indexOfFirstConstantInstructionValue
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hide.player.overlay.annotations.HidePlayerOverlayPatchCompatibility
-import app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.fingerprints.CreatePlayerOverviewFingerprint
-import app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch.HidePlayerOverlayResourcePatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@Name("Hide player overlay")
-@Description("Hides the dark background overlay from the player when player controls are visible.")
-@DependsOn([HidePlayerOverlayResourcePatch::class])
-@HidePlayerOverlayPatchCompatibility
-class HidePlayerOverlayPatch : BytecodePatch(listOf(CreatePlayerOverviewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CreatePlayerOverviewFingerprint.result?.let { result ->
-            result.mutableMethod.apply {
-                val viewRegisterIndex =
-                    indexOfFirstConstantInstructionValue(HidePlayerOverlayResourcePatch.scrimOverlayId) + 3
-                val viewRegister = getInstruction<OneRegisterInstruction>(viewRegisterIndex).registerA
-
-                val insertIndex = viewRegisterIndex + 1
-                addInstruction(
-                    insertIndex,
-                    "invoke-static { v$viewRegister }, " +
-                            "$INTEGRATIONS_CLASS_DESCRIPTOR->hidePlayerOverlay(Landroid/widget/ImageView;)V"
-                )
-            }
-        } ?: return CreatePlayerOverviewFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HidePlayerOverlayPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt
deleted file mode 100644
index 5f5710452e..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HidePlayerOverlayResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_player_overlay",
-                StringResource("revanced_hide_player_overlay_title", "Hide background overlay in player"),
-                StringResource("revanced_hide_player_overlay_summary_on", "Background overlay is hidden"),
-                StringResource("revanced_hide_player_overlay_summary_off", "Background overlay is shown")
-            )
-        )
-
-        scrimOverlayId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "id" && it.name == "scrim_overlay"
-        }.id
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var scrimOverlayId: Long = -1
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt
deleted file mode 100644
index 784fa8611d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/seekbar/annotations/HideSeekbarCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.seekbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideSeekbarCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt b/main/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt
deleted file mode 100644
index 9cc247aff8..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.seekbar.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
-import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.seekbar.annotations.HideSeekbarCompatibility
-import app.revanced.patches.youtube.layout.seekbar.bytecode.patch.SeekbarColorBytecodePatch
-import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarPreferencesPatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([
-    IntegrationsPatch::class,
-    SettingsPatch::class,
-    // Does not alter the behavior of the seek bar by default.
-    SeekbarColorBytecodePatch::class,
-    // Used to add preferences to the seekbar settings menu.
-    SeekbarPreferencesPatch::class
-])
-@Name("Hide seekbar")
-@Description("Hides the seekbar.")
-@HideSeekbarCompatibility
-class HideSeekbarPatch : BytecodePatch(
-    listOf(SeekbarFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SeekbarPreferencesPatch.addPreferences(
-            SwitchPreference(
-                "revanced_hide_seekbar",
-                StringResource("revanced_hide_seekbar_title", "Hide seekbar in video player"),
-                StringResource("revanced_hide_seekbar_summary_on", "Video player seekbar is hidden"),
-                StringResource("revanced_hide_seekbar_summary_off", "Video player seekbar is shown")
-            ),
-            SwitchPreference(
-                "revanced_hide_seekbar_thumbnail",
-                StringResource("revanced_hide_seekbar_thumbnail_title", "Hide seekbar in video thumbnails"),
-                StringResource("revanced_hide_seekbar_thumbnail_summary_on", "Thumbnail seekbar is hidden"),
-                StringResource("revanced_hide_seekbar_thumbnail_summary_off", "Thumbnail seekbar is shown")
-            )
-        )
-
-        SeekbarFingerprint.result!!.let {
-            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
-        }.result!!.mutableMethod.addInstructionsWithLabels(
-            0,
-            """
-                const/4 v0, 0x0
-                invoke-static { }, Lapp/revanced/integrations/patches/HideSeekbarPatch;->hideSeekbar()Z
-                move-result v0
-                if-eqz v0, :hide_seekbar
-                return-void
-                :hide_seekbar
-                nop
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/annotations/HideShortsComponentsCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/annotations/HideShortsComponentsCompatibility.kt
deleted file mode 100644
index e434846d02..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/annotations/HideShortsComponentsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideShortsComponentsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/BottomNavigationBarFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/BottomNavigationBarFingerprint.kt
deleted file mode 100644
index c53e79673d..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/BottomNavigationBarFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object BottomNavigationBarFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.MOVE_RESULT_OBJECT, // Refers to bottom navigation bar
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-    ),
-    strings = listOf(
-        "navigation_endpoint_interaction_logging_extension",
-        "reel_watch_fragment_watch_while",
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/CreateShortsButtonsFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/CreateShortsButtonsFingerprint.kt
deleted file mode 100644
index 282737f7da..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/CreateShortsButtonsFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.shorts.resource.patch.HideShortsComponentsResourcePatch
-import org.jf.dexlib2.AccessFlags
-
-object CreateShortsButtonsFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Z", "Z", "L"),
-    literal = HideShortsComponentsResourcePatch.reelPlayerRightLargeIconSize
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/ReelConstructorFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/ReelConstructorFingerprint.kt
deleted file mode 100644
index 467fa3c190..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/ReelConstructorFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.hide.shorts.resource.patch.HideShortsComponentsResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ReelConstructorFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(Opcode.INVOKE_VIRTUAL),
-    literal = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarFingerprint.kt
deleted file mode 100644
index 216d7276a8..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object RenderBottomNavigationBarFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.MONITOR_ENTER,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MONITOR_EXIT,
-        Opcode.RETURN_VOID,
-        Opcode.MOVE_EXCEPTION,
-        Opcode.MONITOR_EXIT,
-        Opcode.THROW,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarParentFingerprint.kt
deleted file mode 100644
index 70a2ebc0a0..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/RenderBottomNavigationBarParentFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object RenderBottomNavigationBarParentFingerprint : MethodFingerprint(
-    parameters = listOf("I", "I", "L", "L", "J", "L"),
-    strings = listOf("aa")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityFingerprint.kt
deleted file mode 100644
index 6c169f2aef..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object SetPivotBarVisibilityFingerprint : MethodFingerprint(
-    parameters = listOf("Z"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.RETURN_VOID,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityParentFingerprint.kt
deleted file mode 100644
index 170569b9a7..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/fingerprints/SetPivotBarVisibilityParentFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SetPivotBarVisibilityParentFingerprint : MethodFingerprint(
-    parameters = listOf("Z"),
-    strings = listOf("FEnotifications_inbox")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt
deleted file mode 100644
index 859588f8f7..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.bytecode.patch
-
-import app.revanced.extensions.findIndexForIdResource
-import app.revanced.extensions.injectHideViewCall
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.hide.shorts.annotations.HideShortsComponentsCompatibility
-import app.revanced.patches.youtube.layout.hide.shorts.bytecode.fingerprints.*
-import app.revanced.patches.youtube.layout.hide.shorts.resource.patch.HideShortsComponentsResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        LithoFilterPatch::class,
-        HideShortsComponentsResourcePatch::class,
-        ResourceMappingPatch::class
-    ]
-)
-@Name("Hide Shorts components")
-@Description("Hides components from YouTube Shorts.")
-@HideShortsComponentsCompatibility
-class HideShortsComponentsPatch : BytecodePatch(
-    listOf(
-        CreateShortsButtonsFingerprint,
-        ReelConstructorFingerprint,
-        BottomNavigationBarFingerprint,
-        RenderBottomNavigationBarParentFingerprint,
-        SetPivotBarVisibilityParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        // region Hide the Shorts shelf.
-
-        ReelConstructorFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
-                val viewRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
-
-                injectHideViewCall(
-                    insertIndex,
-                    viewRegister,
-                    FILTER_CLASS_DESCRIPTOR,
-                    "hideShortsShelf"
-                )
-            }
-        } ?: return ReelConstructorFingerprint.toErrorResult()
-
-        // endregion
-
-        // region Hide the Shorts buttons.
-
-        // Some Shorts buttons are views, hide them by setting their visibility to GONE.
-        CreateShortsButtonsFingerprint.result?.let {
-            ShortsButtons.values().forEach { button -> button.injectHideCall(it.mutableMethod) }
-        } ?: return CreateShortsButtonsFingerprint.toErrorResult()
-
-        // endregion
-
-        // region Hide the navigation bar.
-
-        // Hook to get the pivotBar view.
-        SetPivotBarVisibilityParentFingerprint.result?.let {
-            if (!SetPivotBarVisibilityFingerprint.resolve(context, it.classDef))
-                throw SetPivotBarVisibilityFingerprint.toErrorResult()
-
-            SetPivotBarVisibilityFingerprint.result!!.let { result ->
-                result.mutableMethod.apply {
-                    val checkCastIndex = result.scanResult.patternScanResult!!.endIndex
-                    val viewRegister = getInstruction<OneRegisterInstruction>(checkCastIndex).registerA
-                    addInstruction(
-                        checkCastIndex + 1,
-                        "sput-object v$viewRegister, $FILTER_CLASS_DESCRIPTOR->pivotBar:" +
-                                "Lcom/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar;"
-                    )
-                }
-            }
-        } ?: return SetPivotBarVisibilityParentFingerprint.toErrorResult()
-
-        // Hook to hide the navigation bar when Shorts are being played.
-        RenderBottomNavigationBarParentFingerprint.result?.let {
-            if (!RenderBottomNavigationBarFingerprint.resolve(context, it.classDef))
-                throw RenderBottomNavigationBarFingerprint.toErrorResult()
-
-            RenderBottomNavigationBarFingerprint.result!!.mutableMethod.apply {
-                addInstruction(0, "invoke-static { }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar()V")
-            }
-        } ?: return RenderBottomNavigationBarParentFingerprint.toErrorResult()
-
-        // Required to prevent a black bar from appearing at the bottom of the screen.
-        BottomNavigationBarFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveResultIndex = it.scanResult.patternScanResult!!.startIndex
-                val viewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-                val insertIndex = moveResultIndex + 1
-
-                addInstruction(
-                    insertIndex,
-                    "invoke-static { v$viewRegister }, $FILTER_CLASS_DESCRIPTOR->" +
-                            "hideNavigationBar(Landroid/view/View;)Landroid/view/View;"
-                )
-            }
-        } ?: return BottomNavigationBarFingerprint.toErrorResult()
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/components/ShortsFilter;"
-
-        private enum class ShortsButtons(private val resourceName: String, private val methodName: String) {
-            COMMENTS("reel_dyn_comment", "hideShortsCommentsButton"),
-            REMIX("reel_dyn_remix", "hideShortsRemixButton"),
-            SHARE("reel_dyn_share", "hideShortsShareButton");
-
-            fun injectHideCall(method: MutableMethod) {
-                val referencedIndex = method.findIndexForIdResource(resourceName)
-
-                val setIdIndex = referencedIndex + 1
-                val viewRegister = method.getInstruction<FiveRegisterInstruction>(setIdIndex).registerC
-                method.injectHideViewCall(setIdIndex, viewRegister, FILTER_CLASS_DESCRIPTOR, methodName)
-            }
-        }
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt b/main/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt
deleted file mode 100644
index fb06642405..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class HideShortsComponentsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_shorts_preference_screen",
-                StringResource("revanced_shorts_preference_screen_title", "Shorts components"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_hide_shorts",
-                        StringResource("revanced_hide_shorts_title", "Hide Shorts in feed"),
-                        StringResource("revanced_hide_shorts_on", "Shorts are hidden"),
-                        StringResource("revanced_hide_shorts_off", "Shorts are shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_join_button",
-                        StringResource("revanced_hide_shorts_join_button_title", "Hide join button"),
-                        StringResource("revanced_hide_shorts_join_button_on", "Join button is hidden"),
-                        StringResource("revanced_hide_shorts_join_button_off", "Join button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_subscribe_button",
-                        StringResource("revanced_hide_shorts_subscribe_button_title", "Hide subscribe button"),
-                        StringResource("revanced_hide_shorts_subscribe_button_on", "Subscribe button is hidden"),
-                        StringResource("revanced_hide_shorts_subscribe_button_off", "Subscribe button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_thanks_button",
-                        StringResource("revanced_hide_shorts_thanks_button_title", "Hide thanks button"),
-                        StringResource("revanced_hide_shorts_thanks_button_on", "Thanks button is hidden"),
-                        StringResource("revanced_hide_shorts_thanks_button_off", "Thanks button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_comments_button",
-                        StringResource("revanced_hide_shorts_comments_button_title", "Hide comments button"),
-                        StringResource("revanced_hide_shorts_comments_button_on", "Comments button is hidden"),
-                        StringResource("revanced_hide_shorts_comments_button_off", "Comments button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_remix_button",
-                        StringResource("revanced_hide_shorts_remix_button_title", "Hide remix button"),
-                        StringResource("revanced_hide_shorts_remix_button_on", "Remix button is hidden"),
-                        StringResource("revanced_hide_shorts_remix_button_off", "Remix button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_share_button",
-                        StringResource("revanced_hide_shorts_share_button_title", "Hide share button"),
-                        StringResource("revanced_hide_shorts_share_button_on", "Share button is hidden"),
-                        StringResource("revanced_hide_shorts_share_button_off", "Share button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_info_panel",
-                        StringResource("revanced_hide_shorts_info_panel_title", "Hide info panel"),
-                        StringResource("revanced_hide_shorts_info_panel_on", "Info panel is hidden"),
-                        StringResource("revanced_hide_shorts_info_panel_off", "Info panel is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_channel_bar",
-                        StringResource("revanced_hide_shorts_channel_bar_title", "Hide channel bar"),
-                        StringResource("revanced_hide_shorts_channel_bar_on", "Channel bar is hidden"),
-                        StringResource("revanced_hide_shorts_channel_bar_off", "Channel bar is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_sound_button",
-                        StringResource("revanced_hide_shorts_sound_button_title", "Hide sound button"),
-                        StringResource("revanced_hide_shorts_sound_button_on", "Sound button is hidden"),
-                        StringResource("revanced_hide_shorts_sound_button_off", "Sound button is shown")
-                    ),
-                    SwitchPreference(
-                        "revanced_hide_shorts_navigation_bar",
-                        StringResource("revanced_hide_shorts_navigation_bar_title", "Hide navigation bar"),
-                        StringResource("revanced_hide_shorts_navigation_bar_on", "Navigation bar is hidden"),
-                        StringResource("revanced_hide_shorts_navigation_bar_off", "Navigation bar is shown")
-                    )
-                ),
-                StringResource("revanced_shorts_preference_screen_summary", "Manage the visibility of Shorts components")
-            )
-        )
-
-        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
-
-        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
-        reelPlayerRightLargeIconSize = "reel_player_right_large_icon_size".getId()
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        var reelMultipleItemShelfId: Long = -1
-        var reelPlayerRightLargeIconSize = -1L
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt
deleted file mode 100644
index baa9be5ff3..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/time/annotations/HideTimeCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.time.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideTimeCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/time/fingerprints/TimeCounterFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/time/fingerprints/TimeCounterFingerprint.kt
deleted file mode 100644
index 2f43eb0aac..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/time/fingerprints/TimeCounterFingerprint.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.time.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object TimeCounterFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(),
-    returnType = "V",
-    opcodes = listOf(
-        Opcode.SUB_LONG_2ADDR,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_WIDE,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.RETURN_VOID,
-    ),
-    customFingerprint = { _, classDef ->
-        // On older devices this fingerprint resolves very slowly.
-        // Speed this up by checking for the number of methods.
-        classDef.methods.count() == 14
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt b/main/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt
deleted file mode 100644
index 8753a78461..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.time.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.time.annotations.HideTimeCompatibility
-import app.revanced.patches.youtube.layout.hide.time.fingerprints.TimeCounterFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide timestamp")
-@Description("Hides timestamp in video player.")
-@HideTimeCompatibility
-class HideTimestampPatch : BytecodePatch(
-    listOf(
-        TimeCounterFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_timestamp",
-                StringResource("revanced_hide_timestamp_title", "Hide video timestamp"),
-                StringResource("revanced_hide_timestamp_summary_on", "Timestamp is hidden"),
-                StringResource("revanced_hide_timestamp_summary_off", "Timestamp is shown")
-            )
-        )
-
-        TimeCounterFingerprint.result?.apply {
-            mutableMethod.addInstructionsWithLabels(
-            0,
-            """
-                invoke-static { }, Lapp/revanced/integrations/patches/HideTimestampPatch;->hideTimestamp()Z
-                move-result v0
-                if-eqz v0, :hide_time
-                return-void
-                :hide_time
-                nop
-            """
-            )
-        } ?: return TimeCounterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWatermarkCompatibility.kt b/main/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWatermarkCompatibility.kt
deleted file mode 100644
index 687b506545..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/watermark/annotations/HideWatermarkCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watermark.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideWatermarkCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkFingerprint.kt
deleted file mode 100644
index b34c9a99ab..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watermark.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object HideWatermarkFingerprint : MethodFingerprint (
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkParentFingerprint.kt
deleted file mode 100644
index 444fadd524..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/watermark/fingerprints/HideWatermarkParentFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watermark.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object HideWatermarkParentFingerprint : MethodFingerprint (
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming")
-)
diff --git a/main/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt b/main/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt
deleted file mode 100644
index c9e5694efe..0000000000
--- a/main/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.watermark.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.watermark.annotations.HideWatermarkCompatibility
-import app.revanced.patches.youtube.layout.hide.watermark.fingerprints.HideWatermarkFingerprint
-import app.revanced.patches.youtube.layout.hide.watermark.fingerprints.HideWatermarkParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Hide watermark")
-@Description("Hides creator's watermarks on videos.")
-@HideWatermarkCompatibility
-class HideWatermarkPatch : BytecodePatch(
-    listOf(
-        HideWatermarkParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_video_watermark",
-                StringResource("revanced_hide_video_watermark_title", "Hide creator watermark on videos"),
-                StringResource("revanced_hide_video_watermark_summary_on", "Watermark is hidden"),
-                StringResource("revanced_hide_video_watermark_summary_off", "Watermark is shown")
-            )
-        )
-
-        HideWatermarkFingerprint.resolve(context, HideWatermarkParentFingerprint.result!!.classDef)
-        val result = HideWatermarkFingerprint.result
-            ?: return PatchResultError("Required parent method could not be found.")
-
-        val method = result.mutableMethod
-        val line = method.implementation!!.instructions.size - 5
-
-        method.removeInstruction(line)
-        method.addInstructions(
-            line,
-            """
-                invoke-static {}, Lapp/revanced/integrations/patches/BrandingWaterMarkPatch;->isBrandingWatermarkShown()Z
-                move-result p2
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt b/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt
deleted file mode 100644
index 11dbf8842f..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/annotations/FullscreenPanelsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.fullscreen.remove.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class FullscreenPanelsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderFingerprint.kt b/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderFingerprint.kt
deleted file mode 100644
index 7d7429ca16..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.fullscreen.remove.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object FullscreenViewAdderFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.IGET_BOOLEAN
-    )
-)
diff --git a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderParentFingerprint.kt
deleted file mode 100644
index 9a1bb42194..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/fingerprints/FullscreenViewAdderParentFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.fullscreen.remove.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object FullscreenViewAdderParentFingerprint : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "Landroid/view/View;"),
-    opcodes = listOf(
-        Opcode.GOTO,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQ,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("FullscreenEngagementPanelOverlay;")
-    }
-)
diff --git a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/patch/FullscreenPanelsRemoverPatch.kt b/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/patch/FullscreenPanelsRemoverPatch.kt
deleted file mode 100644
index ab36bb8850..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/fullscreen/remove/patch/FullscreenPanelsRemoverPatch.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.fullscreen.remove.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.panels.fullscreen.remove.annotations.FullscreenPanelsCompatibility
-import app.revanced.patches.youtube.layout.panels.fullscreen.remove.fingerprints.FullscreenViewAdderFingerprint
-import app.revanced.patches.youtube.layout.panels.fullscreen.remove.fingerprints.FullscreenViewAdderParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@Name("Disable fullscreen panels")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Description("Disables video description and comments panel in fullscreen view.")
-@FullscreenPanelsCompatibility
-class FullscreenPanelsRemoverPatch : BytecodePatch(
-    listOf(
-        FullscreenViewAdderParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_fullscreen_panels",
-                StringResource("revanced_hide_fullscreen_panels_title", "Hide fullscreen panels"),
-                StringResource("revanced_hide_fullscreen_panels_summary_on", "Fullscreen panels are hidden"),
-                StringResource("revanced_hide_fullscreen_panels_summary_off", "Fullscreen panels are shown")
-            )
-        )
-
-        val parentResult = FullscreenViewAdderParentFingerprint.result!!
-        FullscreenViewAdderFingerprint.resolve(context, parentResult.method, parentResult.classDef)
-        val result = FullscreenViewAdderParentFingerprint.result
-            ?: return PatchResultError("Fingerprint not resolved!")
-
-        val method = result.mutableMethod
-
-        val ifIndex = result.scanResult.patternScanResult!!.startIndex + 2
-
-        method.removeInstruction(ifIndex)
-        method.addInstructions(
-            ifIndex,
-            """
-                invoke-static {}, Lapp/revanced/integrations/patches/FullscreenPanelsRemoverPatch;->getFullscreenPanelsVisibility()I
-                move-result p1
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt b/main/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt
deleted file mode 100644
index e6da799021..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/popup/annotations/PlayerPopupPanelsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.popup.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlayerPopupPanelsCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/panels/popup/fingerprints/EngagementPanelControllerFingerprint.kt b/main/app/revanced/patches/youtube/layout/panels/popup/fingerprints/EngagementPanelControllerFingerprint.kt
deleted file mode 100644
index a2c94e6f49..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/popup/fingerprints/EngagementPanelControllerFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.popup.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object EngagementPanelControllerFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    strings = listOf(
-        "EngagementPanelController: cannot show EngagementPanel before EngagementPanelController.init() has been called.",
-        "[EngagementPanel] Cannot show EngagementPanel before EngagementPanelController.init() has been called."
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt b/main/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt
deleted file mode 100644
index 1f5d4c7d03..0000000000
--- a/main/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package app.revanced.patches.youtube.layout.panels.popup.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.panels.popup.annotations.PlayerPopupPanelsCompatibility
-import app.revanced.patches.youtube.layout.panels.popup.fingerprints.EngagementPanelControllerFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Disable player popup panels")
-@Description("Disables panels from appearing automatically when going into fullscreen (playlist or live chat).")
-@PlayerPopupPanelsCompatibility
-class PlayerPopupPanelsPatch : BytecodePatch(
-    listOf(
-        EngagementPanelControllerFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_player_popup_panels",
-                StringResource("revanced_hide_player_popup_panels_title", "Hide player popup panels"),
-                StringResource("revanced_hide_player_popup_panels_summary_on", "Player popup panels are hidden"),
-                StringResource("revanced_hide_player_popup_panels_summary_off", "Player popup panels are shown")
-            )
-        )
-
-        val engagementPanelControllerMethod = EngagementPanelControllerFingerprint
-            .result?.mutableMethod ?: return EngagementPanelControllerFingerprint.toErrorResult()
-
-        engagementPanelControllerMethod.addInstructionsWithLabels(
-            0,
-            """
-                invoke-static { }, Lapp/revanced/integrations/patches/DisablePlayerPopupPanelsPatch;->disablePlayerPopupPanels()Z
-                move-result v0
-                if-eqz v0, :player_popup_panels
-                if-eqz p4, :player_popup_panels
-                const/4 v0, 0x0
-                return-object v0
-                :player_popup_panels
-                nop
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/player/background/annotations/PlayerControlsBackgroundCompatibility.kt b/main/app/revanced/patches/youtube/layout/player/background/annotations/PlayerControlsBackgroundCompatibility.kt
deleted file mode 100644
index d7e6490f9b..0000000000
--- a/main/app/revanced/patches/youtube/layout/player/background/annotations/PlayerControlsBackgroundCompatibility.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.layout.player.background.annotations
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlayerControlsBackgroundCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt b/main/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt
deleted file mode 100644
index c074af3975..0000000000
--- a/main/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.player.background.patch
-
-import app.revanced.extensions.doRecursively
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.player.background.annotations.PlayerControlsBackgroundCompatibility
-import org.w3c.dom.Element
-
-@Patch(false)
-@Name("Remove player controls background")
-@Description("Removes the background from the video player controls.")
-@PlayerControlsBackgroundCompatibility
-class PlayerControlsBackgroundPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
-            editor.file.doRecursively node@{ node ->
-                if (node !is Element) return@node
-
-                node.getAttributeNode("android:color")?.let { attribute ->
-                    attribute.textContent = "@android:color/transparent"
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val RESOURCE_FILE_PATH = "res/drawable/player_button_circle_background.xml"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt
deleted file mode 100644
index 5f3dd157e9..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ReturnYouTubeDislikeCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt
deleted file mode 100644
index 63609aff7a..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object DislikeFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("like/dislike")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikesOldLayoutTextViewFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikesOldLayoutTextViewFingerprint.kt
deleted file mode 100644
index 3ac14b345e..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikesOldLayoutTextViewFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object DislikesOldLayoutTextViewFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    parameters = listOf("L"),
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.CONST, // resource identifier register
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ, // textview register
-        Opcode.GOTO,
-    ),
-    literal = ReturnYouTubeDislikeResourcePatch.oldUIDislikeId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt
deleted file mode 100644
index 53a9c0e892..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object LikeFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("like/like")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt
deleted file mode 100644
index 9c226ccf8d..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object RemoveLikeFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("like/removelike")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
deleted file mode 100644
index 1c78732d58..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ShortsTextViewFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L", "L"),
-    opcodes = listOf(
-        Opcode.INVOKE_SUPER,    // first instruction of method
-        Opcode.IF_NEZ,
-        Opcode.RETURN_VOID,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.SGET_OBJECT,     // insertion point, must be after constructor call to parent class
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.RETURN_VOID,
-        Opcode.IGET_OBJECT,     // TextView field
-        Opcode.CHECK_CAST,
-        Opcode.IGET_BOOLEAN,    // boolean field
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
deleted file mode 100644
index c5955c0f28..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentAtomicReferenceFingerprint.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-/**
- * Resolves against the same method that [TextComponentContextFingerprint] resolves to.
- */
-object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.MOVE_OBJECT_FROM16, // available unused register
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.INVOKE_VIRTUAL, // CharSequence atomic reference
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.MOVE_OBJECT, // CharSequence reference, and control flow label. Insert code here.
-        null, // invoke-interface or invoke-virtual
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        null, // invoke-interface or invoke-virtual
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.GOTO,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentConstructorFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentConstructorFingerprint.kt
deleted file mode 100644
index 5f5c188443..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentConstructorFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object TextComponentConstructorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.CONSTRUCTOR or AccessFlags.PRIVATE,
-    strings = listOf("TextComponent")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt
deleted file mode 100644
index 7e4d3141f9..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentContextFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-/**
- * Resolves against the same class that [TextComponentConstructorFingerprint] resolves to.
- */
-object TextComponentContextFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT, // conversion context field name
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IGET,
-        Opcode.IGET,
-        Opcode.IGET,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
deleted file mode 100644
index f55afa7674..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
-import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.*
-import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Patch
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        VideoIdPatch::class,
-        ReturnYouTubeDislikeResourcePatch::class,
-        PlayerTypeHookPatch::class,
-    ]
-)
-@Name("Return YouTube Dislike")
-@Description("Shows the dislike count of videos using the Return YouTube Dislike API.")
-@ReturnYouTubeDislikeCompatibility
-class ReturnYouTubeDislikePatch : BytecodePatch(
-    listOf(
-        TextComponentConstructorFingerprint,
-        ShortsTextViewFingerprint,
-        DislikesOldLayoutTextViewFingerprint,
-        LikeFingerprint,
-        DislikeFingerprint,
-        RemoveLikeFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
-
-        VideoIdPatch.injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
-
-        // endregion
-
-        // region Hook like/dislike/remove like button clicks to send votes to the API.
-
-        listOf(
-            LikeFingerprint.toPatch(Vote.LIKE),
-            DislikeFingerprint.toPatch(Vote.DISLIKE),
-            RemoveLikeFingerprint.toPatch(Vote.REMOVE_LIKE)
-        ).forEach { (fingerprint, vote) ->
-            fingerprint.result?.mutableMethod?.apply {
-                addInstructions(
-                    0,
-                    """
-                        const/4 v0, ${vote.value}
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->sendVote(I)V
-                    """
-                )
-            } ?: return PatchResultError("Failed to find ${fingerprint.name} method.")
-        }
-
-        // endregion
-
-        // region Hook creation of Spans and the cached lookup of them.
-
-        // Alternatively the hook can be made at the creation of Spans in TextComponentSpec,
-        // And it works in all situations except it fails to update the Span when the user dislikes,
-        // since the underlying (likes only) text did not change.
-        // This hook handles all situations, as it's where the created Spans are stored and later reused.
-        TextComponentContextFingerprint.also {
-            it.resolve(
-                context,
-                TextComponentConstructorFingerprint.result!!.classDef
-            )
-        }.result?.also { result ->
-            if (!TextComponentAtomicReferenceFingerprint.resolve(context, result.method, result.classDef))
-                throw TextComponentAtomicReferenceFingerprint.toErrorResult()
-        }?.let { textComponentContextFingerprintResult ->
-            val conversionContextIndex = textComponentContextFingerprintResult
-                .scanResult.patternScanResult!!.startIndex
-            val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!!
-                .scanResult.patternScanResult!!.startIndex
-
-            val insertIndex = atomicReferenceStartIndex + 7
-
-            textComponentContextFingerprintResult.mutableMethod.apply {
-                // Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
-                val conversionContextFieldReference =
-                    getInstruction<ReferenceInstruction>(conversionContextIndex).reference
-
-                // any free register
-                val contextRegister =
-                    getInstruction<TwoRegisterInstruction>(atomicReferenceStartIndex).registerB
-
-                val atomicReferenceRegister =
-                    getInstruction<FiveRegisterInstruction>(atomicReferenceStartIndex + 4).registerC
-
-                val moveCharSequenceInstruction = getInstruction<TwoRegisterInstruction>(insertIndex)
-                val charSequenceRegister = moveCharSequenceInstruction.registerB
-
-                // Insert as first instructions at the control flow label.
-                // Must replace the existing instruction to preserve the label, and then insert the remaining instructions.
-                replaceInstruction(insertIndex, "move-object/from16 v$contextRegister, p0")
-                addInstructions(
-                    insertIndex + 1,
-                    """
-                        iget-object v$contextRegister, v$contextRegister, $conversionContextFieldReference  # copy obfuscated context field into free register
-                        invoke-static {v$contextRegister, v$atomicReferenceRegister, v$charSequenceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-                        move-result-object v$charSequenceRegister
-                        move-object v${moveCharSequenceInstruction.registerA}, v${charSequenceRegister}  # original instruction at the insertion point
-                    """
-                )
-            }
-        } ?: return TextComponentContextFingerprint.toErrorResult()
-
-        // endregion
-
-        // region Hook for Short videos.
-
-        ShortsTextViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val patternResult = it.scanResult.patternScanResult!!
-
-                // If the field is true, the TextView is for a dislike button.
-                val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
-
-                val textViewFieldReference = // Like/Dislike button TextView field
-                    getInstruction<ReferenceInstruction>(patternResult.endIndex - 2).reference
-
-                // Check if the hooked TextView object is that of the dislike button.
-                // If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
-                // Otherwise, the TextView object is modified, and the execution flow is interrupted to prevent it from being changed afterward.
-                val insertIndex = patternResult.startIndex + 6
-                addInstructionsWithLabels(
-                    insertIndex,
-                    """
-                        # Check, if the TextView is for a dislike button
-                        iget-boolean v0, p0, $isDisLikesBooleanReference
-                        if-eqz v0, :is_like
-                        
-                        # Hook the TextView, if it is for the dislike button
-                        iget-object v0, p0, $textViewFieldReference
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->setShortsDislikes(Landroid/view/View;)Z
-                        move-result v0
-                        if-eqz v0, :ryd_disabled
-                        return-void
-                       
-                        :is_like
-                        :ryd_disabled
-                        nop
-                    """
-                )
-            }
-        } ?: return ShortsTextViewFingerprint.toErrorResult()
-
-        // endregion
-
-        // region Hook old UI layout dislikes, for the older app spoofs used with spoof-app-version.
-
-        DislikesOldLayoutTextViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val startIndex = it.scanResult.patternScanResult!!.startIndex
-
-                val resourceIdentifierRegister = getInstruction<OneRegisterInstruction>(startIndex).registerA
-                val textViewRegister = getInstruction<OneRegisterInstruction>(startIndex + 4).registerA
-
-                addInstruction(
-                    startIndex + 4,
-                    "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V"
-                )
-            }
-        } ?: return DislikesOldLayoutTextViewFingerprint.toErrorResult()
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;"
-
-        private fun MethodFingerprint.toPatch(voteKind: Vote) = VotePatch(this, voteKind)
-        private data class VotePatch(val fingerprint: MethodFingerprint, val voteKind: Vote)
-        private enum class Vote(val value: Int) {
-            LIKE(1),
-            DISLIKE(-1),
-            REMOVE_LIKE(0)
-        }
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt b/main/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt
deleted file mode 100644
index 75cd1915a6..0000000000
--- a/main/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.Preference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-
-@DependsOn([SettingsPatch::class])
-class ReturnYouTubeDislikeResourcePatch : ResourcePatch {
-    companion object {
-        internal var oldUIDislikeId: Long = -1
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.addPreference(
-            Preference(
-                StringResource("revanced_ryd_settings_title", "Return YouTube Dislike"),
-                StringResource("revanced_ryd_settings_summary", "Settings for Return YouTube Dislike"),
-                SettingsPatch.createReVancedSettingsIntent("ryd_settings")
-            )
-        )
-        // merge strings
-        context.mergeStrings("returnyoutubedislike/host/values/strings.xml")
-
-        oldUIDislikeId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "id" && it.name == "dislike_button"
-        }.id
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt b/main/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt
deleted file mode 100644
index 1fe97fe007..0000000000
--- a/main/app/revanced/patches/youtube/layout/searchbar/annotations/WideSearchbarCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.searchbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class WideSearchbarCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/CreateSearchSuggestionsFingerprint.kt b/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/CreateSearchSuggestionsFingerprint.kt
deleted file mode 100644
index bef00e2f3a..0000000000
--- a/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/CreateSearchSuggestionsFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.searchbar.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object CreateSearchSuggestionsFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4
-    ),
-    strings = listOf("ss_rds")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/SetWordmarkHeaderFingerprint.kt b/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/SetWordmarkHeaderFingerprint.kt
deleted file mode 100644
index 836b1aa86b..0000000000
--- a/main/app/revanced/patches/youtube/layout/searchbar/fingerprints/SetWordmarkHeaderFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.layout.searchbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SetWordmarkHeaderFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Landroid/widget/ImageView;"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_STATIC,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt b/main/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
deleted file mode 100644
index d31a5a25e4..0000000000
--- a/main/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package app.revanced.patches.youtube.layout.searchbar.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.searchbar.annotations.WideSearchbarCompatibility
-import app.revanced.patches.youtube.layout.searchbar.fingerprints.CreateSearchSuggestionsFingerprint
-import app.revanced.patches.youtube.layout.searchbar.fingerprints.SetWordmarkHeaderFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Wide searchbar")
-@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
-@WideSearchbarCompatibility
-class WideSearchbarPatch : BytecodePatch(
-    listOf(
-        SetWordmarkHeaderFingerprint, CreateSearchSuggestionsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_wide_searchbar",
-                StringResource("revanced_wide_searchbar_enabled_title", "Enable wide search bar"),
-                StringResource("revanced_wide_searchbar_summary_on", "Wide search bar is enabled"),
-                StringResource("revanced_wide_searchbar_summary_off", "Wide search bar is disabled")
-            )
-        )
-
-        val result = CreateSearchSuggestionsFingerprint.result ?: return CreateSearchSuggestionsFingerprint.toErrorResult()
-
-        // patch methods
-        mapOf(
-            SetWordmarkHeaderFingerprint to 1,
-            CreateSearchSuggestionsFingerprint to result.scanResult.patternScanResult!!.startIndex
-        ).forEach { (fingerprint, callIndex) ->
-            context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        /**
-         * Walk a fingerprints method at a given index mutably.
-         *
-         * @param index The index to walk at.
-         * @param fromFingerprint The fingerprint to walk the method on.
-         * @return The [MutableMethod] which was walked on.
-         */
-        fun BytecodeContext.walkMutable(index: Int, fromFingerprint: MethodFingerprint) =
-            fromFingerprint.result?.let {
-                toMethodWalker(it.method).nextMethod(index, true).getMethod() as MutableMethod
-            } ?: throw fromFingerprint.toErrorResult()
-
-
-        /**
-         * Injects instructions required for certain methods.
-         */
-        fun MutableMethod.injectSearchBarHook() {
-            addInstructions(
-                implementation!!.instructions.size - 1,
-                """
-                    invoke-static {}, Lapp/revanced/integrations/patches/WideSearchbarPatch;->enableWideSearchbar()Z
-                    move-result p0
-                """
-            )
-        }
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/annotations/SeekbarColorCompatibility.kt b/main/app/revanced/patches/youtube/layout/seekbar/annotations/SeekbarColorCompatibility.kt
deleted file mode 100644
index 845bbff948..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/annotations/SeekbarColorCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SeekbarColorCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/PlayerSeekbarColorFingerprint.kt b/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/PlayerSeekbarColorFingerprint.kt
deleted file mode 100644
index 0c325dd868..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/PlayerSeekbarColorFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints
-
-import app.revanced.extensions.containsConstantInstructionValue
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
-import org.jf.dexlib2.AccessFlags
-
-object PlayerSeekbarColorFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    customFingerprint = { method, _ ->
-        method.containsConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
-                && method.containsConstantInstructionValue(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/SetSeekbarClickedColorFingerprint.kt b/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/SetSeekbarClickedColorFingerprint.kt
deleted file mode 100644
index 1ebccca759..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/SetSeekbarClickedColorFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object SetSeekbarClickedColorFingerprint : MethodFingerprint(
-    opcodes = listOf(Opcode.CONST_HIGH16),
-    strings = listOf("YOUTUBE", "PREROLL", "POSTROLL"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ControlsOverlayStyle;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/ShortsSeekbarColorFingerprint.kt b/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/ShortsSeekbarColorFingerprint.kt
deleted file mode 100644
index eea70852a6..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/fingerprints/ShortsSeekbarColorFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object ShortsSeekbarColorFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    literal = SeekbarColorResourcePatch.reelTimeBarPlayedColorId,
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt b/main/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt
deleted file mode 100644
index 156203606e..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.bytecode.patch
-
-import app.revanced.extensions.indexOfFirstConstantInstructionValue
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.layout.seekbar.annotations.SeekbarColorCompatibility
-import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.PlayerSeekbarColorFingerprint
-import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.SetSeekbarClickedColorFingerprint
-import app.revanced.patches.youtube.layout.seekbar.bytecode.fingerprints.ShortsSeekbarColorFingerprint
-import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarColorResourcePatch
-import app.revanced.patches.youtube.layout.theme.bytecode.patch.LithoColorHookPatch
-import app.revanced.patches.youtube.layout.theme.bytecode.patch.LithoColorHookPatch.Companion.lithoColorOverrideHook
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-
-@Description("Hide or set a custom seekbar color")
-@DependsOn([IntegrationsPatch::class, LithoColorHookPatch::class, SeekbarColorResourcePatch::class])
-@SeekbarColorCompatibility
-class SeekbarColorBytecodePatch : BytecodePatch(
-    listOf(PlayerSeekbarColorFingerprint, ShortsSeekbarColorFingerprint, SetSeekbarClickedColorFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
-            var registerIndex = indexOfFirstConstantInstructionValue(resourceId) + 2
-            var colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
-            addInstructions(
-                registerIndex + 1,
-                """
-                        invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
-                        move-result v$colorRegister
-                    """
-            )
-        }
-
-        PlayerSeekbarColorFingerprint.result?.mutableMethod?.apply {
-            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
-            addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
-        } ?: return PlayerSeekbarColorFingerprint.toErrorResult()
-
-        ShortsSeekbarColorFingerprint.result?.mutableMethod?.apply {
-            addColorChangeInstructions(SeekbarColorResourcePatch.reelTimeBarPlayedColorId)
-        } ?: return ShortsSeekbarColorFingerprint.toErrorResult()
-
-        SetSeekbarClickedColorFingerprint.result?.let { result ->
-            result.mutableMethod.let {
-                val setColorMethodIndex = result.scanResult.patternScanResult!!.startIndex + 1
-                val method = context
-                    .toMethodWalker(it)
-                    .nextMethod(setColorMethodIndex, true)
-                    .getMethod() as MutableMethod
-
-                method.apply {
-                    val colorRegister = getInstruction<TwoRegisterInstruction>(0).registerA
-                    addInstructions(
-                        0,
-                        """
-                            invoke-static { v$colorRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getVideoPlayerSeekbarClickedColor(I)I
-                            move-result v$colorRegister
-                        """
-                    )
-                }
-            }
-        } ?: return SetSeekbarClickedColorFingerprint.toErrorResult()
-
-        lithoColorOverrideHook(INTEGRATIONS_CLASS_DESCRIPTOR, "getLithoColor")
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/theme/SeekbarColorPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt b/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt
deleted file mode 100644
index c120165657..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.resource
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.w3c.dom.Element
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class SeekbarColorResourcePatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
-        fun findColorResource(resourceName: String): Long {
-            return ResourceMappingPatch.resourceMappings
-                .find { it.type == "color" && it.name == resourceName }?.id
-            ?: throw PatchResultError("Could not find color resource: $resourceName")
-        }
-
-        reelTimeBarPlayedColorId =
-            findColorResource("reel_time_bar_played_color")
-        inlineTimeBarColorizedBarPlayedColorDarkId =
-            findColorResource("inline_time_bar_colorized_bar_played_color_dark")
-        inlineTimeBarPlayedNotHighlightedColorId =
-            findColorResource("inline_time_bar_played_not_highlighted_color")
-
-        // Edit the resume playback drawable and replace the progress bar with a custom drawable
-        context.xmlEditor["res/drawable/resume_playback_progressbar_drawable.xml"].use { editor ->
-            val layerList = editor.file.getElementsByTagName("layer-list").item(0) as Element
-            val progressNode = layerList.getElementsByTagName("item").item(1) as Element
-            if (!progressNode.getAttributeNode("android:id").value.endsWith("progress")) {
-                return PatchResultError("Could not find progress bar")
-            }
-            val scaleNode = progressNode.getElementsByTagName("scale").item(0) as Element
-            val shapeNode = scaleNode.getElementsByTagName("shape").item(0) as Element
-            val replacementNode = editor.file.createElement(
-                "app.revanced.integrations.patches.theme.ProgressBarDrawable")
-            scaleNode.replaceChild(replacementNode, shapeNode)
-        }
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        internal var reelTimeBarPlayedColorId = -1L
-        internal var inlineTimeBarColorizedBarPlayedColorDarkId = -1L
-        internal var inlineTimeBarPlayedNotHighlightedColorId = -1L
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt b/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt
deleted file mode 100644
index 17a3f168e2..0000000000
--- a/main/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.patches.youtube.layout.seekbar.resource
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.BasePreference
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import java.io.Closeable
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class SeekbarPreferencesPatch : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
-
-        // Nothing to do here. All work is done in close method.
-
-        return PatchResultSuccess()
-    }
-
-    override fun close() {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            PreferenceScreen(
-                "revanced_seekbar_preference_screen",
-                StringResource("revanced_seekbar_preference_screen_title", "Seekbar settings"),
-                seekbarPreferences
-            )
-        )
-    }
-
-    companion object {
-        private val seekbarPreferences = mutableListOf<BasePreference>()
-
-        internal fun addPreferences(vararg preferencesToAdd: BasePreference) {
-            seekbarPreferences.addAll(preferencesToAdd)
-        }
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
deleted file mode 100644
index 7eefbbd531..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SponsorBlockCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/AppendTimeFingerprint.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/AppendTimeFingerprint.kt
deleted file mode 100644
index 950c74602b..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/AppendTimeFingerprint.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object AppendTimeFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("Ljava/lang/CharSequence;", "Ljava/lang/CharSequence;", "Ljava/lang/CharSequence;"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ControlsOverlayFingerprint.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ControlsOverlayFingerprint.kt
deleted file mode 100644
index a537a12f25..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ControlsOverlayFingerprint.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ControlsOverlayFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST, // R.id.inset_overlay_view_layout
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/apps/youtube/app/player/overlay/YouTubeControlsOverlay;"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt
deleted file mode 100644
index 9aa72efba3..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
-    "V",
-    customFingerprint = custom@{ methodDef, _ ->
-        val instructions = methodDef.implementation?.instructions!!
-        val instructionCount = instructions.count()
-
-        // the method has definitely more than 5 instructions
-        if (instructionCount < 5) return@custom false
-
-        val referenceInstruction = instructions.elementAt(instructionCount - 2) // the second to last instruction
-        val reference = ((referenceInstruction as? ReferenceInstruction)?.reference as? MethodReference)
-
-        reference?.parameterTypes?.size == 1 && reference.name == "invalidate" // the reference is the invalidate(..) method
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
deleted file mode 100644
index 84450c9b04..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ /dev/null
@@ -1,282 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
-import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.AppendTimeFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.ControlsOverlayFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.RectangleFieldInvalidatorFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
-import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
-import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.*
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.iface.reference.StringReference
-
-@Patch
-@DependsOn(
-    [
-        IntegrationsPatch::class,
-        VideoIdPatch::class,
-        // Required to skip segments on time.
-        VideoInformationPatch::class,
-        // Used to prevent SponsorBlock from running on Shorts because SponsorBlock does not yet support Shorts.
-        PlayerTypeHookPatch::class,
-        PlayerControlsBytecodePatch::class,
-        SponsorBlockResourcePatch::class,
-    ]
-)
-@Name("SponsorBlock")
-@Description("Integrates SponsorBlock which allows skipping video segments such as sponsored content.")
-@SponsorBlockCompatibility
-class SponsorBlockBytecodePatch : BytecodePatch(
-    listOf(
-        SeekbarFingerprint,
-        AppendTimeFingerprint,
-        ControlsOverlayFingerprint,
-        AutoRepeatParentFingerprint,
-    )
-) {
-
-    private companion object {
-        const val INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;"
-        const val INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/sponsorblock/ui/CreateSegmentButtonController;"
-        const val INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/sponsorblock/ui/VotingButtonController;"
-        const val INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/sponsorblock/ui/SponsorBlockViewController;"
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        /*
-         * Hook the video time methods
-         */
-        with(VideoInformationPatch) {
-            videoTimeHook(
-                INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR,
-                "setVideoTime"
-            )
-        }
-
-        /*
-         * Set current video id
-         */
-        VideoIdPatch.injectCallBackgroundPlay("$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
-
-        /*
-         * Seekbar drawing
-         */
-        val seekbarSignatureResult = SeekbarFingerprint.result!!.let {
-            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
-        }.result!!
-        val seekbarMethod = seekbarSignatureResult.mutableMethod
-        val seekbarMethodInstructions = seekbarMethod.implementation!!.instructions
-
-        /*
-         * Get left and right of seekbar rectangle
-         */
-        val moveRectangleToRegisterIndex = seekbarMethodInstructions.indexOfFirst {
-            it.opcode == Opcode.MOVE_OBJECT_FROM16
-        }
-
-        seekbarMethod.addInstruction(
-            moveRectangleToRegisterIndex + 1,
-            "invoke-static/range {p0 .. p0}, " +
-                    "$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
-        )
-
-        for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
-            if (instruction.opcode != Opcode.INVOKE_STATIC) continue
-
-            val invokeInstruction = instruction as Instruction35c
-            if ((invokeInstruction.reference as MethodReference).name != "round") continue
-
-            val insertIndex = index + 2
-
-            // set the thickness of the segment
-            seekbarMethod.addInstruction(
-                insertIndex,
-                "invoke-static {v${invokeInstruction.registerC}}, " +
-                        "$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V"
-            )
-            break
-        }
-
-        /*
-         * Draw segment
-         */
-        // Find the drawCircle call and draw the segment before it
-        for (i in seekbarMethodInstructions.size - 1 downTo 0) {
-            val invokeInstruction = seekbarMethodInstructions[i] as? ReferenceInstruction ?: continue
-            if ((invokeInstruction.reference as MethodReference).name != "drawCircle") continue
-
-            val (canvasInstance, centerY) = (invokeInstruction as FiveRegisterInstruction).let {
-                it.registerC to it.registerE
-            }
-            seekbarMethod.addInstruction(
-                i,
-                "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
-            )
-
-            break
-        }
-
-        /*
-         * Voting & Shield button
-         */
-        val controlsMethodResult = PlayerControlsBytecodePatch.showPlayerControlsFingerprintResult
-
-        val controlsLayoutStubResourceId =
-            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "controls_layout_stub" }.id
-        val zoomOverlayResourceId =
-            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "video_zoom_overlay_stub" }.id
-
-        methods@ for (method in controlsMethodResult.mutableClass.methods) {
-            val instructions = method.implementation?.instructions!!
-            instructions@ for ((index, instruction) in instructions.withIndex()) {
-                // search for method which inflates the controls layout view
-                if (instruction.opcode != Opcode.CONST) continue@instructions
-
-                when ((instruction as NarrowLiteralInstruction).wideLiteral) {
-                    controlsLayoutStubResourceId -> {
-                        // replace the view with the YouTubeControlsOverlay
-                        val moveResultInstructionIndex = index + 5
-                        val inflatedViewRegister =
-                            (instructions[moveResultInstructionIndex] as OneRegisterInstruction).registerA
-                        // initialize with the player overlay object
-                        method.addInstructions(
-                            moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register
-                            """
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
-                                invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/View;)V
-                            """
-                        )
-                    }
-
-                    zoomOverlayResourceId -> {
-                        val invertVisibilityMethod =
-                            context.toMethodWalker(method).nextMethod(index - 6, true).getMethod() as MutableMethod
-                        // change visibility of the buttons
-                        invertVisibilityMethod.addInstructions(
-                            0,
-                            """
-                                invoke-static {p1}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
-                                invoke-static {p1}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
-                            """.trimIndent()
-                        )
-                    }
-                }
-            }
-        }
-
-        // change visibility of the buttons
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
-
-        // append the new time to the player layout
-        val appendTimeFingerprintResult = AppendTimeFingerprint.result!!
-        val appendTimePatternScanStartIndex = appendTimeFingerprintResult.scanResult.patternScanResult!!.startIndex
-        val targetRegister =
-            (appendTimeFingerprintResult.method.implementation!!.instructions.elementAt(appendTimePatternScanStartIndex + 1) as OneRegisterInstruction).registerA
-
-        appendTimeFingerprintResult.mutableMethod.addInstructions(
-            appendTimePatternScanStartIndex + 2,
-            """
-                invoke-static {v$targetRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
-                move-result-object v$targetRegister
-            """
-        )
-
-        // initialize the player controller
-        VideoInformationPatch.onCreateHook(INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR, "initialize")
-
-        // initialize the sponsorblock view
-        ControlsOverlayFingerprint.result?.let {
-            val startIndex = it.scanResult.patternScanResult!!.startIndex
-            it.mutableMethod.apply {
-                val frameLayoutRegister = (getInstruction(startIndex + 2) as OneRegisterInstruction).registerA
-                addInstruction(
-                    startIndex + 3,
-                    "invoke-static {v$frameLayoutRegister}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/ViewGroup;)V"
-                )
-            }
-        }  ?: return ControlsOverlayFingerprint.toErrorResult()
-
-        // get rectangle field name
-        RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
-        val rectangleFieldInvalidatorInstructions =
-            RectangleFieldInvalidatorFingerprint.result!!.method.implementation!!.instructions
-        val rectangleFieldName =
-            ((rectangleFieldInvalidatorInstructions.elementAt(rectangleFieldInvalidatorInstructions.count() - 3) as ReferenceInstruction).reference as FieldReference).name
-
-        // replace the "replaceMeWith*" strings
-        context
-            .proxy(context.classes.first { it.type.endsWith("SegmentPlaybackController;") })
-            .mutableClass
-            .methods
-            .find { it.name == "setSponsorBarRect" }
-            ?.let { method ->
-                fun MutableMethod.replaceStringInstruction(index: Int, instruction: Instruction, with: String) {
-                    val register = (instruction as OneRegisterInstruction).registerA
-                    this.replaceInstruction(
-                        index, "const-string v$register, \"$with\""
-                    )
-                }
-                for ((index, it) in method.implementation!!.instructions.withIndex()) {
-                    if (it.opcode.ordinal != Opcode.CONST_STRING.ordinal) continue
-
-                    when (((it as ReferenceInstruction).reference as StringReference).string) {
-                        "replaceMeWithsetSponsorBarRect" -> method.replaceStringInstruction(
-                            index,
-                            it,
-                            rectangleFieldName
-                        )
-                    }
-                }
-            } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
-
-
-        // The vote and create segment buttons automatically change their visibility when appropriate,
-        // but if buttons are showing when the end of the video is reached then they will not automatically hide.
-        // Add a hook to forcefully hide when the end of the video is reached.
-        AutoRepeatParentFingerprint.result ?: return AutoRepeatParentFingerprint.toErrorResult()
-        AutoRepeatFingerprint.also {
-            it.resolve(context, AutoRepeatParentFingerprint.result!!.classDef)
-        }.result?.mutableMethod?.addInstruction(
-            0,
-            "invoke-static {}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->endOfVideoReached()V"
-        ) ?: return AutoRepeatFingerprint.toErrorResult()
-
-        // TODO: isSBChannelWhitelisting implementation
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt b/main/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
deleted file mode 100644
index d579bbea68..0000000000
--- a/main/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.resource.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.Preference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import app.revanced.util.resources.ResourceUtils.copyXmlNode
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class SponsorBlockResourcePatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.addPreference(
-            Preference(
-                StringResource("revanced_sponsorblock_settings_title", "SponsorBlock"),
-                StringResource("revanced_sponsorblock_settings_summary", "SponsorBlock related settings"),
-                SettingsPatch.createReVancedSettingsIntent("sponsorblock_settings")
-            )
-        )
-        val classLoader = this.javaClass.classLoader
-
-        /*
-         merge SponsorBlock strings to main strings
-         */
-        context.mergeStrings("sponsorblock/host/values/strings.xml")
-
-        /*
-         merge SponsorBlock drawables to main drawables
-         */
-
-        arrayOf(
-            ResourceUtils.ResourceGroup(
-                "layout",
-                "inline_sponsor_overlay.xml",
-                "new_segment.xml",
-                "skip_sponsor_button.xml"
-            ),
-            ResourceUtils.ResourceGroup(
-                // required resource for back button, because when the base APK is used, this resource will not exist
-                "drawable",
-                "ic_sb_adjust.xml",
-                "ic_sb_compare.xml",
-                "ic_sb_edit.xml",
-                "ic_sb_logo.xml",
-                "ic_sb_publish.xml",
-                "ic_sb_voting.xml"
-            ),
-            ResourceUtils.ResourceGroup(
-                // required resource for back button, because when the base APK is used, this resource will not exist
-                "drawable-xxxhdpi", "quantum_ic_skip_next_white_24.png"
-            )
-        ).forEach { resourceGroup ->
-            context.copyResources("sponsorblock", resourceGroup)
-        }
-
-        /*
-        merge xml nodes from the host to their real xml files
-         */
-
-        // copy nodes from host resources to their real xml files
-        val hostingResourceStream =
-            classLoader.getResourceAsStream("sponsorblock/host/layout/youtube_controls_layout.xml")!!
-
-        val targetXmlEditor = context.xmlEditor["res/layout/youtube_controls_layout.xml"]
-        "RelativeLayout".copyXmlNode(
-            context.xmlEditor[hostingResourceStream],
-            targetXmlEditor
-        ).also {
-            val children = targetXmlEditor.file.getElementsByTagName("RelativeLayout").item(0).childNodes
-
-            // Replace the startOf with the voting button view so that the button does not overlap
-            for (i in 1 until children.length) {
-                val view = children.item(i)
-
-                // Replace the attribute for a specific node only
-                if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("live_chat_overlay_button"))) continue
-
-                // voting button id from the voting button view from the youtube_controls_layout.xml host file
-                val votingButtonId = "@+id/sb_voting_button"
-
-                view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
-
-                break
-            }
-        }.close() // close afterwards
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt b/main/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt
deleted file mode 100644
index 04740e6fbb..0000000000
--- a/main/app/revanced/patches/youtube/layout/spoofappversion/annotations/SpoofAppVersionCompatibility.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.spoofappversion.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class SpoofAppVersionCompatibility
-
diff --git a/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/fingerprints/SpoofAppVersionFingerprint.kt b/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/fingerprints/SpoofAppVersionFingerprint.kt
deleted file mode 100644
index 8a5736f128..0000000000
--- a/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/fingerprints/SpoofAppVersionFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.spoofappversion.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SpoofAppVersionFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.CONST_STRING,
-    ),
-
-    // Instead of applying a bytecode patch, it might be possible to only rely on code from the integrations and
-    // manually set the desired version string as this keyed value in the SharedPreferences.
-    // But, this bytecode patch is simple and it works.
-    strings = listOf("pref_override_build_version_name")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt b/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt
deleted file mode 100644
index d2fb20c422..0000000000
--- a/main/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package app.revanced.patches.youtube.layout.spoofappversion.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.spoofappversion.annotations.SpoofAppVersionCompatibility
-import app.revanced.patches.youtube.layout.spoofappversion.bytecode.fingerprints.SpoofAppVersionFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Spoof app version")
-@Description("Tricks YouTube into thinking you are running an older version of the app. One of the side effects also includes restoring the old UI.")
-@SpoofAppVersionCompatibility
-class SpoofAppVersionPatch : BytecodePatch(
-    listOf(
-        SpoofAppVersionFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_spoof_app_version",
-                StringResource("revanced_spoof_app_version_title", "Spoof app version"),
-                StringResource("revanced_spoof_app_version_summary_on", "Version spoofed"),
-                StringResource("revanced_spoof_app_version_summary_off", "Version not spoofed"),
-                StringResource("revanced_spoof_app_version_user_dialog_message",
-                "App version will be spoofed to an older version of YouTube."
-                        + "\\n\\nThis will change the appearance and features of the app, but unknown side effects may occur."
-                        + "\\n\\nIf later turned off, the old UI may remain until the app data is cleared.")
-            ),
-            ListPreference(
-                "revanced_spoof_app_version_target",
-                StringResource(
-                    "revanced_spoof_app_version_target_title",
-                    "Spoof app version target"
-                ),
-                ArrayResource(
-                    "revanced_spoof_app_version_target_entries",
-                    listOf(
-                        StringResource("revanced_spoof_app_version_target_entry_1", "17.08.35 - Restore old UI layout"),
-                        StringResource("revanced_spoof_app_version_target_entry_2", "16.08.35 - Restore explore tab"),
-                        StringResource("revanced_spoof_app_version_target_entry_3", "16.01.35 - Restore old Shorts player"),
-                    )
-                ),
-                ArrayResource(
-                    "revanced_spoof_app_version_target_entry_values",
-                    listOf(
-                        StringResource("revanced_spoof_app_version_target_entry_value_1", "17.08.35"),
-                        StringResource("revanced_spoof_app_version_target_entry_value_2", "16.08.35"),
-                        StringResource("revanced_spoof_app_version_target_entry_value_3", "16.01.35"),
-                    )
-                )
-            )
-        )
-
-        SpoofAppVersionFingerprint.result?.apply {
-            val insertIndex = scanResult.patternScanResult!!.startIndex + 1
-            val buildOverrideNameRegister =
-                (mutableMethod.implementation!!.instructions[insertIndex - 1] as OneRegisterInstruction).registerA
-
-            mutableMethod.addInstructions(
-                insertIndex,
-                """
-                    invoke-static {v$buildOverrideNameRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR;->getYouTubeVersionOverride(Ljava/lang/String;)Ljava/lang/String;
-                    move-result-object v$buildOverrideNameRegister
-                """
-            )
-        } ?: return SpoofAppVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SpoofAppVersionPatch"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt b/main/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt
deleted file mode 100644
index 9b2022792f..0000000000
--- a/main/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.startupshortsreset.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class StartupShortsResetCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt b/main/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt
deleted file mode 100644
index a994a26d6e..0000000000
--- a/main/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.layout.startupshortsreset.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(3)
-object UserWasInShortsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-    ),
-    strings = listOf("Failed to read user_was_in_shorts proto after successful warmup"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt b/main/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
deleted file mode 100644
index 13f3553465..0000000000
--- a/main/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package app.revanced.patches.youtube.layout.startupshortsreset.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.startupshortsreset.annotations.StartupShortsResetCompatibility
-import app.revanced.patches.youtube.layout.startupshortsreset.fingerprints.UserWasInShortsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Disable Shorts on startup")
-@Description("Disables playing YouTube Shorts when launching YouTube.")
-@StartupShortsResetCompatibility
-class DisableShortsOnStartupPatch : BytecodePatch(
-    listOf(
-        UserWasInShortsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_disable_resuming_shorts_player",
-                StringResource("revanced_disable_resuming_shorts_player_title", "Disable Shorts player at app startup"),
-                StringResource("revanced_disable_resuming_shorts_player_summary_on", "Shorts player is disabled at app startup"),
-                StringResource("revanced_disable_resuming_shorts_player_summary_off", "Shorts player is enabled at app startup")
-            )
-        )
-
-        val userWasInShortsResult = UserWasInShortsFingerprint.result!!
-        val userWasInShortsMethod = userWasInShortsResult.mutableMethod
-        val moveResultIndex = userWasInShortsResult.scanResult.patternScanResult!!.endIndex
-
-        userWasInShortsMethod.addInstructionsWithLabels(
-            moveResultIndex + 1,
-            """
-                invoke-static { }, Lapp/revanced/integrations/patches/DisableStartupShortsPlayerPatch;->disableStartupShortsPlayer()Z
-                move-result v5
-                if-eqz v5, :disable_shorts_player
-                return-void
-                :disable_shorts_player
-                nop
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt
deleted file mode 100644
index 4284c94d0f..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class TabletMiniPlayerCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerDimensionsCalculatorParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerDimensionsCalculatorParentFingerprint.kt
deleted file mode 100644
index 735c554625..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerDimensionsCalculatorParentFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MiniPlayerDimensionsCalculatorParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("F"),
-    opcodes = listOf(
-        Opcode.CONST_HIGH16,
-        Opcode.ADD_FLOAT_2ADDR,
-        Opcode.MUL_FLOAT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.FLOAT_TO_INT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.RETURN_VOID,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt
deleted file mode 100644
index f2210f76bc..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MiniPlayerOverrideFingerprint : MethodFingerprint(
-    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC,
-    listOf("Landroid/content/Context;"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.CONST_4, // override this value
-        Opcode.RETURN,
-        Opcode.CONST_4, // override this value
-        Opcode.RETURN
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt
deleted file mode 100644
index aba50b3d4b..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MiniPlayerOverrideNoContextFingerprint : MethodFingerprint(
-    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE,
-    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt
deleted file mode 100644
index df53522353..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideParentFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object MiniPlayerOverrideParentFingerprint : MethodFingerprint(
-    strings = listOf("Unset or unknown Input OneOf case for dynamic input")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt
deleted file mode 100644
index 45cede93b2..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint(
-    "L",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("Ljava/lang/Object;", "Ljava/lang/Object;"),
-    listOf(
-        Opcode.RETURN_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt b/main/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
deleted file mode 100644
index c642800de7..0000000000
--- a/main/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package app.revanced.patches.youtube.layout.tabletminiplayer.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.tabletminiplayer.annotations.TabletMiniPlayerCompatibility
-import app.revanced.patches.youtube.layout.tabletminiplayer.fingerprints.*
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("Tablet mini player")
-@Description("Enables the tablet mini player layout.")
-@TabletMiniPlayerCompatibility
-class TabletMiniPlayerPatch : BytecodePatch(
-    listOf(
-        MiniPlayerDimensionsCalculatorParentFingerprint,
-        MiniPlayerResponseModelSizeCheckFingerprint,
-        MiniPlayerOverrideParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_tablet_miniplayer",
-                StringResource("revanced_tablet_miniplayer_title", "Enable tablet mini player"),
-                StringResource("revanced_tablet_miniplayer_summary_on", "Mini player is enabled"),
-                StringResource("revanced_tablet_miniplayer_summary_off", "Mini player is disabled")
-            )
-        )
-
-        // First resolve the fingerprints via the parent fingerprint.
-        MiniPlayerDimensionsCalculatorParentFingerprint.result ?: return MiniPlayerDimensionsCalculatorParentFingerprint.toErrorResult()
-        val miniPlayerClass = MiniPlayerDimensionsCalculatorParentFingerprint.result!!.classDef
-
-        /*
-         * No context parameter method.
-         */
-        MiniPlayerOverrideNoContextFingerprint.resolve(context, miniPlayerClass)
-        val (method, _, parameterRegister) = MiniPlayerOverrideNoContextFingerprint.addProxyCall()
-
-        // Insert right before the return instruction.
-        val secondInsertIndex = method.implementation!!.instructions.size - 1
-        method.insertOverride(
-            secondInsertIndex, parameterRegister
-            /** same register used to return **/
-        )
-
-        /*
-         * Method with context parameter.
-         */
-        MiniPlayerOverrideParentFingerprint.result?.let {
-            if (!MiniPlayerOverrideFingerprint.resolve(context, it.classDef))
-                throw MiniPlayerOverrideFingerprint.toErrorResult()
-        } ?: return MiniPlayerOverrideParentFingerprint.toErrorResult()
-
-        /*
-         * Override every return instruction with the proxy call.
-         */
-        MiniPlayerOverrideFingerprint.result!!.mutableMethod.apply {
-            implementation!!.let { implementation ->
-                val returnIndices = implementation.instructions
-                    .withIndex()
-                    .filter { (_, instruction) -> instruction.opcode == Opcode.RETURN }
-                    .map { (index, _) -> index }
-
-                if (returnIndices.isEmpty()) throw PatchResultError("No return instructions found.")
-
-                // This method clobbers register p0 to return the value, calculate to override.
-                val returnedRegister = implementation.registerCount - parameters.size
-
-                // Hook the returned register on every return instruction.
-                returnIndices.forEach { index -> insertOverride(index, returnedRegister) }
-            }
-        }
-
-        /*
-         * Size check return value override.
-         */
-        MiniPlayerResponseModelSizeCheckFingerprint.addProxyCall()
-
-        return PatchResultSuccess()
-    }
-
-    // Helper methods.
-    private companion object {
-        fun MethodFingerprint.addProxyCall(): Triple<MutableMethod, Int, Int> {
-            val (method, scanIndex, parameterRegister) = this.unwrap()
-            method.insertOverride(scanIndex, parameterRegister)
-
-            return Triple(method, scanIndex, parameterRegister)
-        }
-
-        fun MutableMethod.insertOverride(index: Int, overrideRegister: Int) {
-            this.addInstructions(
-                index,
-                """
-                    invoke-static {v$overrideRegister}, Lapp/revanced/integrations/patches/TabletMiniPlayerOverridePatch;->getTabletMiniPlayerOverride(Z)Z
-                    move-result v$overrideRegister
-                """
-            )
-        }
-
-        fun MethodFingerprint.unwrap(): Triple<MutableMethod, Int, Int> {
-            val result = this.result!!
-            val scanIndex = result.scanResult.patternScanResult!!.endIndex
-            val method = result.mutableMethod
-            val instructions = method.implementation!!.instructions
-            val parameterRegister = (instructions[scanIndex] as OneRegisterInstruction).registerA
-
-            return Triple(method, scanIndex, parameterRegister)
-        }
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/theme/annotations/ThemeCompatibility.kt b/main/app/revanced/patches/youtube/layout/theme/annotations/ThemeCompatibility.kt
deleted file mode 100644
index 0ca6ded204..0000000000
--- a/main/app/revanced/patches/youtube/layout/theme/annotations/ThemeCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ThemeCompatibility
diff --git a/main/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/LithoThemeFingerprint.kt b/main/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/LithoThemeFingerprint.kt
deleted file mode 100644
index 70d9f9ea64..0000000000
--- a/main/app/revanced/patches/youtube/layout/theme/bytecode/fingerprints/LithoThemeFingerprint.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object LithoThemeFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PROTECTED or AccessFlags.FINAL,
-    parameters = listOf("Landroid/graphics/Rect;"),
-    opcodes = listOf(
-        Opcode.APUT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.name == "onBoundsChange"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt b/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt
deleted file mode 100644
index 0bd734f312..0000000000
--- a/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
-import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.LithoThemeFingerprint
-
-@Name("Litho color hook")
-@Description("Adds a hook to set color of Litho components.")
-@ThemeCompatibility
-class LithoColorHookPatch : BytecodePatch(listOf(LithoThemeFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        LithoThemeFingerprint.result?.let {
-            insertionIndex = it.scanResult.patternScanResult!!.endIndex - 1
-            colorRegister = "p1"
-            insertionMethod = it.mutableMethod
-        } ?: return LithoThemeFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-    companion object {
-        private var insertionIndex : Int = -1
-        private lateinit var colorRegister : String
-        private lateinit var insertionMethod : MutableMethod
-
-        internal fun lithoColorOverrideHook(targetMethodClass: String, targetMethodName: String)  {
-            insertionMethod.addInstructions(
-                insertionIndex,
-                """
-                    invoke-static {$colorRegister}, $targetMethodClass->$targetMethodName(I)I
-                    move-result $colorRegister
-                """
-            )
-            insertionIndex += 2
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt b/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
deleted file mode 100644
index c12180e232..0000000000
--- a/main/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.seekbar.bytecode.patch.SeekbarColorBytecodePatch
-import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
-import app.revanced.patches.youtube.layout.theme.resource.ThemeResourcePatch
-
-@Patch
-@Name("Theme")
-@Description("Applies a custom theme.")
-@DependsOn([LithoColorHookPatch::class, SeekbarColorBytecodePatch::class, ThemeResourcePatch::class])
-@ThemeCompatibility
-class ThemeBytecodePatch : BytecodePatch() {
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        LithoColorHookPatch.lithoColorOverrideHook(INTEGRATIONS_CLASS_DESCRIPTOR, "getValue")
-
-        return PatchResultSuccess()
-    }
-
-    companion object : OptionsContainer() {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/theme/ThemeLithoComponentsPatch;"
-
-        var darkThemeBackgroundColor: String? by option(
-            PatchOption.StringOption(
-                key = "darkThemeBackgroundColor",
-                default = "@android:color/black",
-                title = "Background color for the dark theme",
-                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
-            )
-        )
-
-        var lightThemeBackgroundColor: String? by option(
-            PatchOption.StringOption(
-                key = "lightThemeBackgroundColor",
-                default = "@android:color/white",
-                title = "Background color for the light theme",
-                description = "The background color of the light theme. Can be a hex color or a resource reference.",
-            )
-        )
-    }
-}
diff --git a/main/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt b/main/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
deleted file mode 100644
index ecdbbb1924..0000000000
--- a/main/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-package app.revanced.patches.youtube.layout.theme.resource
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.InputType
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.shared.settings.preference.impl.TextPreference
-import app.revanced.patches.youtube.layout.seekbar.resource.SeekbarPreferencesPatch
-import app.revanced.patches.youtube.layout.theme.bytecode.patch.ThemeBytecodePatch.Companion.darkThemeBackgroundColor
-import app.revanced.patches.youtube.layout.theme.bytecode.patch.ThemeBytecodePatch.Companion.lightThemeBackgroundColor
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.w3c.dom.Element
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class, SeekbarPreferencesPatch::class])
-class ThemeResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SeekbarPreferencesPatch.addPreferences(
-            SwitchPreference(
-                "revanced_seekbar_custom_color",
-                StringResource("revanced_seekbar_custom_color_title", "Enable custom seekbar color"),
-                StringResource("revanced_seekbar_custom_color_summary_on", "Custom seekbar color is shown"),
-                StringResource("revanced_seekbar_custom_color_summary_off", "Original seekbar color is shown")
-            ),
-            TextPreference(
-                "revanced_seekbar_custom_color_value",
-                StringResource("revanced_seekbar_custom_color_value_title", "Custom seekbar color"),
-                StringResource("revanced_seekbar_custom_color_value_summary", "The color of the seekbar"),
-                InputType.TEXT_CAP_CHARACTERS
-            )
-        )
-
-        // Edit theme colors via resources.
-        context.xmlEditor["res/values/colors.xml"].use { editor ->
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
-
-            val children = resourcesNode.childNodes
-            for (i in 0 until children.length) {
-                val node = children.item(i) as? Element ?: continue
-
-                node.textContent = when (node.getAttribute("name")) {
-                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850"
-                    -> darkThemeBackgroundColor ?: continue
-
-                    "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
-                    "yt_white2", "yt_white3", "yt_white4",
-                    -> lightThemeBackgroundColor ?: continue
-
-                    else -> continue
-                }
-            }
-        }
-
-        // Add a dynamic background color to the colors.xml file.
-        lightThemeBackgroundColor?.let {
-            addColorResource(context, "res/values/colors.xml", SPLASH_BACKGROUND_COLOR, it)
-        }
-
-        darkThemeBackgroundColor?.let {
-            addColorResource(context, "res/values-night/colors.xml", SPLASH_BACKGROUND_COLOR, it)
-        }
-
-        // Edit splash screen files and change the background color,
-        // if the background colors are set.
-        if (darkThemeBackgroundColor != null && lightThemeBackgroundColor != null) {
-            val splashScreenResourceFiles = listOf(
-                "res/drawable/quantum_launchscreen_youtube.xml",
-                "res/drawable-sw600dp/quantum_launchscreen_youtube.xml")
-
-            splashScreenResourceFiles.forEach editSplashScreen@ { resourceFile ->
-                context.xmlEditor[resourceFile].use {
-                    val layerList = it.file.getElementsByTagName("layer-list").item(0) as Element
-
-                    val childNodes = layerList.childNodes
-                    for (i in 0 until childNodes.length) {
-                        val node = childNodes.item(i)
-                        if (node is Element && node.hasAttribute("android:drawable")) {
-                            node.setAttribute("android:drawable", "@color/$SPLASH_BACKGROUND_COLOR")
-                            return@editSplashScreen
-                        }
-                    }
-                    return PatchResultError("Failed to modify launch screen")
-                }
-            }
-        }
-
-
-        return PatchResultSuccess()
-    }
-
-    private fun addColorResource(
-        context: ResourceContext,
-        resourceFile: String,
-        colorName: String,
-        colorValue: String
-    ) {
-        context.xmlEditor[resourceFile].use {
-            val resourcesNode = it.file.getElementsByTagName("resources").item(0) as Element
-
-            resourcesNode.appendChild(
-                it.file.createElement("color").apply {
-                    setAttribute("name", colorName)
-                    setAttribute("category", "color")
-                    textContent = colorValue
-                })
-        }
-    }
-
-    private companion object {
-        private const val SPLASH_BACKGROUND_COLOR = "revanced_splash_background_color"
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt b/main/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt
deleted file mode 100644
index b4b62674c7..0000000000
--- a/main/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.autorepeat.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class AutoRepeatCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt b/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt
deleted file mode 100644
index c784ba8a00..0000000000
--- a/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.misc.autorepeat.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object AutoRepeatFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
-    customFingerprint = { methodDef, _ ->
-        methodDef.implementation!!.instructions.count() == 3 && methodDef.annotations.isEmpty()
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt b/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt
deleted file mode 100644
index 81d6b00832..0000000000
--- a/main/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.misc.autorepeat.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object AutoRepeatParentFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf(
-        "play() called when the player wasn't loaded.",
-        "play() blocked because Background Playability failed"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt b/main/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
deleted file mode 100644
index 42c2df571c..0000000000
--- a/main/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package app.revanced.patches.youtube.misc.autorepeat.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.autorepeat.annotations.AutoRepeatCompatibility
-import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
-import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@DependsOn([IntegrationsPatch::class])
-@Name("Always autorepeat")
-@Description("Always repeats the playing video again.")
-@AutoRepeatCompatibility
-class AutoRepeatPatch : BytecodePatch(
-    listOf(
-        AutoRepeatParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_auto_repeat",
-                StringResource("revanced_auto_repeat_title", "Enable auto-repeat"),
-                StringResource("revanced_auto_repeat_summary_on", "Auto-repeat is enabled"),
-                StringResource("revanced_auto_repeat_summary_off", "Auto-repeat is disabled")
-            )
-        )
-
-        //Get Result from the ParentFingerprint which is the playMethod we need to get.
-        val parentResult = AutoRepeatParentFingerprint.result
-            ?: return PatchResultError("ParentFingerprint did not resolve.")
-
-        //this one needs to be called when app/revanced/integrations/patches/AutoRepeatPatch;->shouldAutoRepeat() returns true
-        val playMethod = parentResult.mutableMethod
-        AutoRepeatFingerprint.resolve(context, parentResult.classDef)
-        //String is: Laamp;->E()V
-        val methodToCall = playMethod.definingClass + "->" + playMethod.name + "()V"
-
-        //This is the method we search for
-        val result = AutoRepeatFingerprint.result
-            ?: return PatchResultError("FingerPrint did not resolve.")
-        val method = result.mutableMethod
-
-        //Instructions to add to the smali code
-        val instructions = """
-            invoke-static {}, Lapp/revanced/integrations/patches/AutoRepeatPatch;->shouldAutoRepeat()Z
-            move-result v0
-            if-eqz v0, :noautorepeat
-            invoke-virtual {p0}, $methodToCall
-            :noautorepeat
-            return-void
-        """
-
-        //Get the implementation so we can do a check for null and get instructions size.
-        val implementation = method.implementation
-            ?: return PatchResultError("No Method Implementation found!")
-
-        //Since addInstructions needs an index which starts counting at 0 and size starts counting at 1,
-        //we have to remove 1 to get the latest instruction
-        val index = implementation.instructions.size - 1
-
-
-        //remove last instruction which is return-void
-        method.removeInstruction(index)
-        // Add our own instructions there
-        method.addInstructionsWithLabels(index, instructions)
-
-        //Everything worked as expected, return Success
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/fingerprints/CreateBottomSheetFingerprint.kt b/main/app/revanced/patches/youtube/misc/bottomsheet/hook/fingerprints/CreateBottomSheetFingerprint.kt
deleted file mode 100644
index 6a005a36ba..0000000000
--- a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/fingerprints/CreateBottomSheetFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.bottomsheet.hook.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object CreateBottomSheetFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    returnType = "Landroid/widget/LinearLayout;",
-    literal = BottomSheetHookResourcePatch.bottomSheetMargins
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt b/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt
deleted file mode 100644
index 73c27a5bdc..0000000000
--- a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.youtube.misc.bottomsheet.hook.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.youtube.misc.bottomsheet.hook.fingerprints.CreateBottomSheetFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@DependsOn([IntegrationsPatch::class, BottomSheetHookResourcePatch::class])
-class BottomSheetHookPatch : BytecodePatch(
-    listOf(CreateBottomSheetFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        CreateBottomSheetFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val returnLinearLayoutIndex = implementation!!.instructions.lastIndex
-                val linearLayoutRegister = getInstruction<OneRegisterInstruction>(returnLinearLayoutIndex).registerA
-
-                addHook = { classDescriptor ->
-                    addInstruction(
-                        returnLinearLayoutIndex,
-                        "invoke-static { v$linearLayoutRegister }, " +
-                                "${classDescriptor}->" +
-                                "onFlyoutMenuCreate(Landroid/widget/LinearLayout;)V"
-                    )
-                }
-            }
-        } ?: return CreateBottomSheetFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        internal lateinit var addHook: (String) -> Unit
-            private set
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt b/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt
deleted file mode 100644
index bfb244df0e..0000000000
--- a/main/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.bottomsheet.hook.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-
-@DependsOn([ResourceMappingPatch::class])
-class BottomSheetHookResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        bottomSheetMargins =  ResourceMappingPatch.resourceMappings.find { it.name == "bottom_sheet_margins" }?.id
-            ?: return PatchResultError("Could not find resource")
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var bottomSheetMargins = -1L
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/debugging/annotations/DebuggingCompatibility.kt b/main/app/revanced/patches/youtube/misc/debugging/annotations/DebuggingCompatibility.kt
deleted file mode 100644
index c905ea588c..0000000000
--- a/main/app/revanced/patches/youtube/misc/debugging/annotations/DebuggingCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.debugging.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class DebuggingCompatibility
diff --git a/main/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt b/main/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
deleted file mode 100644
index 8993ae107f..0000000000
--- a/main/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package app.revanced.patches.youtube.misc.debugging.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.debugging.annotations.DebuggingCompatibility
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@Patch
-@Name("Enable debugging")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Description("Adds debugging options.")
-@DebuggingCompatibility
-class DebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            app.revanced.patches.shared.settings.preference.impl.PreferenceScreen(
-                "revanced_debug_preference_screen",
-                StringResource("revanced_debug_preference_screen_title", "Debugging"),
-                listOf(
-                    SwitchPreference(
-                        "revanced_debug",
-                        StringResource("revanced_debug_title", "Debug logging"),
-                        StringResource("revanced_debug_summary_on", "Debug logs are enabled"),
-                        StringResource("revanced_debug_summary_off", "Debug logs are disabled")
-                    ),
-                    SwitchPreference(
-                        "revanced_debug_stacktrace",
-                        StringResource(
-                            "revanced_debug_stacktrace_title",
-                            "Log stack traces"
-                        ),
-                        StringResource("revanced_debug_stacktrace_summary_on", "Debug logs include stack trace"),
-                        StringResource("revanced_debug_stacktrace_summary_off", "Debug logs do not include stack trace")
-                    ),
-                    SwitchPreference(
-                        "revanced_debug_toast_on_error",
-                        StringResource(
-                            "revanced_debug_toast_on_error_title",
-                            "Show toast on ReVanced error"
-                        ),
-                        StringResource("revanced_debug_toast_on_error_summary_on", "Toast shown if error occurs"),
-                        StringResource("revanced_debug_toast_on_error_summary_off", "Toast not shown if error occurs"),
-                        StringResource("revanced_debug_toast_on_error_user_dialog_message",
-                            "Turning off error toasts hides all ReVanced error notifications."
-                                    + "\\n\\nYou will not be notified of any unexpected events."
-                        )
-                    ),
-                ),
-                StringResource("revanced_debug_preference_screen_summary", "Enable or disable debugging options")
-            )
-        )
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/annotation/FixBackToExitGestureCompatibility.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/annotation/FixBackToExitGestureCompatibility.kt
deleted file mode 100644
index bce548f112..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/annotation/FixBackToExitGestureCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class FixBackToExitGestureCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/OnBackPressedFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/OnBackPressedFingerprint.kt
deleted file mode 100644
index 52fee3beb5..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/OnBackPressedFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object OnBackPressedFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    opcodes = listOf(
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;")
-        && methodDef.name == "onBackPressed"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewScrollingFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewScrollingFingerprint.kt
deleted file mode 100644
index 73c5faeeb7..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewScrollingFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object RecyclerViewScrollingFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_LEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingFingerprint.kt
deleted file mode 100644
index 994436544f..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingFingerprint.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object RecyclerViewTopScrollingFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.GOTO,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingParentFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingParentFingerprint.kt
deleted file mode 100644
index b891aa4ae2..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/fingerprints/RecyclerViewTopScrollingParentFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object RecyclerViewTopScrollingParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf("L", "L", "Landroid/view/ViewGroup;", "Landroid/view/ViewGroup;"),
-    opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_16,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.NEW_INSTANCE
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt b/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt
deleted file mode 100644
index 152f9853ed..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.annotation.FixBackToExitGestureCompatibility
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.OnBackPressedFingerprint
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewScrollingFingerprint
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewTopScrollingFingerprint
-import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewTopScrollingParentFingerprint
-
-@Description("Fixes the swipe back to exit gesture.")
-@FixBackToExitGestureCompatibility
-class FixBackToExitGesturePatch : BytecodePatch(
-    listOf(
-        RecyclerViewTopScrollingParentFingerprint,
-        RecyclerViewScrollingFingerprint,
-        OnBackPressedFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        RecyclerViewTopScrollingFingerprint.apply {
-            resolve(
-                context,
-                RecyclerViewTopScrollingParentFingerprint.result?.classDef
-                    ?: return RecyclerViewTopScrollingParentFingerprint.toErrorResult()
-            )
-        }
-
-        mapOf(
-            RecyclerViewTopScrollingFingerprint to IntegrationsMethod(
-                methodName = "onTopView"
-            ),
-            RecyclerViewScrollingFingerprint to IntegrationsMethod(
-                methodName = "onScrollingViews"
-            ),
-            OnBackPressedFingerprint to IntegrationsMethod(
-                "p0", "onBackPressed", "Lcom/google/android/apps/youtube/app/watchwhile/WatchWhileActivity;"
-            )
-        ).forEach { (fingerprint, target) ->
-            try {
-                fingerprint.injectCall(target)
-            } catch (error: PatchResultError) {
-                return error
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        /**
-         * A reference to a method from the integrations for [FixBackToExitGesturePatch].
-         *
-         * @param register The method registers.
-         * @param methodName The method name.
-         * @param parameterTypes The parameters of the method.
-         */
-        data class IntegrationsMethod(
-            val register: String = "", val methodName: String, val parameterTypes: String = ""
-        ) {
-            override fun toString() =
-                "invoke-static {$register}, Lapp/revanced/integrations/patches/FixBackToExitGesturePatch;->$methodName($parameterTypes)V"
-        }
-
-        /**
-         * Inject a call to a method from the integrations.
-         *
-         * @param targetMethod The target method to call.
-         */
-        fun MethodFingerprint.injectCall(targetMethod: IntegrationsMethod) = result?.apply {
-            mutableMethod.addInstruction(
-                scanResult.patternScanResult!!.endIndex, targetMethod.toString()
-            )
-        } ?: throw this.toErrorResult()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/annotations/ClientSpoofCompatibility.kt b/main/app/revanced/patches/youtube/misc/fix/playback/annotations/ClientSpoofCompatibility.kt
deleted file mode 100644
index 24c49518a6..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/annotations/ClientSpoofCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ClientSpoofCompatibility
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt
deleted file mode 100644
index 3b61b09dde..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object ProtobufParameterBuilderFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL_RANGE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT
-    ),
-    strings = listOf("Unexpected empty videoId.", "Prefetch request are disabled.")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt
deleted file mode 100644
index 0246694ee7..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.fix.playback.patch.SpoofSignatureVerificationResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT, // preview imageview
-    ),
-    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
-    literal = SpoofSignatureVerificationResourcePatch.scrubbedPreviewThumbnailResourceId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailFingerprint.kt
deleted file mode 100644
index 51e824d0d5..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-/**
- * Resolves using the class found in [StoryboardThumbnailParentFingerprint].
- */
-object StoryboardThumbnailFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.IF_GTZ,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.RETURN, // Last instruction of method.
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt
deleted file mode 100644
index ae50aae996..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * Here lies code that creates the seekbar thumbnails.
- *
- * An additional change here might force the thumbnails to be created,
- * or possibly a change somewhere else (maybe involving YouTube 18.23.35 class `hte`)
- */
-object StoryboardThumbnailParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Landroid/graphics/Bitmap;",
-    strings = listOf("Storyboard regionDecoder.decodeRegion exception - "),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/UserAgentHeaderBuilderFingerprint.kt b/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/UserAgentHeaderBuilderFingerprint.kt
deleted file mode 100644
index ab71b605fc..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/fingerprints/UserAgentHeaderBuilderFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L"),
-    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    strings = listOf("(Linux; U; Android "),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt b/main/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt
deleted file mode 100644
index 605b2319d1..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.fix.playback.annotations.ClientSpoofCompatibility
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.UserAgentHeaderBuilderFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-
-@Patch
-@Name("Client spoof")
-@Description("Spoofs the client to allow playback.")
-@ClientSpoofCompatibility
-@DependsOn([SpoofSignatureVerificationPatch::class])
-class ClientSpoofPatch : BytecodePatch(
-    listOf(UserAgentHeaderBuilderFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        UserAgentHeaderBuilderFingerprint.result?.let { result ->
-            val insertIndex = result.scanResult.patternScanResult!!.endIndex
-           result.mutableMethod.apply {
-               val packageNameRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
-
-               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
-           }
-
-        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt b/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
deleted file mode 100644
index f87c1683b1..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ScrubbedPreviewLayoutFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.StoryboardThumbnailFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.StoryboardThumbnailParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-
-@Name("Spoof signature verification")
-@Description("Spoofs the client to prevent playback issues.")
-@DependsOn([
-    SpoofSignatureVerificationResourcePatch::class,
-    IntegrationsPatch::class,
-    PlayerTypeHookPatch::class
-])
-class SpoofSignatureVerificationPatch : BytecodePatch(
-    listOf(
-        ProtobufParameterBuilderFingerprint,
-        StoryboardThumbnailParentFingerprint,
-        ScrubbedPreviewLayoutFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        // hook parameter
-        ProtobufParameterBuilderFingerprint.result?.let {
-            val setParamMethod = context
-                .toMethodWalker(it.method)
-                .nextMethod(it.scanResult.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
-
-            setParamMethod.apply {
-                val protobufParameterRegister = 3
-
-                addInstructions(
-                    0,
-                    """
-                        invoke-static {p$protobufParameterRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideProtobufParameter(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object p$protobufParameterRegister
-                    """
-                )
-            }
-        } ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
-
-
-        // When signature spoofing is enabled, the seekbar when tapped does not show
-        // the video time, chapter names, or the video thumbnail.
-        // Changing the value returned of this method forces all of these to show up,
-        // except the thumbnails are blank, which is handled with the patch below.
-        StoryboardThumbnailParentFingerprint.result ?: return StoryboardThumbnailParentFingerprint.toErrorResult()
-        StoryboardThumbnailFingerprint.resolve(context, StoryboardThumbnailParentFingerprint.result!!.classDef)
-        StoryboardThumbnailFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            // Replace existing instruction to preserve control flow label.
-            // The replaced return instruction always returns false
-            // (it is the 'no thumbnails found' control path),
-            // so there is no need to pass the existing return value to integrations.
-            mutableMethod.replaceInstruction(
-                endIndex,
-                """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
-                """
-            )
-            // Since this is end of the method must replace one line then add the rest.
-            mutableMethod.addInstructions(
-                endIndex + 1,
-                """
-                move-result v0
-                return v0
-            """
-            )
-        } ?: return StoryboardThumbnailFingerprint.toErrorResult()
-
-
-        // Seekbar thumbnail now show up but are always a blank image.
-        // Additional changes are needed to force the client to generate the thumbnails (assuming it's possible),
-        // but for now hide the empty thumbnail.
-        ScrubbedPreviewLayoutFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            mutableMethod.apply {
-                val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
-                addInstructions(
-                    implementation!!.instructions.lastIndex,
-                    """
-                        iget-object v0, p0, $imageViewFieldName   # copy imageview field to a register
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V
-                """
-                )
-            }
-        } ?: return ScrubbedPreviewLayoutFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SpoofSignatureVerificationPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt b/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt
deleted file mode 100644
index b82dcfd956..0000000000
--- a/main/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class SpoofSignatureVerificationResourcePatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_spoof_signature_verification",
-                StringResource("revanced_spoof_signature_verification_title", "Spoof app signature"),
-                StringResource("revanced_spoof_signature_verification_summary_on",
-                    "App signature spoofed\\n\\n"
-                        + "Side effects include:\\n"
-                        + "• Ambient mode may not work\\n"
-                        + "• Seekbar thumbnails are hidden\\n"
-                        + "• Downloading videos may not work"),
-                StringResource("revanced_spoof_signature_verification_summary_off", "App signature not spoofed"),
-                StringResource("revanced_spoof_signature_verification_user_dialog_message",
-                    "Turning off this setting may cause playback issues.")
-            )
-        )
-
-        scrubbedPreviewThumbnailResourceId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "id" && it.name == "thumbnail"
-        }.id
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        var scrubbedPreviewThumbnailResourceId: Long = -1
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt b/main/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt
deleted file mode 100644
index 9de9f53c36..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class IntegrationsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/APIPlayerServiceFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/APIPlayerServiceFingerprint.kt
deleted file mode 100644
index 87607a7707..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/APIPlayerServiceFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * For embedded playback.
- * It appears this hook may no longer be needed as one of the constructor parameters is the already hooked
- * [EmbeddedPlayerControlsOverlayFingerprint]
- */
-object APIPlayerServiceFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lcom/google/android/apps/youtube/embeddedplayer/service/service/jar/ApiPlayerService;" },
-    // Integrations context is the first method parameter.
-    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/ApplicationInitFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/ApplicationInitFingerprint.kt
deleted file mode 100644
index 7adb101ca6..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/ApplicationInitFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-
-/**
- * Hooks the context when the app is launched as a regular application (and is not an embedded video playback).
- */
-object ApplicationInitFingerprint : IntegrationsFingerprint(
-    strings = listOf("Application creation", "Application.onCreate"),
-    // Integrations context is the Activity itself.
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerControlsOverlayFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerControlsOverlayFingerprint.kt
deleted file mode 100644
index 80e4774604..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerControlsOverlayFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * For embedded playback inside Google Play store (and probably other situations as well).
- *
- * Note: this fingerprint may no longer be needed, as it appears
- * [RemoteEmbedFragmentFingerprint] may be set before this hook is called.
- */
-object EmbeddedPlayerControlsOverlayFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "L", "L"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.startsWith("Lcom/google/android/apps/youtube/embeddedplayer/service/ui/overlays/controlsoverlay/remoteloaded/")
-    },
-    // Integrations context is the first method parameter.
-    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerFingerprint.kt
deleted file mode 100644
index 7661564709..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/EmbeddedPlayerFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * For embedded playback inside the Google app (such as the in app 'discover' tab).
- *
- * Note: this fingerprint may or may not be needed, as
- * [RemoteEmbedFragmentFingerprint] might be set before this is called.
- */
-object EmbeddedPlayerFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    returnType = "L",
-    parameters = listOf("L", "L", "Landroid/content/Context;"),
-    strings = listOf("android.hardware.type.television"), // String is also found in other classes
-    // Integrations context is the third method parameter.
-    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size + 2 }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbedFragmentFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbedFragmentFingerprint.kt
deleted file mode 100644
index e719289ffc..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbedFragmentFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * For embedded playback.  Likely covers Google Play store and other Google products.
- */
-object RemoteEmbedFragmentFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "L", "L"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/apps/youtube/embeddedplayer/service/jar/client/RemoteEmbedFragment;"
-    },
-    // Integrations context is the first method parameter.
-    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbeddedPlayerFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbeddedPlayerFingerprint.kt
deleted file mode 100644
index 6a16bf2679..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/RemoteEmbeddedPlayerFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * For embedded playback inside 3rd party android app (such as 3rd party Reddit apps).
- */
-object RemoteEmbeddedPlayerFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.CONSTRUCTOR,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "L", "L", "Z"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/youtube/api/jar/client/RemoteEmbeddedPlayer;"
-    },
-    // Integrations context is the first method parameter.
-    contextRegisterResolver = { it.implementation!!.registerCount - it.parameters.size }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/StandalonePlayerActivityFingerprint.kt b/main/app/revanced/patches/youtube/misc/integrations/fingerprints/StandalonePlayerActivityFingerprint.kt
deleted file mode 100644
index 9d2eb4c073..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/fingerprints/StandalonePlayerActivityFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * Old API activity to embed YouTube into 3rd party Android apps.
- *
- * In 2023 supported was ended and is no longer available,
- * but this may still be used by older apps:
- * https://developers.google.com/youtube/android/player
- */
-object StandalonePlayerActivityFingerprint : IntegrationsFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lcom/google/android/youtube/api/StandalonePlayerActivity;"
-                && methodDef.name == "onCreate"
-    },
-    // Integrations context is the Activity itself.
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt b/main/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt
deleted file mode 100644
index e3b5a031c9..0000000000
--- a/main/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.revanced.patches.youtube.misc.integrations.patch
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch
-import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
-import app.revanced.patches.youtube.misc.integrations.fingerprints.EmbeddedPlayerControlsOverlayFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.EmbeddedPlayerFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.ApplicationInitFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.RemoteEmbedFragmentFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.RemoteEmbeddedPlayerFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.APIPlayerServiceFingerprint
-import app.revanced.patches.youtube.misc.integrations.fingerprints.StandalonePlayerActivityFingerprint
-
-@Name("Integrations")
-@IntegrationsCompatibility
-@RequiresIntegrations
-class IntegrationsPatch : AbstractIntegrationsPatch(
-    "Lapp/revanced/integrations/utils/ReVancedUtils;",
-    listOf(
-        ApplicationInitFingerprint,
-        StandalonePlayerActivityFingerprint,
-        RemoteEmbeddedPlayerFingerprint,
-        RemoteEmbedFragmentFingerprint,
-        EmbeddedPlayerControlsOverlayFingerprint,
-        EmbeddedPlayerFingerprint,
-        APIPlayerServiceFingerprint,
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/links/open/annotations/OpenLinksExternallyCompatibility.kt b/main/app/revanced/patches/youtube/misc/links/open/annotations/OpenLinksExternallyCompatibility.kt
deleted file mode 100644
index 233b8ce6af..0000000000
--- a/main/app/revanced/patches/youtube/misc/links/open/annotations/OpenLinksExternallyCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.links.open.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class OpenLinksExternallyCompatibility
diff --git a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/BindSessionServiceFingerprint.kt b/main/app/revanced/patches/youtube/misc/links/open/fingerprints/BindSessionServiceFingerprint.kt
deleted file mode 100644
index b1d1082792..0000000000
--- a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/BindSessionServiceFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.misc.links.open.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object BindSessionServiceFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.CONST_STRING
-    ),
-    strings = listOf("android.support.customtabs.action.CustomTabsService")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/GetCustomTabPackageNameFingerprint.kt b/main/app/revanced/patches/youtube/misc/links/open/fingerprints/GetCustomTabPackageNameFingerprint.kt
deleted file mode 100644
index 78b7955664..0000000000
--- a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/GetCustomTabPackageNameFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.misc.links.open.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object GetCustomTabPackageNameFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_STRING
-    ),
-    strings = listOf("android.support.customtabs.action.CustomTabsService")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/InitializeCustomTabSupportFingerprint.kt b/main/app/revanced/patches/youtube/misc/links/open/fingerprints/InitializeCustomTabSupportFingerprint.kt
deleted file mode 100644
index b9f80a60b5..0000000000
--- a/main/app/revanced/patches/youtube/misc/links/open/fingerprints/InitializeCustomTabSupportFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.misc.links.open.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object InitializeCustomTabSupportFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_STRING
-    ),
-    strings = listOf("android.support.customtabs.action.CustomTabsService")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt b/main/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt
deleted file mode 100644
index bc51991736..0000000000
--- a/main/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package app.revanced.patches.youtube.misc.links.open.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.links.open.annotations.OpenLinksExternallyCompatibility
-import app.revanced.patches.youtube.misc.links.open.fingerprints.BindSessionServiceFingerprint
-import app.revanced.patches.youtube.misc.links.open.fingerprints.GetCustomTabPackageNameFingerprint
-import app.revanced.patches.youtube.misc.links.open.fingerprints.InitializeCustomTabSupportFingerprint
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-
-@Patch
-@Name("Open links externally")
-@Description("Open links outside of the app directly in your browser.")
-@OpenLinksExternallyCompatibility
-class OpenLinksExternallyPatch : BytecodePatch(
-    listOf(
-        GetCustomTabPackageNameFingerprint,
-        BindSessionServiceFingerprint,
-        InitializeCustomTabSupportFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_external_browser",
-                StringResource("revanced_external_browser_title", "Open links in browser"),
-                StringResource("revanced_external_browser_summary_on", "Opening links externally"),
-                StringResource("revanced_external_browser_summary_off", "Opening links in app")
-            )
-        )
-
-        arrayOf(
-            GetCustomTabPackageNameFingerprint,
-            BindSessionServiceFingerprint,
-            InitializeCustomTabSupportFingerprint
-        ).forEach {
-            val result = it.result ?: return it.toErrorResult()
-            val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
-            with(result.mutableMethod) {
-                val register = (implementation!!.instructions[insertIndex - 1] as Instruction21c).registerA
-                addInstructions(
-                    insertIndex,
-                    """
-                        invoke-static {v$register}, Lapp/revanced/integrations/patches/OpenLinksExternallyPatch;->enableExternalBrowser(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$register
-                    """
-                )
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt b/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
deleted file mode 100644
index b0fad80b96..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object ComponentContextParserFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE
-    ),
-    strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings.")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/EmptyComponentBuilderFingerprint.kt b/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/EmptyComponentBuilderFingerprint.kt
deleted file mode 100644
index 7c77b9f96c..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/EmptyComponentBuilderFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object EmptyComponentBuilderFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_STATIC_RANGE
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/LithoFilterFingerprint.kt b/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/LithoFilterFingerprint.kt
deleted file mode 100644
index 9839efc310..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/LithoFilterFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object LithoFilterFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
-    returnType = "V",
-    customFingerprint = { _, classDef ->
-        classDef.type.endsWith("LithoFilterPatch;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ProtobufBufferReferenceFingerprint.kt b/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ProtobufBufferReferenceFingerprint.kt
deleted file mode 100644
index aeecb9e2a2..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ProtobufBufferReferenceFingerprint.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ProtobufBufferReferenceFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("I", "Ljava/nio/ByteBuffer;"),
-    opcodes = listOf(
-        Opcode.IPUT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.SUB_INT_2ADDR
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ReadComponentIdentifierFingerprint.kt b/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ReadComponentIdentifierFingerprint.kt
deleted file mode 100644
index b78e48af14..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ReadComponentIdentifierFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object ReadComponentIdentifierFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.IF_NEZ,
-        null,
-        Opcode.MOVE_RESULT_OBJECT // Register stores the component identifier string
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt b/main/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
deleted file mode 100644
index 6ad8cfffb5..0000000000
--- a/main/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
+++ /dev/null
@@ -1,209 +0,0 @@
-package app.revanced.patches.youtube.misc.litho.filter.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.litho.filter.fingerprints.*
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.immutable.ImmutableField
-import java.io.Closeable
-
-@DependsOn([IntegrationsPatch::class])
-@Description("Hooks the method which parses the bytes into a ComponentContext to filter components.")
-class LithoFilterPatch : BytecodePatch(
-    listOf(ComponentContextParserFingerprint, LithoFilterFingerprint, ProtobufBufferReferenceFingerprint)
-), Closeable {
-    /**
-     * The following patch inserts a hook into the method that parses the bytes into a ComponentContext.
-     * This method contains a StringBuilder object that represents the pathBuilder of the component.
-     * The pathBuilder is used to filter components by their path.
-     *
-     * Additionally, the method contains a reference to the components identifier.
-     * The identifier is used to filter components by their identifier.
-     *
-     * In addition to that, a static field is added to the class of this method. (See protobufBufferField).
-     * This field holds a reference to the protobuf buffer object.
-     * The field is being set in another method that holds a reference to the protobuf buffer object.
-     * The object contains a large byte array that represents the component tree.
-     * This byte array is searched for strings that indicate the current component.
-     *
-     * The following pseudo code shows how the patch works:
-     *
-     * class ComponentContextParser {
-     *    public static ByteBuffer buffer; // Inserted by this patch.
-     *
-     *    public ComponentContext parseBytesToComponentContext(...) {
-     *        ...
-     *        if (filter(identifier, pathBuilder, buffer)); // Inserted by this patch.
-     *            return emptyComponent;
-     *        ...
-     *    }
-     * }
-     *
-     * class SomeOtherClass {
-     *    // Called before ComponentContextParser.parseBytesToComponentContext method.
-     *    public void someOtherMethod(ByteBuffer byteBuffer) {
-     *        ComponentContextParser.buffer = byteBuffer; // Inserted by this patch.
-     *        ...
-     *   }
-     * }
-     */
-    override fun execute(context: BytecodeContext): PatchResult {
-        ComponentContextParserFingerprint.result?.also {
-            arrayOf(
-                EmptyComponentBuilderFingerprint,
-                ReadComponentIdentifierFingerprint
-            ).forEach { fingerprint ->
-                if (fingerprint.resolve(context, it.mutableMethod, it.mutableClass)) return@forEach
-                return fingerprint.toErrorResult()
-            }
-        }?.let { bytesToComponentContextMethod ->
-            // region Add a static field that holds a reference to the protobuf buffer object.
-            val protobufBufferField = ImmutableField(
-                bytesToComponentContextMethod.mutableClass.type,
-                "buffer",
-                "Ljava/nio/ByteBuffer;",
-                AccessFlags.PUBLIC or AccessFlags.STATIC,
-                null,
-                null,
-                null
-            ).toMutable()
-            bytesToComponentContextMethod.mutableClass.staticFields.add(protobufBufferField)
-
-            // Set the field with the reference to the protobuf buffer object.
-            ProtobufBufferReferenceFingerprint.result
-                ?.mutableMethod?.addInstruction(0, "sput-object p2, $protobufBufferField")
-                ?: return ProtobufBufferReferenceFingerprint.toErrorResult()
-
-            // endregion
-
-            // region Hook the method that parses bytes into a ComponentContext.
-
-            val builderMethodIndex = EmptyComponentBuilderFingerprint.patternScanEndIndex
-            val emptyComponentFieldIndex = builderMethodIndex + 2
-
-            bytesToComponentContextMethod.mutableMethod.apply {
-                val insertHookIndex = bytesToComponentContextMethod.scanResult.patternScanResult!!.endIndex
-
-                // region Get free registers that this patch uses.
-                // Registers are overwritten right after they are used in this patch, therefore free to clobber.
-
-                val freeRegistersInstruction = getInstruction<FiveRegisterInstruction>(insertHookIndex - 2)
-
-                // Later used to store the protobuf buffer object.
-                val free1 = getInstruction<OneRegisterInstruction>(insertHookIndex).registerA
-                // Later used to store the identifier of the component.
-                // This register currently holds a reference to the StringBuilder object
-                // that is required before clobbering.
-                val free2 = freeRegistersInstruction.registerC
-
-                @Suppress("UnnecessaryVariable")
-                val stringBuilderRegister = free2
-
-                // endregion
-
-                // region Get references that this patch needs.
-
-                val builderMethodDescriptor = getInstruction(builderMethodIndex).descriptor
-                val emptyComponentFieldDescriptor = getInstruction(emptyComponentFieldIndex).descriptor
-
-                val identifierRegister =
-                    getInstruction<OneRegisterInstruction>(ReadComponentIdentifierFingerprint.patternScanEndIndex).registerA
-
-                // endregion
-
-                // region Patch the method.
-
-                // Insert the instructions that are responsible
-                // to return an EmptyComponent instead of the original component if the filter method returns false.
-                addInstructionsWithLabels(
-                    insertHookIndex,
-                    """
-                        # Register "free1" holds the protobuf buffer object
-                       
-                        sget-object v$free1, $protobufBufferField
-
-                        # Invoke the filter method.
-                      
-                        invoke-static { v$stringBuilderRegister, v$identifierRegister, v$free1 }, $FILTER_METHOD_DESCRIPTOR
-                        move-result v$free1
-                       
-                        if-eqz v$free1, :unfiltered
-
-                        move-object/from16 v$free2, p1
-                        invoke-static {v$free2}, $builderMethodDescriptor
-                        move-result-object v$free2
-                        iget-object v$free2, v$free2, $emptyComponentFieldDescriptor
-                        return-object v$free2
-                    """,
-                    // Used to jump over the instruction which block the component from being created.
-                    ExternalLabel("unfiltered", getInstruction(insertHookIndex))
-                )
-                // endregion
-            }
-
-            // endregion
-        } ?: return ComponentContextParserFingerprint.toErrorResult()
-
-        LithoFilterFingerprint.result?.mutableMethod?.apply {
-            removeInstructions(2, 4) // Remove dummy filter.
-
-            addFilter = { classDescriptor ->
-                addInstructions(
-                    2,
-                    """
-                        new-instance v1, $classDescriptor
-                        invoke-direct {v1}, $classDescriptor-><init>()V
-                        const/16 v2, ${filterCount++}
-                        aput-object v1, v0, v2
-                    """
-                )
-            }
-        } ?: return LithoFilterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    override fun close() = LithoFilterFingerprint.result!!
-        .mutableMethod.replaceInstruction(0, "const/16 v0, $filterCount")
-
-    companion object {
-        private val MethodFingerprint.patternScanResult
-            get() = result!!.scanResult.patternScanResult!!
-
-        private val MethodFingerprint.patternScanEndIndex
-            get() = patternScanResult.endIndex
-
-        private val Instruction.descriptor
-            get() = (this as ReferenceInstruction).reference.toString()
-
-        private const val FILTER_METHOD_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/LithoFilterPatch;" +
-                    "->filter(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/nio/ByteBuffer;)Z"
-
-        internal lateinit var addFilter: (String) -> Unit
-            private set
-
-        private var filterCount = 0
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt b/main/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt
deleted file mode 100644
index 30383fbf33..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MicroGPatchCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt
deleted file mode 100644
index 577f1016a3..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastContextFetchFingerprint : MethodFingerprint(
-    strings = listOf("Error fetching CastContext.")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
deleted file mode 100644
index bf1f58cbea..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastDynamiteModuleFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
deleted file mode 100644
index 8939593cdd..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    strings = listOf("Failed to load module via V2: ")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
deleted file mode 100644
index ebca7a6ba3..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object GooglePlayUtilityFingerprint : MethodFingerprint(
-    returnType = "I",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("L", "I"),
-    strings = listOf("This should never happen.", "MetadataValueReader", "com.google.android.gms")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt
deleted file mode 100644
index 04fcf8613c..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PrimeFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt b/main/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt
deleted file mode 100644
index 8c98f055a6..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object ServiceCheckFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("L", "I"),
-    strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt b/main/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
deleted file mode 100644
index 0833b12a48..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.patch.bytecode
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
-import app.revanced.patches.youtube.layout.buttons.cast.patch.HideCastButtonPatch
-import app.revanced.patches.youtube.misc.fix.playback.patch.ClientSpoofPatch
-import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
-import app.revanced.patches.youtube.misc.microg.fingerprints.*
-import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
-import app.revanced.patches.youtube.misc.microg.shared.Constants.PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import app.revanced.util.microg.MicroGBytecodeHelper
-
-@Patch
-@DependsOn(
-    [
-        MicroGResourcePatch::class,
-        HideCastButtonPatch::class,
-        ClientSpoofPatch::class
-    ]
-)
-@Name("Vanced MicroG support")
-@Description("Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG.")
-@MicroGPatchCompatibility
-class MicroGBytecodePatch : BytecodePatch(
-    listOf(
-        ServiceCheckFingerprint,
-        GooglePlayUtilityFingerprint,
-        CastDynamiteModuleFingerprint,
-        CastDynamiteModuleV2Fingerprint,
-        CastContextFetchFingerprint,
-        PrimeFingerprint,
-        WatchWhileActivityFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context, arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
-                    PACKAGE_NAME,
-                    REVANCED_PACKAGE_NAME
-                )
-            ),
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                PrimeFingerprint,
-                PACKAGE_NAME,
-                REVANCED_PACKAGE_NAME
-            ),
-            listOf(
-                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
-                CastDynamiteModuleFingerprint,
-                CastDynamiteModuleV2Fingerprint,
-                CastContextFetchFingerprint
-            )
-        )
-
-        // inject the notice for MicroG
-        MicroGBytecodeHelper.injectNotice(WatchWhileActivityFingerprint)
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt b/main/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
deleted file mode 100644
index 14bb6b6192..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.patch.resource
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.Preference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.microg.shared.Constants.PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
-import app.revanced.util.microg.Constants.MICROG_VENDOR
-import app.revanced.util.microg.MicroGManifestHelper
-import app.revanced.util.microg.MicroGResourceHelper
-
-@DependsOn([SettingsResourcePatch::class])
-class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.addPreference(
-            Preference(
-                StringResource("microg_settings", "MicroG Settings"),
-                StringResource("microg_settings_summary", "Settings for MicroG"),
-                Preference.Intent("$MICROG_VENDOR.android.gms", "", "org.microg.gms.ui.SettingsActivity")
-            )
-        )
-        SettingsPatch.renameIntentsTargetPackage(REVANCED_PACKAGE_NAME)
-
-        // update manifest
-        MicroGResourceHelper.patchManifest(
-            context,
-            PACKAGE_NAME,
-            REVANCED_PACKAGE_NAME,
-            REVANCED_APP_NAME
-        )
-
-        // add metadata to manifest
-        MicroGManifestHelper.addSpoofingMetadata(
-            context,
-            SPOOFED_PACKAGE_NAME,
-            SPOOFED_PACKAGE_SIGNATURE
-        )
-
-        // add strings
-        MicroGResourceHelper.addStrings(context)
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/microg/shared/Constants.kt b/main/app/revanced/patches/youtube/misc/microg/shared/Constants.kt
deleted file mode 100644
index 8aa66d3cef..0000000000
--- a/main/app/revanced/patches/youtube/misc/microg/shared/Constants.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.misc.microg.shared
-
-internal object Constants {
-    const val REVANCED_APP_NAME = "YouTube ReVanced"
-    const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
-    const val PACKAGE_NAME = "com.google.android.youtube"
-    const val SPOOFED_PACKAGE_NAME = PACKAGE_NAME
-    const val SPOOFED_PACKAGE_SIGNATURE = "24bb24c05e47e0aefa68a58a766179d9b613a600"
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
deleted file mode 100644
index 782a7709c5..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MinimizedPlaybackCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
deleted file mode 100644
index 9763d18d3f..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters =  listOf("I", "L", "L"),
-    opcodes = listOf(
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("MinimizedPlaybackPolicyController;")
-    }
-)
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
deleted file mode 100644
index dbb7e1e45d..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
-    "Z",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("L"),
-    listOf(
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET,
-        Opcode.AND_INT_LIT16,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.CONST,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.GOTO,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt
deleted file mode 100644
index a184fe77d5..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IF_NEZ,
-        Opcode.GOTO,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST
-    ),
-)
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsParentFingerprint.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsParentFingerprint.kt
deleted file mode 100644
index 180547a2e2..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsParentFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-/**
- * Class fingerprint for [MinimizedPlaybackSettingsFingerprint]
- */
-object MinimizedPlaybackSettingsParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "I",
-    parameters = listOf(),
-    strings = listOf("BiometricManager", "Failure in canAuthenticate(). FingerprintManager was null.")
-)
diff --git a/main/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/main/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
deleted file mode 100644
index d9c8b8ef8e..0000000000
--- a/main/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package app.revanced.patches.youtube.misc.minimizedplayback.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.settings.preference.impl.NonInteractivePreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsParentFingerprint
-import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-
-@Patch
-@Name("Minimized playback")
-@Description("Enables minimized and background playback.")
-@DependsOn([IntegrationsPatch::class, PlayerTypeHookPatch::class, SettingsPatch::class])
-@MinimizedPlaybackCompatibility
-class MinimizedPlaybackPatch : BytecodePatch(
-    listOf(
-        MinimizedPlaybackManagerFingerprint,
-        MinimizedPlaybackSettingsParentFingerprint,
-        KidsMinimizedPlaybackPolicyControllerFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // TODO: remove this empty preference sometime after mid 2023
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            NonInteractivePreference(
-                StringResource("revanced_minimized_playback_enabled_title", "Minimized playback"),
-                StringResource("revanced_minimized_playback_summary_on", "This setting can be found in Settings -> Background")
-            )
-        )
-
-        MinimizedPlaybackManagerFingerprint.result?.apply {
-            mutableMethod.addInstructions(
-                0,
-                """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isPlaybackNotShort()Z
-                    move-result v0
-                    return v0
-                """
-            )
-        } ?: return MinimizedPlaybackManagerFingerprint.toErrorResult()
-
-        // Enable minimized playback option in YouTube settings
-        MinimizedPlaybackSettingsParentFingerprint.result ?: return MinimizedPlaybackSettingsParentFingerprint.toErrorResult()
-        MinimizedPlaybackSettingsFingerprint.resolve(context, MinimizedPlaybackSettingsParentFingerprint.result!!.classDef)
-        MinimizedPlaybackSettingsFingerprint.result?.apply {
-            val booleanCalls = method.implementation!!.instructions.withIndex()
-                .filter { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.returnType == "Z" }
-
-            val settingsBooleanIndex = booleanCalls.elementAt(1).index
-            val settingsBooleanMethod =
-                context.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
-
-            settingsBooleanMethod.addInstructions(
-                0,
-                """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->overrideMinimizedPlaybackAvailable()Z
-                    move-result v0
-                    return v0
-                """
-            )
-        } ?: return MinimizedPlaybackSettingsFingerprint.toErrorResult()
-
-        // Force allowing background play for videos labeled for kids.
-        // Some regions and YouTube accounts do not require this patch.
-        KidsMinimizedPlaybackPolicyControllerFingerprint.result?.apply {
-            mutableMethod.addInstruction(
-                0,
-                "return-void"
-            )
-        } ?: return KidsMinimizedPlaybackPolicyControllerFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/MinimizedPlaybackPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt b/main/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt
deleted file mode 100644
index 311f48506d..0000000000
--- a/main/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlayerControlsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt b/main/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
deleted file mode 100644
index 2658d45024..0000000000
--- a/main/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.bytecode.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Name("Player controls bytecode patch")
-@DependsOn([BottomControlsResourcePatch::class])
-@Description("Manages the code for the player controls of the YouTube player.")
-@PlayerControlsCompatibility
-class PlayerControlsBytecodePatch : BytecodePatch(
-    listOf(PlayerControlsVisibilityFingerprint, BottomControlsInflateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
-        inflateFingerprintResult = BottomControlsInflateFingerprint.result!!
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-
-        lateinit var showPlayerControlsFingerprintResult: MethodFingerprintResult
-
-        private var inflateFingerprintResult: MethodFingerprintResult? = null
-            set(fingerprint) {
-                field = fingerprint!!.also {
-                    moveToRegisterInstructionIndex = it.scanResult.patternScanResult!!.endIndex
-                    viewRegister =
-                        (it.mutableMethod.implementation!!.instructions[moveToRegisterInstructionIndex] as OneRegisterInstruction).registerA
-                }
-            }
-
-        private var moveToRegisterInstructionIndex: Int = 0
-        private var viewRegister: Int = 0
-
-        /**
-         * Injects the code to change the visibility of controls.
-         * @param descriptor The descriptor of the method which should be called.
-         */
-        fun injectVisibilityCheckCall(descriptor: String) {
-            showPlayerControlsFingerprintResult.mutableMethod.addInstruction(
-                0,
-                """
-                    invoke-static {p1}, $descriptor
-                """
-            )
-        }
-
-        /**
-         * Injects the code to initialize the controls.
-         * @param descriptor The descriptor of the method which should be calleed.
-         */
-        fun initializeControl(descriptor: String) {
-            inflateFingerprintResult!!.mutableMethod.addInstruction(
-                moveToRegisterInstructionIndex + 1,
-                "invoke-static {v$viewRegister}, $descriptor"
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt b/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
deleted file mode 100644
index 63864aa56c..0000000000
--- a/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object BottomControlsInflateFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
-    returnType = "L",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    literal = BottomControlsResourcePatch.bottomUiContainerResourceId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt b/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
deleted file mode 100644
index db64aaaa4a..0000000000
--- a/main/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object PlayerControlsVisibilityFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Z", "Z"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt b/main/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt
deleted file mode 100644
index 0df6883fb5..0000000000
--- a/main/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package app.revanced.patches.youtube.misc.playercontrols.resource.patch
-
-import app.revanced.patcher.data.DomFileEditor
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import java.io.Closeable
-
-@DependsOn([ResourceMappingPatch::class])
-class BottomControlsResourcePatch : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
-        resourceContext = context
-        targetXmlEditor = context.xmlEditor[TARGET_RESOURCE]
-
-        bottomUiContainerResourceId = ResourceMappingPatch.resourceMappings
-            .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        internal var bottomUiContainerResourceId : Long = -1
-
-        internal const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
-        private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
-
-        private lateinit var resourceContext: ResourceContext
-        private lateinit var targetXmlEditor: DomFileEditor
-
-        // The element to which to add the new elements to
-        private var lastLeftOf = "fullscreen_button"
-
-        /**
-         * Add new controls to the bottom of the YouTube player.
-         * @param hostYouTubeControlsBottomUiResourceName The hosting resource name containing the elements.
-         */
-        internal fun addControls(hostYouTubeControlsBottomUiResourceName: String) {
-            val sourceXmlEditor =
-                resourceContext.xmlEditor[this::class.java.classLoader.getResourceAsStream(
-                    hostYouTubeControlsBottomUiResourceName
-                )!!]
-
-            val targetElement =
-                "android.support.constraint.ConstraintLayout"
-
-            val hostElements = sourceXmlEditor.file.getElementsByTagName(targetElement).item(0).childNodes
-
-            val destinationResourceFile = this.targetXmlEditor.file
-            val destinationElement =
-                destinationResourceFile.getElementsByTagName(targetElement).item(0)
-
-            for (index in 1 until hostElements.length) {
-                val element = hostElements.item(index).cloneNode(true)
-
-                // if the element has no attributes theres no point to adding it to the destination
-                if (!element.hasAttributes()) continue
-
-                // set the elements lastLeftOf attribute to the lastLeftOf value
-                val namespace = "@+id"
-                element.attributes.getNamedItem("yt:layout_constraintRight_toLeftOf").nodeValue =
-                    "$namespace/$lastLeftOf"
-
-                // set lastLeftOf attribute to the current element
-                val nameSpaceLength = 5
-                lastLeftOf = element.attributes.getNamedItem("android:id").nodeValue.substring(nameSpaceLength)
-
-                // copy the element
-                destinationResourceFile.adoptNode(element)
-                destinationElement.appendChild(element)
-            }
-            sourceXmlEditor.close()
-        }
-    }
-
-    override fun close() {
-        targetXmlEditor.close()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt b/main/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt
deleted file mode 100644
index f65f81708d..0000000000
--- a/main/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.playeroverlay.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlayerOverlaysHookCompatibility
diff --git a/main/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt b/main/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt
deleted file mode 100644
index 1317e14dc8..0000000000
--- a/main/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.misc.playeroverlay.fingerprint
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;") && methodDef.name == "onFinishInflate"
-    }
-)
diff --git a/main/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt b/main/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt
deleted file mode 100644
index f78b879f15..0000000000
--- a/main/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.revanced.patches.youtube.misc.playeroverlay.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlaysHookCompatibility
-import app.revanced.patches.youtube.misc.playeroverlay.fingerprint.PlayerOverlaysOnFinishInflateFingerprint
-
-@Name("Player overlays hook")
-@Description("Hook for adding custom overlays to the video player.")
-@PlayerOverlaysHookCompatibility
-@DependsOn([IntegrationsPatch::class])
-class PlayerOverlaysHookPatch : BytecodePatch(
-    listOf(
-        PlayerOverlaysOnFinishInflateFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // hook YouTubePlayerOverlaysLayout.onFinishInflate()
-        val method = PlayerOverlaysOnFinishInflateFingerprint.result!!.mutableMethod
-        method.addInstruction(
-            method.implementation!!.instructions.size - 2,
-            "invoke-static { p0 }, Lapp/revanced/integrations/patches/PlayerOverlaysHookPatch;->YouTubePlayerOverlaysLayout_onFinishInflateHook(Ljava/lang/Object;)V"
-        )
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt b/main/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt
deleted file mode 100644
index 8630c376b2..0000000000
--- a/main/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.playertype.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlayerTypeHookCompatibility
diff --git a/main/app/revanced/patches/youtube/misc/playertype/fingerprint/PlayerTypeFingerprint.kt b/main/app/revanced/patches/youtube/misc/playertype/fingerprint/PlayerTypeFingerprint.kt
deleted file mode 100644
index c6588b82f5..0000000000
--- a/main/app/revanced/patches/youtube/misc/playertype/fingerprint/PlayerTypeFingerprint.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.misc.playertype.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object PlayerTypeFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NE,
-        Opcode.RETURN_VOID,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.RETURN_VOID,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;")
-    }
-)
diff --git a/main/app/revanced/patches/youtube/misc/playertype/fingerprint/VideoStateFingerprint.kt b/main/app/revanced/patches/youtube/misc/playertype/fingerprint/VideoStateFingerprint.kt
deleted file mode 100644
index 259915bcaf..0000000000
--- a/main/app/revanced/patches/youtube/misc/playertype/fingerprint/VideoStateFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.playertype.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object VideoStateFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT, // obfuscated parameter field name
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt b/main/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt
deleted file mode 100644
index ddf02cbdff..0000000000
--- a/main/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package app.revanced.patches.youtube.misc.playertype.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.annotation.PlayerTypeHookCompatibility
-import app.revanced.patches.youtube.misc.playertype.fingerprint.PlayerTypeFingerprint
-import app.revanced.patches.youtube.misc.playertype.fingerprint.VideoStateFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-
-@Name("Player type hook")
-@Description("Hook to get the current player type and video playback state.")
-@PlayerTypeHookCompatibility
-@DependsOn([IntegrationsPatch::class])
-class PlayerTypeHookPatch : BytecodePatch(
-    listOf(PlayerTypeFingerprint, VideoStateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-
-        PlayerTypeFingerprint.result?.let {
-            it.mutableMethod.apply {
-                addInstruction(
-                    0,
-                    "invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V"
-                )
-            }
-        } ?: return PlayerTypeFingerprint.toErrorResult()
-
-        VideoStateFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val endIndex = it.scanResult.patternScanResult!!.endIndex
-                val videoStateFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
-                addInstructions(
-                    0,
-                    """
-                        iget-object v0, p1, $videoStateFieldName  # copy VideoState parameter field
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->setVideoState(Ljava/lang/Enum;)V
-                    """
-                )
-            }
-        } ?: return VideoStateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/PlayerTypeHookPatch;"
-    }
-
-}
diff --git a/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt b/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt
deleted file mode 100644
index 05dfba24f9..0000000000
--- a/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package app.revanced.patches.youtube.misc.settings.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object LicenseActivityFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("LicenseActivity;") && methodDef.name == "onCreate"
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/SetThemeFingerprint.kt b/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/SetThemeFingerprint.kt
deleted file mode 100644
index 77e5485686..0000000000
--- a/main/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/SetThemeFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.youtube.misc.settings.bytecode.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SetThemeFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "L",
-    parameters = listOf(),
-    opcodes = listOf(Opcode.RETURN_OBJECT),
-    literal = SettingsResourcePatch.appearanceStringId
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt b/main/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
deleted file mode 100644
index 9bc4f46489..0000000000
--- a/main/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package app.revanced.patches.youtube.misc.settings.bytecode.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.Preference
-import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.LicenseActivityFingerprint
-import app.revanced.patches.youtube.misc.settings.bytecode.fingerprints.SetThemeFingerprint
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.util.MethodUtil
-import java.io.Closeable
-
-@DependsOn([IntegrationsPatch::class, SettingsResourcePatch::class])
-@Name("Settings")
-@Description("Adds settings for ReVanced to YouTube.")
-class SettingsPatch : BytecodePatch(
-    listOf(LicenseActivityFingerprint, SetThemeFingerprint)
-), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // TODO: Remove this when it is only required at one place.
-        fun getSetThemeInstructionString(
-            registers: String = "v0",
-            classDescriptor: String = THEME_HELPER_DESCRIPTOR,
-            methodName: String = SET_THEME_METHOD_NAME,
-            parameters: String = "Ljava/lang/Object;"
-        ) = "invoke-static { $registers }, $classDescriptor->$methodName($parameters)V"
-
-        SetThemeFingerprint.result?.mutableMethod?.let { setThemeMethod ->
-            setThemeMethod.implementation!!.instructions.mapIndexedNotNull { i, instruction ->
-                    if (instruction.opcode == Opcode.RETURN_OBJECT) i else null
-                }
-                .asReversed() // Prevent index shifting.
-                .forEach { returnIndex ->
-                    // The following strategy is to replace the return instruction with the setTheme instruction,
-                    // then add a return instruction after the setTheme instruction.
-                    // This is done because the return instruction is a target of another instruction.
-
-                    setThemeMethod.apply {
-                        // This register is returned by the setTheme method.
-                        val register = getInstruction<OneRegisterInstruction>(returnIndex).registerA
-
-                        val setThemeInstruction = getSetThemeInstructionString("v$register")
-                        replaceInstruction(returnIndex, setThemeInstruction)
-                        addInstruction(returnIndex + 1, "return-object v0")
-                    }
-                }
-        } ?: return SetThemeFingerprint.toErrorResult()
-
-
-        // Modify the license activity and remove all existing layout code.
-        // Must modify an existing activity and cannot add a new activity to the manifest,
-        // as that fails for root installations.
-        LicenseActivityFingerprint.result!!.apply licenseActivity@{
-            mutableMethod.apply {
-                fun buildSettingsActivityInvokeString(
-                    registers: String = "p0",
-                    classDescriptor: String = SETTINGS_ACTIVITY_DESCRIPTOR,
-                    methodName: String = "initializeSettings",
-                    parameters: String = "Landroid/app/Activity;"
-                ) = getSetThemeInstructionString(registers, classDescriptor, methodName, parameters)
-
-                // initialize the settings
-                addInstructions(
-                    1,
-                    """
-                        ${buildSettingsActivityInvokeString()}
-                        return-void
-                    """
-                )
-            }
-
-            // remove method overrides
-            mutableClass.apply {
-                methods.removeIf { it.name != "onCreate" && !MethodUtil.isConstructor(it) }
-            }
-        }
-
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        private const val INTEGRATIONS_PACKAGE = "app/revanced/integrations"
-        private const val SETTINGS_ACTIVITY_DESCRIPTOR = "L$INTEGRATIONS_PACKAGE/settingsmenu/ReVancedSettingActivity;"
-        private const val THEME_HELPER_DESCRIPTOR = "L$INTEGRATIONS_PACKAGE/utils/ThemeHelper;"
-        private const val SET_THEME_METHOD_NAME = "setTheme"
-
-        fun addString(identifier: String, value: String, formatted: Boolean = true) =
-            SettingsResourcePatch.addString(identifier, value, formatted)
-
-        fun addPreferenceScreen(preferenceScreen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) =
-            SettingsResourcePatch.addPreferenceScreen(preferenceScreen)
-
-        fun addPreference(preference: Preference) = SettingsResourcePatch.addPreference(preference)
-
-        fun renameIntentsTargetPackage(newPackage: String) {
-            SettingsResourcePatch.overrideIntentsTargetPackage = newPackage
-        }
-
-        /**
-         * Creates an intent to open ReVanced settings of the given name
-         */
-        fun createReVancedSettingsIntent(settingsName: String) = Preference.Intent(
-            "com.google.android.youtube",
-            settingsName,
-            "com.google.android.libraries.social.licenses.LicenseActivity"
-        )
-    }
-
-    /**
-     * Preference screens patches should add their settings to.
-     */
-    internal object PreferenceScreen : AbstractPreferenceScreen() {
-        val ADS = Screen("ads", "Ads", "Ad related settings")
-        val INTERACTIONS = Screen("interactions", "Interaction", "Settings related to interactions")
-        val LAYOUT = Screen("layout", "Layout", "Settings related to the layout")
-        val VIDEO = Screen("video", "Video", "Settings related to the video player")
-        val MISC = Screen("misc", "Misc", "Miscellaneous patches")
-
-        override fun commit(screen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) {
-            addPreferenceScreen(screen)
-        }
-    }
-
-    override fun close() = PreferenceScreen.close()
-}
diff --git a/main/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt b/main/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
deleted file mode 100644
index 3b3683511d..0000000000
--- a/main/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
+++ /dev/null
@@ -1,176 +0,0 @@
-package app.revanced.patches.youtube.misc.settings.resource.patch
-
-import app.revanced.patcher.data.DomFileEditor
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.addPreference
-import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.shared.settings.resource.patch.AbstractSettingsResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.copyResources
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-
-@DependsOn([ResourceMappingPatch::class])
-class SettingsResourcePatch : AbstractSettingsResourcePatch(
-    "revanced_prefs",
-    "settings"
-) {
-    override fun execute(context: ResourceContext): PatchResult {
-        super.execute(context)
-
-        // Used for a fingerprint from SettingsPatch.
-        appearanceStringId = ResourceMappingPatch.resourceMappings.find {
-            it.type == "string" && it.name == "app_theme_appearance_dark"
-        }!!.id
-
-        /*
-         * copy layout resources
-         */
-        arrayOf(
-            ResourceUtils.ResourceGroup("layout", "revanced_settings_with_toolbar.xml")
-        ).forEach { resourceGroup ->
-            context.copyResources("settings", resourceGroup)
-        }
-
-        preferencesEditor = context.xmlEditor["res/xml/settings_fragment.xml"]
-
-        // Modify the manifest and add an data intent filter to the LicenseActivity.
-        // Some devices freak out if undeclared data is passed to an intent,
-        // and this change appears to fix the issue.
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            // An xml regular expression would probably work better than this manual searching.
-            val manifestNodes = editor.file.getElementsByTagName("manifest").item(0).childNodes
-            for (i in 0..manifestNodes.length) {
-                val node = manifestNodes.item(i)
-                if (node != null && node.nodeName == "application") {
-                    val applicationNodes = node.childNodes
-                    for (j in 0..applicationNodes.length) {
-                        val applicationChild = applicationNodes.item(j)
-                        if (applicationChild is Element && applicationChild.nodeName == "activity"
-                            && applicationChild.getAttribute("android:name") == "com.google.android.libraries.social.licenses.LicenseActivity"
-                        ) {
-                            val intentFilter = editor.file.createElement("intent-filter")
-                            val mimeType = editor.file.createElement("data")
-                            mimeType.setAttribute("android:mimeType", "text/plain")
-                            intentFilter.appendChild(mimeType)
-                            applicationChild.appendChild(intentFilter)
-                            break
-                        }
-                    }
-                }
-            }
-        }
-
-
-        // Add the ReVanced settings to the YouTube settings
-        SettingsPatch.addPreference(
-            Preference(
-                StringResource("revanced_settings", "ReVanced"),
-                StringResource("revanced_settings_summary", "ReVanced specific settings"),
-                SettingsPatch.createReVancedSettingsIntent("revanced_settings")
-            )
-        )
-
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            TextPreference(
-                key = null,
-                title = StringResource("revanced_pref_import_export_title", "Import / Export"),
-                summary = StringResource("revanced_pref_import_export_summary", "Import / Export ReVanced settings"),
-                inputType = InputType.TEXT_MULTI_LINE,
-                tag = "app.revanced.integrations.settingsmenu.ImportExportPreference"
-            )
-        )
-
-        context.mergeStrings("settings/host/values/strings.xml")
-
-        return PatchResultSuccess()
-    }
-
-
-    internal companion object {
-        // Used for a fingerprint from SettingsPatch.
-        internal var appearanceStringId = -1L
-
-        // if this is not null, all intents will be renamed to this
-        var overrideIntentsTargetPackage: String? = null
-
-        private var preferencesNode: Node? = null
-
-        private var preferencesEditor: DomFileEditor? = null
-            set(value) {
-                field = value
-                preferencesNode = value.getNode("PreferenceScreen")
-            }
-
-        /* Companion delegates */
-
-        /**
-         * Add a preference fragment to the main preferences.
-         *
-         * @param preference The preference to add.
-         */
-        fun addPreference(preference: Preference) =
-            preferencesNode!!.addPreference(preference) { it.include() }
-
-        /**
-         * Add a new string to the resources.
-         *
-         * @param identifier The key of the string.
-         * @param value The value of the string.
-         * @throws IllegalArgumentException if the string already exists.
-         */
-        fun addString(identifier: String, value: String, formatted: Boolean) =
-            AbstractSettingsResourcePatch.addString(identifier, value, formatted)
-
-        /**
-         * Add an array to the resources.
-         *
-         * @param arrayResource The array resource to add.
-         */
-        fun addArray(arrayResource: ArrayResource) = AbstractSettingsResourcePatch.addArray(arrayResource)
-
-        /**
-         * Add a preference to the settings.
-         *
-         * @param preferenceScreen The name of the preference screen.
-         */
-        fun addPreferenceScreen(preferenceScreen: PreferenceScreen) = addPreference(preferenceScreen)
-    }
-
-    override fun close() {
-        super.close()
-
-        // rename the intent package names if it was set
-        overrideIntentsTargetPackage?.let { packageName ->
-            val preferences = preferencesEditor!!.getNode("PreferenceScreen").childNodes
-            for (i in 1 until preferences.length) {
-                val preferenceNode = preferences.item(i)
-                // preferences have a child node with the intent tag, skip over every other node
-                if (preferenceNode.childNodes.length == 0) continue
-
-                val intentNode = preferenceNode.firstChild
-
-                // if the node doesn't have a target package attribute, skip it
-                val targetPackageAttribute = intentNode.attributes.getNamedItem("android:targetPackage") ?: continue
-
-                // do not replace intent target package if the package name is not from YouTube
-                val youtubePackage = "com.google.android.youtube"
-                if (targetPackageAttribute.nodeValue != youtubePackage) continue
-
-                // replace the target package name
-                intentNode.attributes.setNamedItem(preferenceNode.ownerDocument.createAttribute("android:targetPackage")
-                    .also { attribute ->
-                        attribute.value = packageName
-                    })
-            }
-        }
-
-        preferencesEditor?.close()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/zoomhaptics/annotations/ZoomHapticsCompatibility.kt b/main/app/revanced/patches/youtube/misc/zoomhaptics/annotations/ZoomHapticsCompatibility.kt
deleted file mode 100644
index 9b6a023065..0000000000
--- a/main/app/revanced/patches/youtube/misc/zoomhaptics/annotations/ZoomHapticsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.zoomhaptics.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ZoomHapticsCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/zoomhaptics/fingerprints/ZoomHapticsFingerprint.kt b/main/app/revanced/patches/youtube/misc/zoomhaptics/fingerprints/ZoomHapticsFingerprint.kt
deleted file mode 100644
index 493db9c4ef..0000000000
--- a/main/app/revanced/patches/youtube/misc/zoomhaptics/fingerprints/ZoomHapticsFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.misc.zoomhaptics.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ZoomHapticsFingerprint : MethodFingerprint(
-    strings = listOf(
-        "Failed to haptics vibrate for video zoom"
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt b/main/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
deleted file mode 100644
index 719aa0013e..0000000000
--- a/main/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package app.revanced.patches.youtube.misc.zoomhaptics.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.zoomhaptics.annotations.ZoomHapticsCompatibility
-import app.revanced.patches.youtube.misc.zoomhaptics.fingerprints.ZoomHapticsFingerprint
-
-@Patch
-@Name("Disable zoom haptics")
-@Description("Disables haptics when zooming.")
-@DependsOn([SettingsPatch::class])
-@ZoomHapticsCompatibility
-class ZoomHapticsPatch : BytecodePatch(
-    listOf(ZoomHapticsFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_disable_zoom_haptics",
-                StringResource("revanced_disable_zoom_haptics_title", "Disable zoom haptics"),
-                StringResource("revanced_disable_zoom_haptics_summary_on", "Haptics are disabled"),
-                StringResource("revanced_disable_zoom_haptics_summary_off", "Haptics are enabled")
-            )
-        )
-
-        val zoomHapticsFingerprintMethod = ZoomHapticsFingerprint.result!!.mutableMethod
-
-        zoomHapticsFingerprintMethod.addInstructionsWithLabels(
-            0,
-            """
-                invoke-static { }, Lapp/revanced/integrations/patches/ZoomHapticsPatch;->shouldVibrate()Z
-                move-result v0
-                if-nez v0, :vibrate
-                return-void
-            """,
-            ExternalLabel("vibrate", zoomHapticsFingerprintMethod.getInstruction(0))
-        )
-
-        return PatchResultSuccess()
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/hdrbrightness/annotations/HDRBrightnessCompatibility.kt b/main/app/revanced/patches/youtube/video/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
deleted file mode 100644
index 85bb22dcfc..0000000000
--- a/main/app/revanced/patches/youtube/video/hdrbrightness/annotations/HDRBrightnessCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.hdrbrightness.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HDRBrightnessCompatibility
diff --git a/main/app/revanced/patches/youtube/video/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt b/main/app/revanced/patches/youtube/video/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
deleted file mode 100644
index 0db80f8807..0000000000
--- a/main/app/revanced/patches/youtube/video/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.video.hdrbrightness.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object HDRBrightnessFingerprint : MethodFingerprint(
-    "V",
-    opcodes = listOf(Opcode.CMPL_FLOAT),
-    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt b/main/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt
deleted file mode 100644
index 69de869687..0000000000
--- a/main/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package app.revanced.patches.youtube.video.hdrbrightness.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.video.hdrbrightness.annotations.HDRBrightnessCompatibility
-import app.revanced.patches.youtube.video.hdrbrightness.fingerprints.HDRBrightnessFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Patch
-@Name("HDR auto brightness")
-@Description("Makes the brightness of HDR videos follow the system default.")
-@HDRBrightnessCompatibility
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-class HDRBrightnessPatch : BytecodePatch(
-    listOf(HDRBrightnessFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference(
-                "revanced_hdr_auto_brightness",
-                StringResource("revanced_hdr_auto_brightness_title", "Enable auto HDR brightness"),
-                StringResource("revanced_hdr_auto_brightness_summary_on", "Auto HDR brightness is enabled"),
-                StringResource("revanced_hdr_auto_brightness_summary_off", "Auto HDR brightness is disabled")
-            )
-        )
-
-        val method = HDRBrightnessFingerprint.result!!.mutableMethod
-
-        method.implementation!!.instructions.filter { instruction ->
-            val fieldReference = (instruction as? ReferenceInstruction)?.reference as? FieldReference
-            fieldReference?.let { it.name == "screenBrightness" } == true
-        }.forEach { instruction ->
-            val brightnessRegisterIndex = method.implementation!!.instructions.indexOf(instruction)
-            val register = (instruction as TwoRegisterInstruction).registerA
-
-            val insertIndex = brightnessRegisterIndex + 1
-            method.addInstructions(
-                insertIndex,
-                """
-                   invoke-static {v$register}, Lapp/revanced/integrations/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
-                   move-result v$register
-                """
-            )
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/youtube/video/information/annotation/VideoInformationCompatibility.kt b/main/app/revanced/patches/youtube/video/information/annotation/VideoInformationCompatibility.kt
deleted file mode 100644
index 1b52f4df0a..0000000000
--- a/main/app/revanced/patches/youtube/video/information/annotation/VideoInformationCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.information.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class VideoInformationCompatibility
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt
deleted file mode 100644
index 5bfa9579d1..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("timed_markers_width")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/OnPlaybackSpeedItemClickFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/OnPlaybackSpeedItemClickFingerprint.kt
deleted file mode 100644
index 81de6a392f..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/OnPlaybackSpeedItemClickFingerprint.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object OnPlaybackSpeedItemClickFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L", "L", "I", "J"),
-    customFingerprint = { methodDef, _ -> methodDef.name == "onItemClick" },
-    opcodes = listOf(
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt
deleted file mode 100644
index 628421a01d..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-import org.jf.dexlib2.Opcode
-
-object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
-    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
-    strings = listOf("Media progress reported outside media playback: ")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerInitFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerInitFingerprint.kt
deleted file mode 100644
index d772935b5c..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/PlayerInitFingerprint.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PlayerInitFingerprint : MethodFingerprint(
-    strings = listOf(
-        "playVideo called on player response with no videoStreamingData."
-    ),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/SeekFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/SeekFingerprint.kt
deleted file mode 100644
index c6d9b28791..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/SeekFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SeekFingerprint : MethodFingerprint(
-    strings = listOf("Attempting to seek during an ad")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/fingerprints/VideoLengthFingerprint.kt b/main/app/revanced/patches/youtube/video/information/fingerprints/VideoLengthFingerprint.kt
deleted file mode 100644
index 89d4d16c6e..0000000000
--- a/main/app/revanced/patches/youtube/video/information/fingerprints/VideoLengthFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-import org.jf.dexlib2.Opcode
-
-object VideoLengthFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.CMP_LONG,
-        Opcode.IF_LEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.GOTO,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt b/main/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt
deleted file mode 100644
index 3b3a3dcae9..0000000000
--- a/main/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt
+++ /dev/null
@@ -1,214 +0,0 @@
-package app.revanced.patches.youtube.video.information.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.video.information.annotation.VideoInformationCompatibility
-import app.revanced.patches.youtube.video.information.fingerprints.*
-import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackSpeedPatch
-import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.immutable.ImmutableMethod
-import org.jf.dexlib2.immutable.ImmutableMethodParameter
-import org.jf.dexlib2.util.MethodUtil
-
-@Name("Video information")
-@Description("Hooks YouTube to get information about the current playing video.")
-@VideoInformationCompatibility
-@DependsOn([IntegrationsPatch::class, VideoIdPatch::class])
-class VideoInformationPatch : BytecodePatch(
-    listOf(
-        PlayerInitFingerprint,
-        CreateVideoPlayerSeekbarFingerprint,
-        PlayerControllerSetTimeReferenceFingerprint,
-        OnPlaybackSpeedItemClickFingerprint,
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        with(PlayerInitFingerprint.result!!) {
-            playerInitMethod = mutableClass.methods.first { MethodUtil.isConstructor(it) }
-
-            // hook the player controller for use through integrations
-            onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "initialize")
-
-            // seek method
-            val seekFingerprintResultMethod = SeekFingerprint.also { it.resolve(context, classDef) }.result!!.method
-
-            // create helper method
-            val seekHelperMethod = ImmutableMethod(
-                seekFingerprintResultMethod.definingClass,
-                "seekTo",
-                listOf(ImmutableMethodParameter("J", null, "time")),
-                "Z",
-                AccessFlags.PUBLIC or AccessFlags.FINAL,
-                null, null,
-                MutableMethodImplementation(4)
-            ).toMutable()
-
-            // get enum type for the seek helper method
-            val seekSourceEnumType = seekFingerprintResultMethod.parameterTypes[1].toString()
-
-            // insert helper method instructions
-            seekHelperMethod.addInstructions(
-                0,
-                """
-                    sget-object v0, $seekSourceEnumType->a:$seekSourceEnumType
-                    invoke-virtual {p0, p1, p2, v0}, ${seekFingerprintResultMethod.definingClass}->${seekFingerprintResultMethod.name}(J$seekSourceEnumType)Z
-                    move-result p1
-                    return p1
-                """
-            )
-
-            // add the seekTo method to the class for the integrations to call
-            mutableClass.methods.add(seekHelperMethod)
-        }
-
-        with(CreateVideoPlayerSeekbarFingerprint.result!!) {
-            val videoLengthMethodResult = VideoLengthFingerprint.also { it.resolve(context, classDef) }.result!!
-
-            with(videoLengthMethodResult.mutableMethod) {
-                val videoLengthRegisterIndex = videoLengthMethodResult.scanResult.patternScanResult!!.endIndex - 2
-                val videoLengthRegister = getInstruction<OneRegisterInstruction>(videoLengthRegisterIndex).registerA
-                val dummyRegisterForLong = videoLengthRegister + 1 // required for long values since they are wide
-
-                addInstruction(
-                    videoLengthMethodResult.scanResult.patternScanResult!!.endIndex,
-                    "invoke-static {v$videoLengthRegister, v$dummyRegisterForLong}, $INTEGRATIONS_CLASS_DESCRIPTOR->setVideoLength(J)V"
-                )
-            }
-        }
-
-        /*
-         * Inject call for video id
-         */
-        val videoIdMethodDescriptor = "$INTEGRATIONS_CLASS_DESCRIPTOR->setVideoId(Ljava/lang/String;)V"
-        VideoIdPatch.injectCall(videoIdMethodDescriptor)
-        VideoIdPatch.injectCallBackgroundPlay(videoIdMethodDescriptor)
-
-        /*
-         * Set the video time method
-         */
-        with(PlayerControllerSetTimeReferenceFingerprint.result!!) {
-            timeMethod = context.toMethodWalker(method)
-                .nextMethod(scanResult.patternScanResult!!.startIndex, true)
-                .getMethod() as MutableMethod
-        }
-
-        /*
-         * Hook the methods which set the time
-         */
-        videoTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTime")
-
-
-        /*
-         * Hook the user playback speed selection
-         */
-        OnPlaybackSpeedItemClickFingerprint.result?.apply {
-            speedSelectionInsertMethod = mutableMethod
-            speedSelectionInsertIndex = scanResult.patternScanResult!!.startIndex - 3
-            speedSelectionValueRegister =
-                mutableMethod.getInstruction<FiveRegisterInstruction>(speedSelectionInsertIndex).registerD
-
-            val speedSelectionMethodInstructions = mutableMethod.implementation!!.instructions
-            setPlaybackSpeedContainerClassFieldReference =
-                getReference(speedSelectionMethodInstructions, -1, Opcode.IF_EQZ)
-            setPlaybackSpeedClassFieldReference =
-                getReference(speedSelectionMethodInstructions, 1, Opcode.IGET)
-            setPlaybackSpeedMethodReference =
-                getReference(speedSelectionMethodInstructions, 2, Opcode.IGET)
-        } ?: return OnPlaybackSpeedItemClickFingerprint.toErrorResult()
-
-        userSelectedPlaybackSpeedHook(INTEGRATIONS_CLASS_DESCRIPTOR, "userSelectedPlaybackSpeed")
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/VideoInformation;"
-
-        private lateinit var playerInitMethod: MutableMethod
-        private var playerInitInsertIndex = 4
-
-        private lateinit var timeMethod: MutableMethod
-        private var timeInitInsertIndex = 2
-
-        private fun MutableMethod.insert(insertIndex: Int, register: String, descriptor: String) =
-            addInstruction(insertIndex, "invoke-static { $register }, $descriptor")
-
-        private fun MutableMethod.insertTimeHook(insertIndex: Int, descriptor: String) =
-            insert(insertIndex, "p1, p2", descriptor)
-
-        /**
-         * Hook the player controller.  Called when a video is opened or the current video is changed.
-         *
-         * Note: This hook is called very early and is called before the video id, video time, video length,
-         * and many other data fields are set.
-         *
-         * @param targetMethodClass The descriptor for the class to invoke when the player controller is created.
-         * @param targetMethodName The name of the static method to invoke when the player controller is created.
-         */
-        internal fun onCreateHook(targetMethodClass: String, targetMethodName: String) =
-            playerInitMethod.insert(
-                playerInitInsertIndex++,
-                "v0",
-                "$targetMethodClass->$targetMethodName(Ljava/lang/Object;)V"
-            )
-
-        /**
-         * Hook the video time.
-         * The hook is usually called once per second.
-         *
-         * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
-         * @param targetMethodName The name of the static method to invoke when the player controller is created.
-         */
-        internal fun videoTimeHook(targetMethodClass: String, targetMethodName: String) =
-            timeMethod.insertTimeHook(
-                timeInitInsertIndex++,
-                "$targetMethodClass->$targetMethodName(J)V"
-            )
-
-        private fun getReference(instructions: List<BuilderInstruction>, offset: Int, opcode: Opcode) =
-            (instructions[instructions.indexOfFirst { it.opcode == opcode } + offset] as ReferenceInstruction)
-                .reference.toString()
-
-        private lateinit var speedSelectionInsertMethod: MutableMethod
-        private var speedSelectionInsertIndex = 0
-        private var speedSelectionValueRegister = 0
-
-        /**
-         * Hook the video speed selected by the user.
-         */
-        internal fun userSelectedPlaybackSpeedHook(targetMethodClass: String, targetMethodName: String) =
-            speedSelectionInsertMethod.addInstruction(
-            speedSelectionInsertIndex++,
-            "invoke-static {v$speedSelectionValueRegister}, $targetMethodClass->$targetMethodName(F)V"
-        )
-        
-        /**
-         * Used by [RememberPlaybackSpeedPatch]
-         */
-        internal lateinit var setPlaybackSpeedContainerClassFieldReference: String
-        internal lateinit var setPlaybackSpeedClassFieldReference: String
-        internal lateinit var setPlaybackSpeedMethodReference: String
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/quality/annotations/RememberVideoQualityCompatibility.kt b/main/app/revanced/patches/youtube/video/quality/annotations/RememberVideoQualityCompatibility.kt
deleted file mode 100644
index deb0185e90..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/annotations/RememberVideoQualityCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.quality.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RememberVideoQualityCompatibility
diff --git a/main/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt b/main/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt
deleted file mode 100644
index f1dcf0a5bb..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package app.revanced.patches.youtube.video.quality.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object NewVideoQualityChangedFingerprint : MethodFingerprint(
-    returnType = "L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET,  // Video resolution (human readable).
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.IF_NE,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET,
-    )
-)
diff --git a/main/app/revanced/patches/youtube/video/quality/fingerprints/SetQualityByIndexMethodClassFieldReferenceFingerprint.kt b/main/app/revanced/patches/youtube/video/quality/fingerprints/SetQualityByIndexMethodClassFieldReferenceFingerprint.kt
deleted file mode 100644
index a4707a492a..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/fingerprints/SetQualityByIndexMethodClassFieldReferenceFingerprint.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.video.quality.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-/**
- * Resolves with the class found in [VideoQualitySetterFingerprint].
- */
-object SetQualityByIndexMethodClassFieldReferenceFingerprint : MethodFingerprint(
-    returnType = "V",
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.RETURN_VOID
-    )
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualityItemOnClickParentFingerprint.kt b/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualityItemOnClickParentFingerprint.kt
deleted file mode 100644
index a9e5906711..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualityItemOnClickParentFingerprint.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-package app.revanced.patches.youtube.video.quality.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object VideoQualityItemOnClickParentFingerprint : MethodFingerprint(
-    "V",
-    strings = listOf("VIDEO_QUALITIES_MENU_BOTTOM_SHEET_FRAGMENT")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualitySetterFingerprint.kt b/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualitySetterFingerprint.kt
deleted file mode 100644
index ab95b0b5bd..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/fingerprints/VideoQualitySetterFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package app.revanced.patches.youtube.video.quality.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object VideoQualitySetterFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("[L", "I", "Z"),
-    listOf(
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_BOOLEAN,
-    ),
-    strings = listOf("menu_item_video_quality"),
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt b/main/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt
deleted file mode 100644
index 6cf2e89790..0000000000
--- a/main/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt
+++ /dev/null
@@ -1,202 +0,0 @@
-package app.revanced.patches.youtube.video.quality.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.video.quality.annotations.RememberVideoQualityCompatibility
-import app.revanced.patches.youtube.video.quality.fingerprints.NewVideoQualityChangedFingerprint
-import app.revanced.patches.youtube.video.quality.fingerprints.SetQualityByIndexMethodClassFieldReferenceFingerprint
-import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualityItemOnClickParentFingerprint
-import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualitySetterFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Patch
-@DependsOn([IntegrationsPatch::class, VideoInformationPatch::class, SettingsPatch::class])
-@Name("Remember video quality")
-@Description("Adds the ability to remember the video quality you chose in the video quality flyout.")
-@RememberVideoQualityCompatibility
-class RememberVideoQualityPatch : BytecodePatch(
-    listOf(
-        VideoQualitySetterFingerprint,
-        VideoQualityItemOnClickParentFingerprint,
-        NewVideoQualityChangedFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // This is bloated as each value has it's own String key/value
-        // ideally the entries would be raw values (and not a key to a String resource)
-        val entries = listOf(
-            StringResource("revanced_video_quality_default_entry_1", "Automatic quality"),
-            StringResource("revanced_video_quality_default_entry_2", "2160p"),
-            StringResource("revanced_video_quality_default_entry_3", "1440p"),
-            StringResource("revanced_video_quality_default_entry_4", "1080p"),
-            StringResource("revanced_video_quality_default_entry_5", "720p"),
-            StringResource("revanced_video_quality_default_entry_6", "480p"),
-            StringResource("revanced_video_quality_default_entry_7", "360p"),
-            StringResource("revanced_video_quality_default_entry_8", "240p"),
-            StringResource("revanced_video_quality_default_entry_9", "144p"),
-        )
-        val entryValues = listOf(
-            StringResource("revanced_video_quality_default_entry_value_1", "-2"),
-            StringResource("revanced_video_quality_default_entry_value_2", "2160"),
-            StringResource("revanced_video_quality_default_entry_value_3", "1440"),
-            StringResource("revanced_video_quality_default_entry_value_4", "1080"),
-            StringResource("revanced_video_quality_default_entry_value_5", "720"),
-            StringResource("revanced_video_quality_default_entry_value_6", "480"),
-            StringResource("revanced_video_quality_default_entry_value_7", "360"),
-            StringResource("revanced_video_quality_default_entry_value_8", "240"),
-            StringResource("revanced_video_quality_default_entry_value_9", "144"),
-        )
-
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference(
-                "revanced_remember_video_quality_last_selected",
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_title",
-                    "Remember video quality changes"
-                ),
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_summary_on",
-                    "Quality changes apply to all videos"
-                ),
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_summary_off",
-                    "Quality changes only apply to the current video"
-                )
-            ),
-            ListPreference(
-                "revanced_video_quality_default_wifi",
-                StringResource(
-                    "revanced_video_quality_default_wifi_title",
-                    "Default video quality on Wi-Fi network"
-                ),
-                ArrayResource("revanced_video_quality_default_wifi_entry", entries),
-                ArrayResource("revanced_video_quality_default_wifi_entry_values", entryValues)
-                // default value and summary are set by integrations after loading
-            ),
-            ListPreference(
-                "revanced_video_quality_default_mobile",
-                StringResource(
-                    "revanced_video_quality_default_mobile_title",
-                    "Default video quality on mobile network"
-                ),
-                ArrayResource("revanced_video_quality_default_mobile_entries", entries),
-                ArrayResource("revanced_video_quality_default_mobile_values", entryValues)
-            )
-        )
-
-        /*
-         * The following code works by hooking the method which is called when the user selects a video quality
-         * to remember the last selected video quality.
-         *
-         * It also hooks the method which is called when the video quality to set is determined.
-         * Conveniently, at this point the video quality is overridden to the remembered playback speed.
-         */
-
-        VideoInformationPatch.onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "newVideoStarted")
-
-
-        // Inject a call to set the remembered quality once a video loads.
-        VideoQualitySetterFingerprint.result?.also {
-            if (!SetQualityByIndexMethodClassFieldReferenceFingerprint.resolve(context, it.classDef))
-                return PatchResultError("Could not resolve fingerprint to find setQualityByIndex method")
-        }?.let {
-            // This instruction refers to the field with the type that contains the setQualityByIndex method.
-            val instructions = SetQualityByIndexMethodClassFieldReferenceFingerprint.result!!
-                .method.implementation!!.instructions
-
-            val getOnItemClickListenerClassReference =
-                (instructions.elementAt(0) as ReferenceInstruction).reference
-            val getSetQualityByIndexMethodClassFieldReference =
-                (instructions.elementAt(1) as ReferenceInstruction).reference
-
-            val setQualityByIndexMethodClassFieldReference =
-                getSetQualityByIndexMethodClassFieldReference as FieldReference
-
-            val setQualityByIndexMethodClass = context.classes
-                .find { classDef -> classDef.type == setQualityByIndexMethodClassFieldReference.type }!!
-
-            // Get the name of the setQualityByIndex method.
-            val setQualityByIndexMethod = setQualityByIndexMethodClass.methods
-                .find { method -> method.parameterTypes.first() == "I" }
-                ?: return PatchResultError("Could not find setQualityByIndex method")
-
-            it.mutableMethod.addInstructions(
-                0,
-                """
-                    # Get the object instance to invoke the setQualityByIndex method on.
-                    iget-object v0, p0, $getOnItemClickListenerClassReference
-                    iget-object v0, v0, $getSetQualityByIndexMethodClassFieldReference
-                    
-                    # Get the method name.
-                    const-string v1, "${setQualityByIndexMethod.name}"
-                    
-                    # Set the quality.
-                    # The first parameter is the array list of video qualities.
-                    # The second parameter is the index of the selected quality.
-                    # The register v0 stores the object instance to invoke the setQualityByIndex method on.
-                    # The register v1 stores the name of the setQualityByIndex method.
-                    invoke-static {p1, p2, v0, v1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setVideoQuality([Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/String;)I
-                    move-result p2
-                """,
-            )
-        } ?: return VideoQualitySetterFingerprint.toErrorResult()
-
-
-        // Inject a call to remember the selected quality.
-        VideoQualityItemOnClickParentFingerprint.result?.let {
-            val onItemClickMethod = it.mutableClass.methods.find { method -> method.name == "onItemClick" }
-
-            onItemClickMethod?.apply {
-                val listItemIndexParameter = 3
-
-                addInstruction(
-                    0,
-                    "invoke-static {p$listItemIndexParameter}, $INTEGRATIONS_CLASS_DESCRIPTOR->userChangedQuality(I)V"
-                )
-            } ?: return PatchResultError("Failed to find onItemClick method")
-        } ?: return VideoQualityItemOnClickParentFingerprint.toErrorResult()
-
-
-        // Remember video quality if not using old layout menu.
-        NewVideoQualityChangedFingerprint.result?.apply {
-            mutableMethod.apply {
-                val index = scanResult.patternScanResult!!.startIndex
-                val qualityRegister = getInstruction<TwoRegisterInstruction>(index).registerA
-
-                addInstruction(
-                    index + 1,
-                    "invoke-static {v$qualityRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->userChangedQualityInNewFlyout(I)V"
-                )
-            }
-        } ?: return NewVideoQualityChangedFingerprint.toErrorResult()
-
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt b/main/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt
deleted file mode 100644
index 5eb3a30a78..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.video.speed
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.video.speed.custom.patch.CustomPlaybackSpeedPatch
-import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackSpeedPatch
-
-@Patch
-@Name("Playback speed")
-@Description("Adds custom playback speeds and ability to remember the playback speed you chose in the video playback speed flyout.")
-@DependsOn([CustomPlaybackSpeedPatch::class, RememberPlaybackSpeedPatch::class])
-@PlaybackSpeedCompatibility
-class PlaybackSpeed : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
-        return PatchResultSuccess() // All patches this patch depends on succeed.
-    }
-}
diff --git a/main/app/revanced/patches/youtube/video/speed/PlaybackSpeedCompatibility.kt b/main/app/revanced/patches/youtube/video/speed/PlaybackSpeedCompatibility.kt
deleted file mode 100644
index 2181dc9187..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/PlaybackSpeedCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.speed
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class PlaybackSpeedCompatibility
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/GetOldPlaybackSpeedsFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/GetOldPlaybackSpeedsFingerprint.kt
deleted file mode 100644
index e7901c5d08..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/GetOldPlaybackSpeedsFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object GetOldPlaybackSpeedsFingerprint : MethodFingerprint(
-    parameters = listOf("[L", "I"),
-    strings = listOf("menu_item_playback_speed")
-)
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuFingerprint.kt
deleted file mode 100644
index 9e7d00db4b..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ShowOldPlaybackSpeedMenuFingerprint : MethodFingerprint(
-    strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
-)
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuIntegrationsFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuIntegrationsFingerprint.kt
deleted file mode 100644
index 2d49d81828..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuIntegrationsFingerprint.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ShowOldPlaybackSpeedMenuIntegrationsFingerprint : MethodFingerprint(
-    customFingerprint = { method, _ -> method.name == "showOldPlaybackSpeedMenu" }
-)
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedArrayGeneratorFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedArrayGeneratorFingerprint.kt
deleted file mode 100644
index ba9982988d..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedArrayGeneratorFingerprint.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SpeedArrayGeneratorFingerprint : MethodFingerprint(
-    returnType = "[L",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
-    opcodes = listOf(
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO_16,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-    ),
-    strings = listOf("0.0#")
-)
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedLimiterFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedLimiterFingerprint.kt
deleted file mode 100644
index 30c315de82..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/fingerprints/SpeedLimiterFingerprint.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object SpeedLimiterFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("F"),
-    listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_HIGH16,
-        Opcode.GOTO,
-        Opcode.CONST_HIGH16,
-        Opcode.CONST_HIGH16,
-        Opcode.INVOKE_STATIC,
-    ),
-)
diff --git a/main/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt b/main/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt
deleted file mode 100644
index f3c08a83af..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt
+++ /dev/null
@@ -1,190 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patches.shared.settings.preference.impl.*
-import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookPatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.video.speed.custom.fingerprints.*
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.immutable.ImmutableField
-
-@Name("Custom playback speed")
-@Description("Adds custom playback speed options.")
-@DependsOn([IntegrationsPatch::class, LithoFilterPatch::class, SettingsPatch::class, BottomSheetHookPatch::class])
-class CustomPlaybackSpeedPatch : BytecodePatch(
-    listOf(
-        SpeedArrayGeneratorFingerprint,
-        SpeedLimiterFingerprint,
-        GetOldPlaybackSpeedsFingerprint,
-        ShowOldPlaybackSpeedMenuIntegrationsFingerprint
-    )
-) {
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            TextPreference(
-                key = "revanced_custom_playback_speeds",
-                title = StringResource(
-                    "revanced_custom_playback_speeds_title",
-                    "Custom playback speeds"
-                ),
-                inputType = InputType.TEXT_MULTI_LINE,
-                summary = StringResource(
-                    "revanced_custom_playback_speeds_summary",
-                    "Add or change the available playback speeds"
-                )
-            )
-        )
-
-        val arrayGenMethod = SpeedArrayGeneratorFingerprint.result?.mutableMethod!!
-        val arrayGenMethodImpl = arrayGenMethod.implementation!!
-
-        val sizeCallIndex = arrayGenMethodImpl.instructions
-            .indexOfFirst { ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "size" }
-
-        if (sizeCallIndex == -1) return PatchResultError("Couldn't find call to size()")
-
-        val sizeCallResultRegister =
-            (arrayGenMethodImpl.instructions.elementAt(sizeCallIndex + 1) as OneRegisterInstruction).registerA
-
-        arrayGenMethod.replaceInstruction(
-            sizeCallIndex + 1,
-            "const/4 v$sizeCallResultRegister, 0x0"
-        )
-
-        val (arrayLengthConstIndex, arrayLengthConst) = arrayGenMethodImpl.instructions.withIndex()
-            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 7 }
-
-        val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA
-
-        val playbackSpeedsArrayType = "$INTEGRATIONS_CLASS_DESCRIPTOR->customPlaybackSpeeds:[F"
-
-        arrayGenMethod.addInstructions(
-            arrayLengthConstIndex + 1,
-            """
-                sget-object v$arrayLengthConstDestination, $playbackSpeedsArrayType
-                array-length v$arrayLengthConstDestination, v$arrayLengthConstDestination
-            """
-        )
-
-        val (originalArrayFetchIndex, originalArrayFetch) = arrayGenMethodImpl.instructions.withIndex()
-            .first {
-                val reference = ((it.value as? ReferenceInstruction)?.reference as? FieldReference)
-                reference?.definingClass?.contains("PlayerConfigModel") ?: false &&
-                        reference?.type == "[F"
-            }
-
-        val originalArrayFetchDestination = (originalArrayFetch as OneRegisterInstruction).registerA
-
-        arrayGenMethod.replaceInstruction(
-            originalArrayFetchIndex,
-            "sget-object v$originalArrayFetchDestination, $playbackSpeedsArrayType"
-        )
-
-        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!
-        val limiterMethodImpl = limiterMethod.implementation!!
-
-        val lowerLimitConst = 0.25f.toRawBits()
-        val upperLimitConst = 2.0f.toRawBits()
-        val (limiterMinConstIndex, limiterMinConst) = limiterMethodImpl.instructions.withIndex()
-            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == lowerLimitConst }
-        val (limiterMaxConstIndex, limiterMaxConst) = limiterMethodImpl.instructions.withIndex()
-            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == upperLimitConst }
-
-        val limiterMinConstDestination = (limiterMinConst as OneRegisterInstruction).registerA
-        val limiterMaxConstDestination = (limiterMaxConst as OneRegisterInstruction).registerA
-
-        // edit: alternatively this might work by overriding with fixed values such as 0.1x and 10x
-        limiterMethod.replaceInstruction(
-            limiterMinConstIndex,
-            "sget v$limiterMinConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->minPlaybackSpeed:F"
-        )
-        limiterMethod.replaceInstruction(
-            limiterMaxConstIndex,
-            "sget v$limiterMaxConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->maxPlaybackSpeed:F"
-        )
-
-        // region Force old video quality menu.
-        // This is necessary, because there is no known way of adding custom playback speeds to the new menu.
-
-        BottomSheetHookPatch.addHook(INTEGRATIONS_CLASS_DESCRIPTOR)
-
-        // Required to check if the playback speed menu is currently shown.
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        GetOldPlaybackSpeedsFingerprint.result?.let { result ->
-            // Add a static INSTANCE field to the class.
-            // This is later used to call "showOldPlaybackSpeedMenu" on the instance.
-            val instanceField = ImmutableField(
-                result.classDef.type,
-                "INSTANCE",
-                result.classDef.type,
-                AccessFlags.PUBLIC or AccessFlags.STATIC,
-                null,
-                null,
-                null
-            ).toMutable()
-
-            result.mutableClass.staticFields.add(instanceField)
-            // Set the INSTANCE field to the instance of the class.
-            // In order to prevent a conflict with another patch, add the instruction at index 1.
-            result.mutableMethod.addInstruction(1, "sput-object p0, $instanceField")
-
-            // Get the "showOldPlaybackSpeedMenu" method.
-            // This is later called on the field INSTANCE.
-            val showOldPlaybackSpeedMenuMethod = ShowOldPlaybackSpeedMenuFingerprint.also {
-                if (!it.resolve(context, result.classDef))
-                    throw ShowOldPlaybackSpeedMenuFingerprint.toErrorResult()
-            }.result!!.method.toString()
-
-            // Insert the call to the "showOldPlaybackSpeedMenu" method on the field INSTANCE.
-            ShowOldPlaybackSpeedMenuIntegrationsFingerprint.result?.mutableMethod?.apply {
-                addInstructionsWithLabels(
-                    implementation!!.instructions.lastIndex,
-                    """
-                        sget-object v0, $instanceField
-                        if-nez v0, :not_null
-                        return-void
-                        :not_null
-                        invoke-virtual { v0 }, $showOldPlaybackSpeedMenuMethod
-                    """
-                )
-            } ?: return ShowOldPlaybackSpeedMenuIntegrationsFingerprint.toErrorResult()
-        } ?: return GetOldPlaybackSpeedsFingerprint.toErrorResult()
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch;"
-
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/playback/speed/CustomPlaybackSpeedPatch;"
-
-    }
-}
diff --git a/main/app/revanced/patches/youtube/video/speed/remember/fingerprint/InitializePlaybackSpeedValuesFingerprint.kt b/main/app/revanced/patches/youtube/video/speed/remember/fingerprint/InitializePlaybackSpeedValuesFingerprint.kt
deleted file mode 100644
index 31ac21e8ac..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/remember/fingerprint/InitializePlaybackSpeedValuesFingerprint.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.speed.remember.fingerprint
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object InitializePlaybackSpeedValuesFingerprint : MethodFingerprint(
-    parameters = listOf("[L", "I"),
-    strings = listOf("menu_item_playback_speed")
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt b/main/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
deleted file mode 100644
index 620e743994..0000000000
--- a/main/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package app.revanced.patches.youtube.video.speed.remember.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.video.speed.custom.patch.CustomPlaybackSpeedPatch
-import app.revanced.patches.youtube.video.speed.remember.fingerprint.InitializePlaybackSpeedValuesFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-
-@Name("Remember playback speed")
-@Description("Adds the ability to remember the playback speed you chose in the playback speed flyout.")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, VideoInformationPatch::class, CustomPlaybackSpeedPatch::class])
-class RememberPlaybackSpeedPatch : BytecodePatch(
-    listOf(
-        InitializePlaybackSpeedValuesFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference(
-                "revanced_remember_playback_speed_last_selected",
-                StringResource(
-                    "revanced_remember_playback_speed_last_selected_title",
-                    "Remember playback speed changes"
-                ),
-                StringResource(
-                    "revanced_remember_playback_speed_last_selected_summary_on",
-                    "Playback speed changes apply to all videos"
-                ),
-                StringResource(
-                    "revanced_remember_playback_speed_last_selected_summary_off",
-                    "Playback speed changes only apply to the current video"
-                )
-            ),
-            ListPreference(
-                "revanced_playback_speed_default",
-                StringResource(
-                    "revanced_playback_speed_default_title",
-                    "Default playback speed"
-                ),
-                // Dummy data:
-                // Entries and values are set by Integrations code based on the actual speeds available,
-                // and the values set here are ignored and do nothing.
-                ArrayResource(
-                    "revanced_playback_speed_default_entries",
-                    listOf(StringResource("revanced_playback_speed_default_entries", "1.0x"))
-                ),
-                ArrayResource(
-                    "revanced_playback_speed_default_entry_values",
-                    listOf(StringResource("revanced_playback_speed_default_entry_value", "1.0"))
-                )
-            )
-        )
-
-        VideoInformationPatch.onCreateHook(INTEGRATIONS_CLASS_DESCRIPTOR, "newVideoStarted")
-        VideoInformationPatch.userSelectedPlaybackSpeedHook(
-            INTEGRATIONS_CLASS_DESCRIPTOR, "userSelectedPlaybackSpeed")
-
-        /*
-         * Hook the code that is called when the playback speeds are initialized, and sets the playback speed
-         */
-        InitializePlaybackSpeedValuesFingerprint.result?.apply {
-            // Infer everything necessary for calling the method setPlaybackSpeed().
-            val onItemClickListenerClassFieldReference =
-                mutableMethod.getInstruction<ReferenceInstruction>(0).reference
-
-            // Registers are not used at index 0, so they can be freely used.
-            mutableMethod.addInstructionsWithLabels(
-                0,
-                """
-                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->getPlaybackSpeedOverride()F
-                    move-result v0
-                    
-                    # Check if the playback speed is not 1.0x.
-                    const/high16 v1, 0x3f800000  # 1.0f
-                    cmpg-float v1, v0, v1
-                    if-eqz v1, :do_not_override
-    
-                    # Get the instance of the class which has the container class field below.
-                    iget-object v1, p0, $onItemClickListenerClassFieldReference
-
-                    # Get the container class field.
-                    iget-object v1, v1, ${VideoInformationPatch.setPlaybackSpeedContainerClassFieldReference}  
-                    
-                    # Get the field from its class.
-                    iget-object v2, v1, ${VideoInformationPatch.setPlaybackSpeedClassFieldReference}
-                    
-                    # Invoke setPlaybackSpeed on that class.
-                    invoke-virtual {v2, v0}, ${VideoInformationPatch.setPlaybackSpeedMethodReference}
-                """.trimIndent(),
-                ExternalLabel("do_not_override", mutableMethod.getInstruction(0))
-            )
-        } ?: return InitializePlaybackSpeedValuesFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/playback/speed/RememberPlaybackSpeedPatch;"
-    }
-}
diff --git a/main/app/revanced/patches/youtube/video/videoid/annotation/VideoIdCompatibility.kt b/main/app/revanced/patches/youtube/video/videoid/annotation/VideoIdCompatibility.kt
deleted file mode 100644
index a5fa69c6fc..0000000000
--- a/main/app/revanced/patches/youtube/video/videoid/annotation/VideoIdCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.videoid.annotation
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35", "18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class VideoIdCompatibility
diff --git a/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprint.kt b/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprint.kt
deleted file mode 100644
index 3f4a0e2371..0000000000
--- a/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprint.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.youtube.video.videoid.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object VideoIdFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("SubtitlesOverlayPresenter;")
-    }
-)
diff --git a/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprintBackgroundPlay.kt b/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprintBackgroundPlay.kt
deleted file mode 100644
index 6f7da47b4a..0000000000
--- a/main/app/revanced/patches/youtube/video/videoid/fingerprint/VideoIdFingerprintBackgroundPlay.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package app.revanced.patches.youtube.video.videoid.fingerprint
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object VideoIdFingerprintBackgroundPlay : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.DECLARED_SYNCHRONIZED or AccessFlags.FINAL or AccessFlags.PUBLIC,
-    parameters = listOf("L"),
-    opcodes = listOf(Opcode.INVOKE_INTERFACE),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("PlaybackLifecycleMonitor;")
-    }
-)
diff --git a/main/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt b/main/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt
deleted file mode 100644
index 8f7b190243..0000000000
--- a/main/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package app.revanced.patches.youtube.video.videoid.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.video.videoid.annotation.VideoIdCompatibility
-import app.revanced.patches.youtube.video.videoid.fingerprint.VideoIdFingerprint
-import app.revanced.patches.youtube.video.videoid.fingerprint.VideoIdFingerprintBackgroundPlay
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Name("Video id hook")
-@Description("Hooks to detect when the video id changes")
-@VideoIdCompatibility
-@DependsOn([IntegrationsPatch::class])
-class VideoIdPatch : BytecodePatch(
-    listOf(VideoIdFingerprint, VideoIdFingerprintBackgroundPlay)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        VideoIdFingerprint.result?.let { result ->
-            val videoIdRegisterInstructionIndex = result.scanResult.patternScanResult!!.endIndex
-
-            result.mutableMethod.also {
-                insertMethod = it
-            }.apply {
-                videoIdRegister = getInstruction<OneRegisterInstruction>(videoIdRegisterInstructionIndex).registerA
-                insertIndex = videoIdRegisterInstructionIndex + 1
-            }
-        } ?: return VideoIdFingerprint.toErrorResult()
-
-        VideoIdFingerprintBackgroundPlay.result?.let { result ->
-            val endIndex = result.scanResult.patternScanResult!!.endIndex
-
-            result.mutableMethod.also {
-                backgroundPlaybackMethod = it
-            }.apply {
-                backgroundPlaybackVideoIdRegister = getInstruction<OneRegisterInstruction>(endIndex + 1).registerA
-                backgroundPlaybackInsertIndex = endIndex + 2
-            }
-        } ?: return VideoIdFingerprintBackgroundPlay.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-
-    companion object {
-        private var videoIdRegister = 0
-        private var insertIndex = 0
-        private lateinit var insertMethod: MutableMethod
-
-        private var backgroundPlaybackVideoIdRegister = 0
-        private var backgroundPlaybackInsertIndex = 0
-        private lateinit var backgroundPlaybackMethod: MutableMethod
-
-        /**
-         * Adds an invoke-static instruction, called with the new id when the video changes.
-         *
-         * Supports all videos (regular videos, Shorts and Stories).
-         *
-         * _Does not function if playing in the background with no video visible_.
-         *
-         * Be aware, this can be called multiple times for the same video id.
-         *
-         * @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
-         */
-        fun injectCall(
-            methodDescriptor: String
-        ) = insertMethod.addInstruction(
-            // Keep injection calls in the order they're added:
-            // Increment index. So if additional injection calls are added, those calls run after this injection call.
-            insertIndex++,
-            "invoke-static {v$videoIdRegister}, $methodDescriptor"
-        )
-
-        /**
-         * Alternate hook that supports only regular videos, but hook supports changing to new video
-         * during background play when no video is visible.
-         *
-         * _Does not support Shorts or Stories_.
-         *
-         * Be aware, the hook can be called multiple times for the same video id.
-         *
-         * @param methodDescriptor which method to call. Params have to be `Ljava/lang/String;`
-         */
-        fun injectCallBackgroundPlay(
-            methodDescriptor: String
-        ) = backgroundPlaybackMethod.addInstruction(
-            backgroundPlaybackInsertIndex++, // move-result-object offset
-                "invoke-static {v$backgroundPlaybackVideoIdRegister}, $methodDescriptor"
-            )
-    }
-}
-
diff --git a/main/app/revanced/patches/youtube/video/videoqualitymenu/annotations/OldVideoQualityMenuCompatibility.kt b/main/app/revanced/patches/youtube/video/videoqualitymenu/annotations/OldVideoQualityMenuCompatibility.kt
deleted file mode 100644
index 5fe280f941..0000000000
--- a/main/app/revanced/patches/youtube/video/videoqualitymenu/annotations/OldVideoQualityMenuCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.videoqualitymenu.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.youtube", arrayOf("18.20.39", "18.23.35"))])
-@Target(AnnotationTarget.CLASS)
-internal annotation class OldVideoQualityMenuCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuViewInflateFingerprint.kt b/main/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuViewInflateFingerprint.kt
deleted file mode 100644
index 4e2424a33e..0000000000
--- a/main/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuViewInflateFingerprint.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package app.revanced.patches.youtube.video.videoqualitymenu.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.video.videoqualitymenu.patch.OldVideoQualityMenuResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object VideoQualityMenuViewInflateFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L", "L", "L"),
-    returnType = "L",
-    opcodes = listOf(
-        Opcode.INVOKE_SUPER,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_16,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST
-    ),
-    literal = OldVideoQualityMenuResourcePatch.videoQualityBottomSheetListFragmentTitle
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt b/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt
deleted file mode 100644
index ed50f07d24..0000000000
--- a/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package app.revanced.patches.youtube.video.videoqualitymenu.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookPatch
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
-import app.revanced.patches.youtube.video.videoqualitymenu.annotations.OldVideoQualityMenuCompatibility
-import app.revanced.patches.youtube.video.videoqualitymenu.fingerprints.VideoQualityMenuViewInflateFingerprint
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([
-    IntegrationsPatch::class,
-    OldVideoQualityMenuResourcePatch::class,
-    LithoFilterPatch::class,
-    BottomSheetHookPatch::class
-])
-@Name("Old video quality menu")
-@Description("Shows the old video quality with the advanced video quality options instead of the new one.")
-@OldVideoQualityMenuCompatibility
-class OldVideoQualityMenuPatch : BytecodePatch(
-    listOf(VideoQualityMenuViewInflateFingerprint)
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        // region Patch for the old type of the video quality menu.
-
-        VideoQualityMenuViewInflateFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val checkCastIndex = it.scanResult.patternScanResult!!.endIndex
-                val listViewRegister = getInstruction<OneRegisterInstruction>(checkCastIndex).registerA
-
-                addInstruction(
-                    checkCastIndex + 1,
-                    "invoke-static { v$listViewRegister }, " +
-                            "$INTEGRATIONS_CLASS_DESCRIPTOR->" +
-                            "showOldVideoQualityMenu(Landroid/widget/ListView;)V"
-                )
-            }
-        }
-
-        // endregion
-
-        // region Patch for the new type of the video quality menu.
-
-        BottomSheetHookPatch.addHook(INTEGRATIONS_CLASS_DESCRIPTOR)
-
-        // Required to check if the video quality menu is currently shown in order to click on the "Advanced" item.
-        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        // endregion
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/VideoQualityMenuFilterPatch;"
-
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/playback/quality/OldVideoQualityMenuPatch;"
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt b/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt
deleted file mode 100644
index c74137a22e..0000000000
--- a/main/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package app.revanced.patches.youtube.video.videoqualitymenu.patch
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-
-@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
-class OldVideoQualityMenuResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference(
-                "revanced_show_old_video_quality_menu",
-                StringResource("revanced_show_old_video_quality_menu_title", "Show old video quality menu"),
-                StringResource("revanced_show_old_video_quality_menu_summary_on", "Old video quality menu is shown"),
-                StringResource("revanced_show_old_video_quality_menu_summary_off", "New video quality menu is hidden")
-            )
-        )
-
-        fun findResource(name: String) = ResourceMappingPatch.resourceMappings.find { it.name == name }?.id
-            ?: throw PatchResultError("Could not find resource")
-
-        // Used for the old type of the video quality menu.
-        videoQualityBottomSheetListFragmentTitle = findResource("video_quality_bottom_sheet_list_fragment_title")
-
-        return PatchResultSuccess()
-    }
-
-    internal companion object {
-        var videoQualityBottomSheetListFragmentTitle = -1L
-    }
-}
diff --git a/main/app/revanced/patches/youtubevanced/ad/general/annotations/HideAdsCompatibility.kt b/main/app/revanced/patches/youtubevanced/ad/general/annotations/HideAdsCompatibility.kt
deleted file mode 100644
index e7c85c5825..0000000000
--- a/main/app/revanced/patches/youtubevanced/ad/general/annotations/HideAdsCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.youtubevanced.ad.general.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.vanced.android.youtube")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideAdsCompatibility
diff --git a/main/app/revanced/patches/youtubevanced/ad/general/fingerprints/ContainsAdFingerprint.kt b/main/app/revanced/patches/youtubevanced/ad/general/fingerprints/ContainsAdFingerprint.kt
deleted file mode 100644
index 3d77a14474..0000000000
--- a/main/app/revanced/patches/youtubevanced/ad/general/fingerprints/ContainsAdFingerprint.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtubevanced.ad.general.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object ContainsAdFingerprint:MethodFingerprint(
-    returnType = "Z",
-    parameters = listOf("L", "L"),
-    accessFlags = AccessFlags.STATIC or AccessFlags.PUBLIC,
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE
-    ),
-    strings = listOf("ads_video_with_context"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.name == "containsAd" && methodDef.definingClass.endsWith("LithoAdRemoval;")
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt b/main/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
deleted file mode 100644
index 439a44a2f7..0000000000
--- a/main/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package app.revanced.patches.youtubevanced.ad.general.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
-import app.revanced.patches.youtubevanced.ad.general.annotations.HideAdsCompatibility
-import app.revanced.patches.youtubevanced.ad.general.fingerprints.ContainsAdFingerprint
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-
-@Patch
-@Name("Hide ads")
-@Description("Removes general ads.")
-@DependsOn([VerticalScrollPatch::class])
-@HideAdsCompatibility
-class HideAdsPatch : BytecodePatch(
-    listOf(
-        ContainsAdFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        ContainsAdFingerprint.result?.let { result ->
-            result.mutableMethod.apply {
-                val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
-                val adsListRegister = getInstruction<Instruction21c>(insertIndex - 2).registerA
-
-                listOf(
-                    "_buttoned_layout",
-                    "full_width_square_image_layout",
-                    "_ad_with",
-                    "landscape_image_wide_button_layout",
-                    "banner_text_icon",
-                    "cell_divider",
-                    "square_image_layout",
-                    "watch_metadata_app_promo",
-                    "video_display_full_layout",
-                    "hero_promo_image",
-                    "statement_banner",
-                    "primetime_promo",
-                    "carousel_footered_layout"
-                ).forEach { component ->
-                    addInstructions(
-                        insertIndex,
-                        """
-                           const-string v$adsListRegister, "$component"
-                           invoke-interface {v0, v$adsListRegister}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-                        """
-                    )
-                }
-            }
-        } ?: return ContainsAdFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/patches/yuka/misc/unlockpremium/annotations/UnlockPremiumCompatibility.kt b/main/app/revanced/patches/yuka/misc/unlockpremium/annotations/UnlockPremiumCompatibility.kt
deleted file mode 100644
index caa0db41fd..0000000000
--- a/main/app/revanced/patches/yuka/misc/unlockpremium/annotations/UnlockPremiumCompatibility.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package app.revanced.patches.yuka.misc.unlockpremium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("io.yuka.android")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class UnlockPremiumCompatibility
\ No newline at end of file
diff --git a/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/IsPremiumFingerprint.kt b/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/IsPremiumFingerprint.kt
deleted file mode 100644
index 4835c40483..0000000000
--- a/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/IsPremiumFingerprint.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.revanced.patches.yuka.misc.unlockpremium.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-object IsPremiumFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.IGET_BOOLEAN,
-        Opcode.RETURN,
-    )
-)
diff --git a/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/YukaUserConstructorFingerprint.kt b/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/YukaUserConstructorFingerprint.kt
deleted file mode 100644
index 67aba37200..0000000000
--- a/main/app/revanced/patches/yuka/misc/unlockpremium/fingerprints/YukaUserConstructorFingerprint.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.revanced.patches.yuka.misc.unlockpremium.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-
-object YukaUserConstructorFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    strings = listOf(
-        "premiumProvider"
-    )
-)
diff --git a/main/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt b/main/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt
deleted file mode 100644
index e409dd081e..0000000000
--- a/main/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package app.revanced.patches.yuka.misc.unlockpremium.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.yuka.misc.unlockpremium.annotations.UnlockPremiumCompatibility
-import app.revanced.patches.yuka.misc.unlockpremium.fingerprints.IsPremiumFingerprint
-import app.revanced.patches.yuka.misc.unlockpremium.fingerprints.YukaUserConstructorFingerprint
-
-@Patch
-@Name("Unlock premium")
-@Description("Unlocks premium features.")
-@UnlockPremiumCompatibility
-class UnlockPremiunPatch : BytecodePatch(
-    listOf(
-        YukaUserConstructorFingerprint
-    )
-) {
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        IsPremiumFingerprint.resolve(context,YukaUserConstructorFingerprint.result!!.classDef)
-        val method = IsPremiumFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        return PatchResultSuccess()
-    }
-
-}
\ No newline at end of file
diff --git a/main/app/revanced/util/microg/Constants.kt b/main/app/revanced/util/microg/Constants.kt
deleted file mode 100644
index 912b975610..0000000000
--- a/main/app/revanced/util/microg/Constants.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package app.revanced.util.microg
-
-/**
- * constants for microG builds with signature spoofing
- */
-internal object Constants {
-    /**
-     * microG vendor name
-     * aka. package prefix / package base
-     */
-    const val MICROG_VENDOR = "com.mgoogle"
-
-    /**
-     * meta-data for microG package name spoofing on patched builds
-     */
-    const val META_SPOOFED_PACKAGE_NAME = "$MICROG_VENDOR.android.gms.SPOOFED_PACKAGE_NAME"
-
-    /**
-     * meta-data for microG package signature spoofing on patched builds
-     */
-    const val META_SPOOFED_PACKAGE_SIGNATURE = "$MICROG_VENDOR.android.gms.SPOOFED_PACKAGE_SIGNATURE"
-
-    /**
-     * meta-data for microG package detection
-     */
-    const val META_GMS_PACKAGE_NAME = "app.revanced.MICROG_PACKAGE_NAME"
-
-    /**
-     * a list of all permissions in microG
-     */
-    val PERMISSIONS = listOf(
-        // C2DM / GCM
-        "com.google.android.c2dm.permission.RECEIVE",
-        "com.google.android.c2dm.permission.SEND",
-        "com.google.android.gtalkservice.permission.GTALK_SERVICE",
-
-        // GAuth
-        "com.google.android.googleapps.permission.GOOGLE_AUTH",
-        "com.google.android.googleapps.permission.GOOGLE_AUTH.cp",
-        "com.google.android.googleapps.permission.GOOGLE_AUTH.local",
-        "com.google.android.googleapps.permission.GOOGLE_AUTH.mail",
-        "com.google.android.googleapps.permission.GOOGLE_AUTH.writely",
-    )
-
-    /**
-     * a list of all (intent) actions in microG
-     */
-    val ACTIONS = listOf(
-        // location
-        "com.google.android.gms.location.places.ui.PICK_PLACE",
-        "com.google.android.gms.location.places.GeoDataApi",
-        "com.google.android.gms.location.places.PlacesApi",
-        "com.google.android.gms.location.places.PlaceDetectionApi",
-        "com.google.android.gms.wearable.MESSAGE_RECEIVED",
-
-        // C2DM / GCM
-        "com.google.android.c2dm.intent.REGISTER",
-        "com.google.android.c2dm.intent.REGISTRATION",
-        "com.google.android.c2dm.intent.UNREGISTER",
-        "com.google.android.c2dm.intent.RECEIVE",
-        "com.google.iid.TOKEN_REQUEST",
-        "com.google.android.gcm.intent.SEND",
-
-        // car
-        "com.google.android.gms.car.service.START",
-
-        // people
-        "com.google.android.gms.people.service.START",
-
-        // wearable
-        "com.google.android.gms.wearable.BIND",
-
-        // auth
-        "com.google.android.gsf.login",
-        "com.google.android.gsf.action.GET_GLS",
-        "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
-        "com.google.android.gms.auth.login.LOGIN",
-        "com.google.android.gms.auth.api.credentials.PICKER",
-        "com.google.android.gms.auth.api.credentials.service.START",
-        "com.google.android.gms.auth.service.START",
-        "com.google.firebase.auth.api.gms.service.START",
-        "com.google.android.gms.auth.be.appcert.AppCertService",
-
-        // fido
-        "com.google.android.gms.fido.fido2.privileged.START",
-
-        // games
-        "com.google.android.gms.games.service.START",
-        "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
-
-        // chimera
-        "com.google.android.gms.chimera",
-
-        // fonts
-        "com.google.android.gms.fonts",
-
-        // phenotype
-        "com.google.android.gms.phenotype.service.START",
-
-        // location
-        "com.google.android.gms.location.reporting.service.START",
-
-        // misc
-        "com.google.android.gms.gmscompliance.service.START",
-        "com.google.android.gms.oss.licenses.service.START",
-        "com.google.android.gms.safetynet.service.START",
-        "com.google.android.gms.tapandpay.service.BIND"
-    )
-
-    /**
-     * a list of all content provider authorities in microG
-     */
-    val AUTHORITIES = listOf(
-        // gsf
-        "com.google.android.gsf.gservices",
-        "com.google.settings",
-
-        // auth
-        "com.google.android.gms.auth.accounts",
-
-        // chimera
-        "com.google.android.gms.chimera",
-
-        // fonts
-        "com.google.android.gms.fonts",
-
-        // phenotype
-        "com.google.android.gms.phenotype"
-    )
-}
diff --git a/main/app/revanced/util/microg/MicroGBytecodeHelper.kt b/main/app/revanced/util/microg/MicroGBytecodeHelper.kt
deleted file mode 100644
index ccc57627be..0000000000
--- a/main/app/revanced/util/microg/MicroGBytecodeHelper.kt
+++ /dev/null
@@ -1,243 +0,0 @@
-package app.revanced.util.microg
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.microg.Constants.ACTIONS
-import app.revanced.util.microg.Constants.AUTHORITIES
-import app.revanced.util.microg.Constants.MICROG_VENDOR
-import app.revanced.util.microg.Constants.PERMISSIONS
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
-
-/**
- * Helper class for applying bytecode patches needed for the microg-support patches.
- */
-internal object MicroGBytecodeHelper {
-    /**
-     * Hook a method to check the availability of MicroG.
-     *
-     * @param fingerprint The fingerprint of the method to add the call for the notice in.
-     */
-    fun injectNotice(fingerprint: MethodFingerprint) {
-        fingerprint.result!!.mutableMethod.addInstruction(
-            0,
-            "invoke-static {}, Lapp/revanced/integrations/patches/MicroGSupport;->checkAvailability()V"
-        )
-    }
-
-    /**
-     * Transform strings with package name out of [fromPackageName] and [toPackageName].
-     *
-     * @param fromPackageName Original package name.
-     * @param toPackageName The package name to accept.
-     **/
-    fun packageNameTransform(fromPackageName: String, toPackageName: String): (String) -> String? {
-        return { referencedString ->
-            when (referencedString) {
-                "$fromPackageName.SuggestionsProvider",
-                "$fromPackageName.fileprovider" -> referencedString.replace(fromPackageName, toPackageName)
-                else -> null
-            }
-        }
-    }
-
-    /**
-     * Prime method data class for the [MicroGBytecodeHelper] class.
-     *
-     * @param primeMethodFingerprint The prime methods [MethodFingerprint].
-     * @param fromPackageName Original package name.
-     * @param toPackageName The package name to accept.
-     **/
-    data class PrimeMethodTransformationData(
-        val primeMethodFingerprint: MethodFingerprint,
-        val fromPackageName: String,
-        val toPackageName: String
-    ) {
-        /**
-         * Patch the prime method to accept the new package name.
-         */
-        fun transformPrimeMethodPackageName() {
-            val primeMethod = primeMethodFingerprint.result!!.mutableMethod
-            val implementation = primeMethod.implementation!!
-
-            var register = 2
-            val index = implementation.instructions.indexOfFirst {
-                if (it.opcode != Opcode.CONST_STRING) return@indexOfFirst false
-
-                val instructionString = ((it as Instruction21c).reference as StringReference).string
-                if (instructionString != fromPackageName) return@indexOfFirst false
-
-                register = it.registerA
-                return@indexOfFirst true
-            }
-
-            primeMethod.replaceInstruction(
-                index, "const-string v$register, \"$toPackageName\""
-            )
-        }
-    }
-
-    /**
-     * Patch the bytecode to work with MicroG.
-     * Note: this only handles string constants to gms (intent actions, authorities, ...).
-     * If the app employs additional checks to validate the installed gms package, you'll have to handle those in the app- specific patch
-     *
-     * @param context The context.
-     * @param additionalStringTransforms Additional transformations applied to all const-string references.
-     * @param primeMethodTransformationData Data to patch the prime method.
-     * @param earlyReturns List of [MethodFingerprint] to return the resolved methods early.
-     */
-    fun patchBytecode(
-        context: BytecodeContext,
-        additionalStringTransforms: Array<(str: String) -> String?>,
-        primeMethodTransformationData: PrimeMethodTransformationData,
-        earlyReturns: List<MethodFingerprint>
-    ) {
-        earlyReturns.returnEarly()
-        primeMethodTransformationData.transformPrimeMethodPackageName()
-
-        val allTransforms = arrayOf(
-            MicroGBytecodeHelper::commonTransform,
-            MicroGBytecodeHelper::contentUrisTransform,
-            *additionalStringTransforms
-        )
-
-        // transform all strings using all provided transforms, first match wins
-        context.transformStringReferences transform@{
-            for (transformFn in allTransforms) {
-                val s = transformFn(it)
-                if (s != null) return@transform s
-            }
-
-            return@transform null
-        }
-    }
-
-    /**
-     * const-string transform function for common gms string references.
-     *
-     * @param referencedString The string to transform.
-     */
-    private fun commonTransform(referencedString: String): String? =
-        when (referencedString) {
-            "com.google",
-            "com.google.android.gms",
-            in PERMISSIONS,
-            in ACTIONS,
-            in AUTHORITIES -> referencedString.replace("com.google", MICROG_VENDOR)
-
-            // subscribedfeeds has no vendor prefix for whatever reason...
-            "subscribedfeeds" -> "${MICROG_VENDOR}.subscribedfeeds"
-            else -> null
-        }
-
-
-    /**
-     * const-string transform function for strings containing gms content uris / authorities.
-     */
-    private fun contentUrisTransform(str: String): String? {
-        // only when content:// uri
-        if (str.startsWith("content://")) {
-            // check if matches any authority
-            for (authority in AUTHORITIES) {
-                val uriPrefix = "content://$authority"
-                if (str.startsWith(uriPrefix)) {
-                    return str.replace(
-                        uriPrefix,
-                        "content://${authority.replace("com.google", MICROG_VENDOR)}"
-                    )
-                }
-            }
-
-            // gms also has a 'subscribedfeeds' authority, check for that one too
-            val subFeedsUriPrefix = "content://subscribedfeeds"
-            if (str.startsWith(subFeedsUriPrefix)) {
-                return str.replace(subFeedsUriPrefix, "content://${MICROG_VENDOR}.subscribedfeeds")
-            }
-        }
-
-        return null
-    }
-
-    /**
-     * Transform all constant string references using a transformation function.
-     *
-     * @param transformFn string transformation function. if null, string is not changed.
-     */
-    private fun BytecodeContext.transformStringReferences(transformFn: (str: String) -> String?) {
-        classes.forEach { classDef ->
-            var mutableClass: MutableClass? = null
-
-            // enumerate all methods
-            classDef.methods.forEach classLoop@{ methodDef ->
-                var mutableMethod: MutableMethod? = null
-                val implementation = methodDef.implementation ?: return@classLoop
-
-                // enumerate all instructions and find const-string
-                implementation.instructions.forEachIndexed implLoop@{ index, instruction ->
-                    // skip all that are not const-string
-                    if (instruction.opcode != Opcode.CONST_STRING) return@implLoop
-                    val str = ((instruction as Instruction21c).reference as StringReference).string
-
-                    // call transform function
-                    val transformedStr = transformFn(str)
-                    if (transformedStr != null) {
-                        // make class and method mutable, if not already
-                        mutableClass = mutableClass ?: proxy(classDef).mutableClass
-                        mutableMethod = mutableMethod ?: mutableClass!!.methods.first {
-                            it.name == methodDef.name && it.parameterTypes.containsAll(methodDef.parameterTypes)
-                        }
-
-                        // replace instruction with updated string
-                        mutableMethod!!.implementation!!.replaceInstruction(
-                            index,
-                            BuilderInstruction21c(
-                                Opcode.CONST_STRING,
-                                instruction.registerA,
-                                ImmutableStringReference(
-                                    transformedStr
-                                )
-                            )
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Return the resolved methods of a list of [MethodFingerprint] early.
-     */
-    private fun List<MethodFingerprint>.returnEarly() {
-        this.forEach { fingerprint ->
-            if (fingerprint.result == null) throw PatchResultError(fingerprint.toString())
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
-                        const/4 v0, 0x0
-                        return-object v0
-                        """
-
-                'V' -> "return-void"
-                'I' -> """
-                        const/4 v0, 0x0
-                        return v0
-                        """
-
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
-            )
-        }
-    }
-}
diff --git a/main/app/revanced/util/microg/MicroGManifestHelper.kt b/main/app/revanced/util/microg/MicroGManifestHelper.kt
deleted file mode 100644
index 003fa00e33..0000000000
--- a/main/app/revanced/util/microg/MicroGManifestHelper.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package app.revanced.util.microg
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.util.microg.Constants.META_GMS_PACKAGE_NAME
-import app.revanced.util.microg.Constants.META_SPOOFED_PACKAGE_NAME
-import app.revanced.util.microg.Constants.META_SPOOFED_PACKAGE_SIGNATURE
-import app.revanced.util.microg.Constants.MICROG_VENDOR
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-
-/**
- * helper class for adding manifest metadata needed for microG builds with signature spoofing
- */
-internal object MicroGManifestHelper {
-
-    /**
-     * Add manifest entries needed for package and signature spoofing when using MicroG.
-     * Note: this only adds metadata entries for signature spoofing, other changes may still be required to make a microG patch work.
-     *
-     * @param context Resource context.
-     * @param spoofedPackage The package to spoof.
-     * @param spoofedSignature The signature to spoof.
-     */
-    fun addSpoofingMetadata(
-        context: ResourceContext,
-        spoofedPackage: String,
-        spoofedSignature: String
-    ) {
-        context.xmlEditor["AndroidManifest.xml"].use {
-            val applicationNode = it
-                .file
-                .getElementsByTagName("application")
-                .item(0)
-
-            // package spoofing
-            applicationNode.adoptChild("meta-data") {
-                setAttribute("android:name", META_SPOOFED_PACKAGE_NAME)
-                setAttribute("android:value", spoofedPackage)
-            }
-            applicationNode.adoptChild("meta-data") {
-                setAttribute("android:name", META_SPOOFED_PACKAGE_SIGNATURE)
-                setAttribute("android:value", spoofedSignature)
-            }
-
-            // microG presence detection in integrations
-            applicationNode.adoptChild("meta-data") {
-                setAttribute("android:name", META_GMS_PACKAGE_NAME)
-                setAttribute("android:value", "${MICROG_VENDOR}.android.gms")
-            }
-        }
-    }
-
-    private fun Node.adoptChild(tagName: String, block: Element.() -> Unit) {
-        val child = ownerDocument.createElement(tagName)
-        child.block()
-        appendChild(child)
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/util/microg/MicroGResourceHelper.kt b/main/app/revanced/util/microg/MicroGResourceHelper.kt
deleted file mode 100644
index 5bf530967f..0000000000
--- a/main/app/revanced/util/microg/MicroGResourceHelper.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package app.revanced.util.microg
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.util.resources.ResourceUtils.mergeStrings
-
-/**
- * Helper class for applying resource patches needed for the microg-support patches.
- */
-internal object MicroGResourceHelper {
-
-    /**
-     * Add necessary strings to the strings.xml file.
-     *
-     * @param context The resource context.
-     * @param stringsHost The file which hosts the strings.
-     */
-    fun addStrings(context: ResourceContext, stringsHost: String = "microg/host/values/strings.xml") =
-        context.mergeStrings(stringsHost)
-
-    /**
-     * Patch the manifest to work with MicroG.
-     *
-     * @param context The resource context.
-     * @param fromPackageName The original package name.
-     * @param toPackageName The package name to accept.
-     * @param toName The new name of the app.
-     */
-    fun patchManifest(
-        context: ResourceContext,
-        fromPackageName: String,
-        toPackageName: String,
-        toName: String
-    ) {
-        val manifest = context["AndroidManifest.xml"].readText()
-        context["AndroidManifest.xml"].writeText(
-            manifest.replace(
-                "package=\"$fromPackageName",
-                "package=\"$toPackageName"
-            ).replace(
-                "android:label=\"@string/app_name",
-                "android:label=\"$toName"
-            ).replace(
-                "android:label=\"@string/app_launcher_name",
-                "android:label=\"$toName"
-            ).replace(
-                "android:authorities=\"$fromPackageName",
-                "android:authorities=\"$toPackageName"
-            ).replace(
-                "$fromPackageName.permission.C2D_MESSAGE",
-                "$toPackageName.permission.C2D_MESSAGE"
-            ).replace(
-                "$fromPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION",
-                "$toPackageName.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
-            ).replace(
-                "com.google.android.c2dm",
-                "${Constants.MICROG_VENDOR}.android.c2dm"
-            ).replace(
-                "</queries>",
-                "<package android:name=\"${Constants.MICROG_VENDOR}.android.gms\"/></queries>"
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/main/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt b/main/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt
deleted file mode 100644
index a8354c6bd3..0000000000
--- a/main/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package app.revanced.util.patch
-
-import app.revanced.extensions.findMutableMethodOf
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-
-internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
-
-    abstract fun filterMap(
-        classDef: ClassDef,
-        method: Method,
-        instruction: Instruction,
-        instructionIndex: Int
-    ): T?
-
-    abstract fun transform(mutableMethod: MutableMethod, entry: T)
-
-    // Returns the patch indices as a Sequence, which will execute lazily.
-    private fun findPatchIndices(classDef: ClassDef, method: Method): Sequence<T>? {
-        return method.implementation?.instructions?.asSequence()?.withIndex()?.mapNotNull { (index, instruction) ->
-            filterMap(classDef, method, instruction, index)
-        }
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        // Find all methods to patch
-        buildMap {
-            context.classes.forEach { classDef ->
-                val methods = buildList {
-                    classDef.methods.forEach { method ->
-                        // Since the Sequence executes lazily,
-                        // using any() results in only calling
-                        // filterMap until the first index has been found.
-                        val patchIndices = findPatchIndices(classDef, method)
-
-                        if (patchIndices?.any() == true) {
-                            add(method)
-                        }
-                    }
-                }
-
-                if (methods.isNotEmpty()) {
-                    put(classDef, methods)
-                }
-            }
-        }.forEach { (classDef, methods) ->
-            // And finally transform the methods...
-            val mutableClass = context.proxy(classDef).mutableClass
-
-            methods.map(mutableClass::findMutableMethodOf).forEach methods@{ mutableMethod ->
-                val patchIndices = findPatchIndices(mutableClass, mutableMethod)?.toCollection(ArrayDeque())
-                    ?: return@methods
-
-                while (!patchIndices.isEmpty()) {
-                    transform(mutableMethod, patchIndices.removeLast())
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-}
diff --git a/main/app/revanced/util/patch/LiteralValueFingerprint.kt b/main/app/revanced/util/patch/LiteralValueFingerprint.kt
deleted file mode 100644
index ec977e062b..0000000000
--- a/main/app/revanced/util/patch/LiteralValueFingerprint.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package app.revanced.util.patch
-
-import app.revanced.extensions.containsConstantInstructionValue
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-abstract class LiteralValueFingerprint(
-    returnType: String? = null,
-    accessFlags: Int? = null,
-    parameters: Iterable<String>? = null,
-    opcodes: Iterable<Opcode>? = null,
-    strings: Iterable<String>? = null,
-    literal: Long
-) : MethodFingerprint(
-    returnType = returnType,
-    accessFlags = accessFlags,
-    parameters = parameters,
-    opcodes = opcodes,
-    strings = strings,
-    customFingerprint = { methodDef, _ ->
-        methodDef.containsConstantInstructionValue(literal)
-    }
-)
\ No newline at end of file
diff --git a/main/app/revanced/util/patch/MethodCall.kt b/main/app/revanced/util/patch/MethodCall.kt
deleted file mode 100644
index 9bd1bd447c..0000000000
--- a/main/app/revanced/util/patch/MethodCall.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package app.revanced.util.patch
-
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
-
-internal typealias Instruction35cInfo = Triple<IMethodCall, Instruction35c, Int>
-
-internal interface IMethodCall {
-    val definedClassName: String
-    val methodName: String
-    val methodParams: Array<String>
-    val returnType: String
-
-    /**
-     * Replaces an invoke-virtual instruction with an invoke-static instruction,
-     * which calls a static replacement method in the respective integrations class.
-     * The method definition in the integrations class is expected to be the same,
-     * except that the method should be static and take as a first parameter
-     * an instance of the class, in which the original method was defined in.
-     *
-     * Example:
-     *
-     * original method: Window#setFlags(int, int)
-     *
-     * replacement method: Integrations#setFlags(Window, int, int)
-     */
-    fun replaceInvokeVirtualWithIntegrations(
-        definingClassDescriptor: String,
-        method: MutableMethod,
-        instruction: Instruction35c,
-        instructionIndex: Int
-    ) {
-        val registers = arrayOf(
-            instruction.registerC,
-            instruction.registerD,
-            instruction.registerE,
-            instruction.registerF,
-            instruction.registerG
-        )
-        val argsNum = methodParams.size + 1 // + 1 for instance of definedClassName
-        if (argsNum > registers.size) {
-            // should never happen, but just to be sure (also for the future) a safety check
-            throw RuntimeException(
-                "Not enough registers for ${definedClassName}#${methodName}: " +
-                        "Required $argsNum registers, but only got ${registers.size}."
-            )
-        }
-
-        val args = registers.take(argsNum).joinToString(separator = ", ") { reg -> "v${reg}" }
-        val replacementMethodDefinition =
-            "${methodName}(${definedClassName}${methodParams.joinToString(separator = "")})${returnType}"
-
-        method.replaceInstruction(
-            instructionIndex,
-            "invoke-static { $args }, ${definingClassDescriptor}->${replacementMethodDefinition}"
-        )
-    }
-}
-
-internal inline fun <reified E> fromMethodReference(methodReference: MethodReference)
-        where E : Enum<E>, E : IMethodCall = enumValues<E>().firstOrNull { search ->
-    search.definedClassName == methodReference.definingClass
-            && search.methodName == methodReference.name
-            && methodReference.parameterTypes.toTypedArray().contentEquals(search.methodParams)
-}
-
-internal inline fun <reified E> filterMapInstruction35c(
-    integrationsClassDescriptorPrefix: String,
-    classDef: ClassDef,
-    instruction: Instruction,
-    instructionIndex: Int
-): Instruction35cInfo? where E : Enum<E>, E : IMethodCall {
-    if (classDef.type.startsWith(integrationsClassDescriptorPrefix)) {
-        // avoid infinite recursion
-        return null
-    }
-
-    if (instruction.opcode != Opcode.INVOKE_VIRTUAL) {
-        return null
-    }
-
-    val invokeInstruction = instruction as Instruction35c
-    val methodRef = invokeInstruction.reference as MethodReference
-    val methodCall = fromMethodReference<E>(methodRef) ?: return null
-
-    return Instruction35cInfo(methodCall, invokeInstruction, instructionIndex)
-}
diff --git a/main/app/revanced/util/resources/ResourceUtils.kt b/main/app/revanced/util/resources/ResourceUtils.kt
deleted file mode 100644
index be6a774866..0000000000
--- a/main/app/revanced/util/resources/ResourceUtils.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package app.revanced.util.resources
-
-import app.revanced.patcher.data.DomFileEditor
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import org.w3c.dom.Node
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-
-internal object ResourceUtils {
-
-    /**
-     * Merge strings. This manages [StringResource]s automatically.
-     * @param host The hosting xml resource. Needs to be a valid strings.xml resource.
-     */
-    internal fun ResourceContext.mergeStrings(host: String) {
-        this.iterateXmlNodeChildren(host, "resources") {
-            // TODO: figure out why this is needed
-            if (!it.hasAttributes()) return@iterateXmlNodeChildren
-
-            val attributes = it.attributes
-            val key = attributes.getNamedItem("name")!!.nodeValue!!
-            val value = it.textContent!!
-
-            val formatted = attributes.getNamedItem("formatted") == null
-
-            SettingsPatch.addString(key, value, formatted)
-        }
-    }
-
-    /**
-     * Copy resources from the current class loader to the resource directory.
-     * @param sourceResourceDirectory The source resource directory name.
-     * @param resources The resources to copy.
-     */
-    internal fun ResourceContext.copyResources(sourceResourceDirectory: String, vararg resources: ResourceGroup) {
-        val classLoader = ResourceUtils.javaClass.classLoader
-        val targetResourceDirectory = this["res"]
-
-        for (resourceGroup in resources) {
-            resourceGroup.resources.forEach { resource ->
-                val resourceFile = "${resourceGroup.resourceDirectoryName}/$resource"
-                Files.copy(
-                    classLoader.getResourceAsStream("$sourceResourceDirectory/$resourceFile")!!,
-                    targetResourceDirectory.resolve(resourceFile).toPath(), StandardCopyOption.REPLACE_EXISTING
-                )
-            }
-        }
-    }
-
-    /**
-     * Resource names mapped to their corresponding resource data.
-     * @param resourceDirectoryName The name of the directory of the resource.
-     * @param resources A list of resource names.
-     */
-    internal class ResourceGroup(val resourceDirectoryName: String, vararg val resources: String)
-
-    /**
-     * Iterate through the children of a node by its tag.
-     * @param resource The xml resource.
-     * @param targetTag The target xml node.
-     * @param callback The callback to call when iterating over the nodes.
-     */
-    internal fun ResourceContext.iterateXmlNodeChildren(
-        resource: String,
-        targetTag: String,
-        callback: (node: Node) -> Unit
-    ) =
-        xmlEditor[ResourceUtils.javaClass.classLoader.getResourceAsStream(resource)!!].use {
-            val stringsNode = it.file.getElementsByTagName(targetTag).item(0).childNodes
-            for (i in 1 until stringsNode.length - 1) callback(stringsNode.item(i))
-        }
-
-
-    /**
-     * Copies the specified node of the source [DomFileEditor] to the target [DomFileEditor].
-     * @param source the source [DomFileEditor].
-     * @param target the target [DomFileEditor]-
-     * @return AutoCloseable that closes the target [DomFileEditor]s.
-     */
-    fun String.copyXmlNode(source: DomFileEditor, target: DomFileEditor): AutoCloseable {
-        val hostNodes = source.file.getElementsByTagName(this).item(0).childNodes
-
-        val destinationResourceFile = target.file
-        val destinationNode = destinationResourceFile.getElementsByTagName(this).item(0)
-
-        for (index in 0 until hostNodes.length) {
-            val node = hostNodes.item(index).cloneNode(true)
-            destinationResourceFile.adoptNode(node)
-            destinationNode.appendChild(node)
-        }
-
-        return AutoCloseable {
-            source.close()
-            target.close()
-        }
-    }
-}
\ No newline at end of file
diff --git a/main/branding/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/main/branding/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
deleted file mode 100644
index 1813f47fea..0000000000
Binary files a/main/branding/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png b/main/branding/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png
deleted file mode 100644
index 9448e7315f..0000000000
Binary files a/main/branding/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-hdpi/ic_launcher.png b/main/branding/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 5adf893981..0000000000
Binary files a/main/branding/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/main/branding/mipmap-hdpi/ic_launcher_round.png b/main/branding/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 5adf893981..0000000000
Binary files a/main/branding/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/main/branding/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/main/branding/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
deleted file mode 100644
index bfb91cced1..0000000000
Binary files a/main/branding/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png b/main/branding/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png
deleted file mode 100644
index 7fd9511246..0000000000
Binary files a/main/branding/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-mdpi/ic_launcher.png b/main/branding/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 46117b63ab..0000000000
Binary files a/main/branding/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/main/branding/mipmap-mdpi/ic_launcher_round.png b/main/branding/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 46117b63ab..0000000000
Binary files a/main/branding/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
deleted file mode 100644
index 4245fe042f..0000000000
Binary files a/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
deleted file mode 100644
index b50442bec2..0000000000
Binary files a/main/branding/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xhdpi/ic_launcher.png b/main/branding/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 224d664346..0000000000
Binary files a/main/branding/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/main/branding/mipmap-xhdpi/ic_launcher_round.png b/main/branding/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 224d664346..0000000000
Binary files a/main/branding/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
deleted file mode 100644
index da0fa7aa12..0000000000
Binary files a/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
deleted file mode 100644
index 184eb07a52..0000000000
Binary files a/main/branding/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xxhdpi/ic_launcher.png b/main/branding/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index f566f259eb..0000000000
Binary files a/main/branding/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/main/branding/mipmap-xxhdpi/ic_launcher_round.png b/main/branding/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index f566f259eb..0000000000
Binary files a/main/branding/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
deleted file mode 100644
index 865aad9740..0000000000
Binary files a/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
deleted file mode 100644
index 3b066a2c37..0000000000
Binary files a/main/branding/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png and /dev/null differ
diff --git a/main/branding/mipmap-xxxhdpi/ic_launcher.png b/main/branding/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 8823abe667..0000000000
Binary files a/main/branding/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/main/branding/mipmap-xxxhdpi/ic_launcher_round.png b/main/branding/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 8823abe667..0000000000
Binary files a/main/branding/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/main/copyvideourl/drawable/revanced_yt_copy.xml b/main/copyvideourl/drawable/revanced_yt_copy.xml
deleted file mode 100644
index e97458c267..0000000000
--- a/main/copyvideourl/drawable/revanced_yt_copy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M 6.8 19.5 C 6.5 19.5 6.2 19.399 6 19.199 C 5.8 19 5.7 18.699 5.7 18.399 L 5.7 7.099 L 6.8 7.099 L 6.8 18.399 L 15.7 18.399 L 15.7 19.5 L 6.8 19.5 Z M 9 17.2 C 8.7 17.2 8.4 17.1 8.2 16.9 C 8 16.7 7.9 16.4 7.9 16.1 L 7.9 5.6 C 7.9 5.3 8 5 8.2 4.8 C 8.4 4.6 8.7 4.5 9 4.5 L 17.2 4.5 C 17.5 4.5 17.8 4.6 18 4.8 C 18.2 5 18.3 5.3 18.3 5.6 L 18.3 16.1 C 18.3 16.4 18.2 16.7 18 16.9 C 17.8 17.1 17.5 17.2 17.2 17.2 L 9 17.2 Z M 9 16.1 L 17.2 16.1 L 17.2 5.6 L 9 5.6 L 9 16.1 Z M 9 16.1 L 9 5.6 L 9 16.1 Z"
-        android:fillColor="#ffffffff"/>
-</vector>
diff --git a/main/copyvideourl/drawable/revanced_yt_copy_timestamp.xml b/main/copyvideourl/drawable/revanced_yt_copy_timestamp.xml
deleted file mode 100644
index f1c2e819d8..0000000000
--- a/main/copyvideourl/drawable/revanced_yt_copy_timestamp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:name="path"
-        android:pathData="M 6.8 19.5 C 6.5 19.5 6.2 19.4 6 19.2 C 5.8 19 5.7 18.7 5.7 18.4 L 5.7 7.1 L 6.8 7.1 L 6.8 18.4 L 15.7 18.4 L 15.7 19.5 L 6.8 19.5 Z M 9 17.2 C 8.7 17.2 8.4 17.1 8.2 16.9 C 8 16.7 7.9 16.4 7.9 16.1 L 7.9 5.6 C 7.9 5.3 8 5 8.2 4.8 C 8.4 4.6 8.7 4.5 9 4.5 L 17.2 4.5 C 17.5 4.5 17.8 4.6 18 4.8 C 18.2 5 18.3 5.3 18.3 5.6 L 18.3 16.1 C 18.3 16.4 18.2 16.7 18 16.9 C 17.8 17.1 17.5 17.2 17.2 17.2 L 9 17.2 Z M 9 16.1 L 17.2 16.1 L 17.2 5.6 L 9 5.6 L 9 16.1 Z M 9 16.1 L 9 5.6 L 9 16.1 Z M 13.1 8 C 11.5 8 10.2 9.3 10.2 10.9 C 10.2 12.5 11.5 13.8 13.1 13.8 C 14.7 13.8 16 12.5 16 10.9 C 16 9.3 14.7 8 13.1 8 Z M 13.1 13.3 C 11.8 13.3 10.7 12.2 10.7 10.9 C 10.7 9.6 11.8 8.5 13.1 8.5 C 14.4 8.5 15.5 9.6 15.5 10.9 C 15.5 12.2 14.5 13.3 13.1 13.3 Z M 14.5 12 L 14.2 12.3 L 12.9 11 L 12.9 9.4 L 13.3 9.4 L 13.3 10.8 L 14.5 12 Z"
-        android:fillColor="#ffffffff" />
-</vector>
diff --git a/main/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml b/main/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
deleted file mode 100644
index 97ec1740f7..0000000000
--- a/main/copyvideourl/host/layout/youtube_controls_bottom_ui_container.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_video_url_timestamp_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_copy_timestamp" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_video_url_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_copy" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-</android.support.constraint.ConstraintLayout>
diff --git a/main/copyvideourl/host/values/strings.xml b/main/copyvideourl/host/values/strings.xml
deleted file mode 100644
index 8452816c3f..0000000000
--- a/main/copyvideourl/host/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="revanced_share_copy_url_success">URL copied to clipboard</string>
-    <string name="revanced_share_copy_url_timestamp_success">URL with timestamp copied</string>
-</resources>
diff --git a/main/downloads/drawable/revanced_yt_download_button.xml b/main/downloads/drawable/revanced_yt_download_button.xml
deleted file mode 100644
index 69ab6992b4..0000000000
--- a/main/downloads/drawable/revanced_yt_download_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:tint="#FFFFFF" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M 6.0050001,16.257111 h 0.916667 v 1.666667 H 16.088333 V 16.257111 H 17.005 v 2.777778 H 6.0050001 Z M 16.5,11.4 15.8,10.7 12,14.4 V 4 h -1 v 10.4 l -3.8,-3.8 -0.7,0.7 5,5 z"/>
-</vector>
diff --git a/main/downloads/host/layout/youtube_controls_bottom_ui_container.xml b/main/downloads/host/layout/youtube_controls_bottom_ui_container.xml
deleted file mode 100644
index 419845aa9a..0000000000
--- a/main/downloads/host/layout/youtube_controls_bottom_ui_container.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/external_download_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_yt_download_button" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
-</android.support.constraint.ConstraintLayout>
diff --git a/main/downloads/host/values/strings.xml b/main/downloads/host/values/strings.xml
deleted file mode 100644
index dcdfd27532..0000000000
--- a/main/downloads/host/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="external_downloader_not_installed_warning">is not installed. Please install it.</string>
-</resources>
diff --git a/main/microg/host/values/strings.xml b/main/microg/host/values/strings.xml
deleted file mode 100644
index 6d4c07436c..0000000000
--- a/main/microg/host/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="microg_not_installed_warning">Vanced MicroG is not installed. Please install it.</string>
-    <string name="microg_not_running_warning">Vanced MicroG is failing to run. Please follow the "Don't kill my app" guide for Vanced MicroG.</string>
-</resources>
diff --git a/main/returnyoutubedislike/host/values/strings.xml b/main/returnyoutubedislike/host/values/strings.xml
deleted file mode 100644
index e887fe5ce7..0000000000
--- a/main/returnyoutubedislike/host/values/strings.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<resources>
-    <string name="revanced_ryd_video_likes_hidden_by_video_owner">Hidden</string>
-
-    <string name="revanced_ryd_failure_connection_timeout">Dislikes temporarily not available (API timed out)</string>
-    <string name="revanced_ryd_failure_connection_status_code" formatted="false">Dislikes not available (status %d)</string>
-    <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes not available (client API limit reached)</string>
-    <string name="revanced_ryd_failure_generic">Dislikes not available (%s)</string>
-
-    <!-- corner case situation, where user enables RYD while video is playing and then tries to vote for the video -->
-    <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">Reload video to vote using ReturnYouTubeDislike</string>
-
-    <string name="revanced_ryd_enable_title">Return YouTube Dislike</string>
-    <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
-    <string name="revanced_ryd_enable_summary_off">Dislikes are not shown</string>
-
-    <string name="revanced_ryd_shorts_title">Show dislikes on Shorts</string>
-    <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts</string>
-    <string name="revanced_ryd_shorts_summary_off">Dislikes hidden on Shorts</string>
-
-    <string name="revanced_ryd_dislike_percentage_title">Dislikes as percentage</string>
-    <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage</string>
-    <string name="revanced_ryd_dislike_percentage_summary_off">Dislikes shown as number</string>
-
-    <string name="revanced_ryd_compact_layout_title">Compact like button</string>
-    <string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string>
-    <string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string>
-
-    <string name="ryd_toast_on_connection_error_title">Show toast if API not available</string>
-    <string name="ryd_toast_on_connection_error_summary_on">Toast shown if ReturnYouTubeDislike API is not available</string>
-    <string name="ryd_toast_on_connection_error_summary_off">Toast not shown if ReturnYouTubeDislike API is not available</string>
-
-    <string name="revanced_ryd_about">About</string>
-    <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
-    <string name="revanced_ryd_attribution_summary">Data is provided by the Return YouTube Dislike API. Tap here to learn more.</string>
-
-
-    <string name="revanced_ryd_statistics_category_title">ReturnYouTubeDislike API statistics of this device</string>
-
-    <string name="revanced_ryd_statistics_getFetchCallResponseTimeAverage_title">API response time, average</string>
-    <string name="revanced_ryd_statistics_getFetchCallResponseTimeMin_title">API response time, minimum</string>
-    <string name="revanced_ryd_statistics_getFetchCallResponseTimeMax_title">API response time, maximum</string>
-
-    <string name="revanced_ryd_statistics_getFetchCallResponseTimeLast_title">API response time, last video</string>
-    <string name="revanced_ryd_statistics_getFetchCallResponseTimeLast_rate_limit_summary">Dislikes temporarily not available - Client API rate limit in effect</string>
-
-    <string name="revanced_ryd_statistics_getFetchCallCount_title">API fetch votes, number of calls</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_zero_summary">No network calls made</string>
-    <string name="revanced_ryd_statistics_getFetchCallCount_non_zero_summary">%d network calls made</string>
-
-    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_title">API fetch votes, number of timeouts</string>
-    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_zero_summary">No network calls timed out</string>
-    <string name="revanced_ryd_statistics_getFetchCallNumberOfFailures_non_zero_summary">%d network calls timed out</string>
-
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_title">API client rate limits</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_zero_summary">No client rate limits encountered</string>
-    <string name="revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary">Client rate limit encountered %d times</string>
-
-    <string name="revanced_ryd_statistics_millisecond_text">%d milliseconds</string>
-</resources>
diff --git a/main/settings/host/values/strings.xml b/main/settings/host/values/strings.xml
deleted file mode 100644
index 75802473c6..0000000000
--- a/main/settings/host/values/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="revanced_settings_title">ReVanced</string>
-    <string name="revanced_settings_confirm_user_dialog_title">Do you wish to proceed?</string>
-    <string name="revanced_settings_reset">Reset</string>
-
-    <string name="revanced_settings_import">Import</string>
-    <string name="revanced_settings_import_copy">Copy</string>
-    <string name="revanced_settings_import_reset">ReVanced settings reset to default</string>
-    <string name="revanced_settings_import_success">Imported %d settings</string>
-    <string name="revanced_settings_import_failure_parse">Import failed: %s</string>
-</resources>
diff --git a/main/settings/layout/revanced_settings_with_toolbar.xml b/main/settings/layout/revanced_settings_with_toolbar.xml
deleted file mode 100644
index 150088114e..0000000000
--- a/main/settings/layout/revanced_settings_with_toolbar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical"
-        android:transitionGroup="true">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/yt_white1"
-            android:elevation="4dp">
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/revanced_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/ytBrandBackgroundSolid"
-                app:navigationIcon="@drawable/yt_outline_arrow_left_black_24"
-                app:title="@string/revanced_settings" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/revanced_settings_fragments"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </LinearLayout>
-</merge>
\ No newline at end of file
diff --git a/main/settings/xml/revanced_prefs.xml b/main/settings/xml/revanced_prefs.xml
deleted file mode 100644
index 9562c0097b..0000000000
--- a/main/settings/xml/revanced_prefs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
-</PreferenceScreen>
\ No newline at end of file
diff --git a/main/sponsorblock/drawable-xxxhdpi/quantum_ic_skip_next_white_24.png b/main/sponsorblock/drawable-xxxhdpi/quantum_ic_skip_next_white_24.png
deleted file mode 100644
index 19c4929cca..0000000000
Binary files a/main/sponsorblock/drawable-xxxhdpi/quantum_ic_skip_next_white_24.png and /dev/null differ
diff --git a/main/sponsorblock/drawable/ic_sb_adjust.xml b/main/sponsorblock/drawable/ic_sb_adjust.xml
deleted file mode 100644
index 76a4b8bc9c..0000000000
--- a/main/sponsorblock/drawable/ic_sb_adjust.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15,12c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3z" />
-</vector>
diff --git a/main/sponsorblock/drawable/ic_sb_compare.xml b/main/sponsorblock/drawable/ic_sb_compare.xml
deleted file mode 100644
index 04cc65e402..0000000000
--- a/main/sponsorblock/drawable/ic_sb_compare.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v2h2L12,1h-2v2zM10,18L5,18l5,-6v6zM19,3h-5v2h5v13l-5,-6v9h5c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2z" />
-</vector>
diff --git a/main/sponsorblock/drawable/ic_sb_edit.xml b/main/sponsorblock/drawable/ic_sb_edit.xml
deleted file mode 100644
index e93574bd92..0000000000
--- a/main/sponsorblock/drawable/ic_sb_edit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
-</vector>
diff --git a/main/sponsorblock/drawable/ic_sb_logo.xml b/main/sponsorblock/drawable/ic_sb_logo.xml
deleted file mode 100644
index c39b9e0b81..0000000000
--- a/main/sponsorblock/drawable/ic_sb_logo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX=".8"
-        android:scaleY=".8">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M8,6.82v10.36c0,0.79 0.87,1.27 1.54,0.84l8.14,-5.18c0.62,-0.39 0.62,-1.29 0,-1.69L9.54,5.98C8.87,5.55 8,6.03 8,6.82z" />
-    </group>
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM19,11c0,4.52 -2.98,8.69 -7,9.93 -4.02,-1.24 -7,-5.41 -7,-9.93L5,6.3l7,-3.11 7,3.11L19,14.17z" />
-</vector>
diff --git a/main/sponsorblock/drawable/ic_sb_publish.xml b/main/sponsorblock/drawable/ic_sb_publish.xml
deleted file mode 100644
index de4e58d3ab..0000000000
--- a/main/sponsorblock/drawable/ic_sb_publish.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M5,5c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,4c-0.55,0 -1,0.45 -1,1zM7.41,14L9,14v5c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-5h1.59c0.89,0 1.34,-1.08 0.71,-1.71L12.71,7.7c-0.39,-0.39 -1.02,-0.39 -1.41,0l-4.59,4.59c-0.63,0.63 -0.19,1.71 0.7,1.71z" />
-</vector>
diff --git a/main/sponsorblock/drawable/ic_sb_voting.xml b/main/sponsorblock/drawable/ic_sb_voting.xml
deleted file mode 100644
index 30224f149a..0000000000
--- a/main/sponsorblock/drawable/ic_sb_voting.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,6c0,-0.55 -0.45,-1 -1,-1L5.82,5l0.66,-3.18 0.02,-0.23c0,-0.31 -0.13,-0.59 -0.33,-0.8L5.38,0 0.44,4.94C0.17,5.21 0,5.59 0,6v6.5c0,0.83 0.67,1.5 1.5,1.5h6.75c0.62,0 1.15,-0.38 1.38,-0.91l2.26,-5.29c0.07,-0.17 0.11,-0.36 0.11,-0.55L12,6zM22.5,10h-6.75c-0.62,0 -1.15,0.38 -1.38,0.91l-2.26,5.29c-0.07,0.17 -0.11,0.36 -0.11,0.55L12,18c0,0.55 0.45,1 1,1h5.18l-0.66,3.18 -0.02,0.24c0,0.31 0.13,0.59 0.33,0.8l0.79,0.78 4.94,-4.94c0.27,-0.27 0.44,-0.65 0.44,-1.06v-6.5c0,-0.83 -0.67,-1.5 -1.5,-1.5z" />
-</vector>
diff --git a/main/sponsorblock/host/layout/youtube_controls_layout.xml b/main/sponsorblock/host/layout/youtube_controls_layout.xml
deleted file mode 100644
index 33a11b83b4..0000000000
--- a/main/sponsorblock/host/layout/youtube_controls_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <com.google.android.libraries.youtube.common.ui.TouchImageView
-        android:id="@+id/sb_sponsorblock_button"
-        style="@style/YouTubePlayerButton"
-        android:layout_width="@dimen/controls_overlay_action_button_size"
-        android:layout_height="@dimen/controls_overlay_action_button_size"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/player_additional_view_container"
-        android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/ic_sb_logo" />
-
-    <com.google.android.libraries.youtube.common.ui.TouchImageView
-        android:id="@+id/sb_voting_button"
-        style="@style/YouTubePlayerButton"
-        android:layout_width="@dimen/controls_overlay_action_button_size"
-        android:layout_height="@dimen/controls_overlay_action_button_size"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="4dp"
-        android:layout_toStartOf="@+id/sb_sponsorblock_button"
-        android:padding="@dimen/controls_overlay_action_button_padding"
-        android:src="@drawable/ic_sb_voting" />
-</RelativeLayout>
diff --git a/main/sponsorblock/host/values/strings.xml b/main/sponsorblock/host/values/strings.xml
deleted file mode 100644
index 7f63c88cad..0000000000
--- a/main/sponsorblock/host/values/strings.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="sb_enable_sb">Enable SponsorBlock</string>
-    <string name="sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>
-
-    <string name="sb_appearance_category">Appearance</string>
-    <string name="sb_enable_voting">Show voting button</string>
-    <string name="sb_enable_voting_sum_on">Segment voting button is shown</string>
-    <string name="sb_enable_voting_sum_off">Segment voting button is not shown</string>
-    <string name="sb_enable_compact_skip_button">Use compact skip button</string>
-    <string name="sb_enable_compact_skip_button_sum_on">Skip button styled for minimum width</string>
-    <string name="sb_enable_compact_skip_button_sum_off">Skip button styled for best appearance</string>
-    <string name="sb_enable_auto_hide_skip_segment_button">Automatically hide skip button</string>
-    <string name="sb_enable_auto_hide_skip_segment_button_sum_on">Skip button hides after a few seconds</string>
-    <string name="sb_enable_auto_hide_skip_segment_button_sum_off">Skip button displayed for entire segment</string>
-    <string name="sb_general_skiptoast">Show a toast when skipping automatically</string>
-    <string name="sb_general_skiptoast_sum_on">Toast shown when a segment is automatically skipped. Tap here to see an example</string>
-    <string name="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
-    <string name="sb_general_time_without">Show video length without segments</string>
-    <string name="sb_general_time_without_sum_on">Video length minus all segments, shown in parentheses next to the full video length</string>
-    <string name="sb_general_time_without_sum_off">Full video length shown</string>
-
-    <string name="sb_create_segment_category">Creating new segments</string>
-    <string name="sb_enable_create_segment">Show create new segment button</string>
-    <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
-    <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
-    <string name="sb_general_adjusting">Adjust new segment step</string>
-    <string name="sb_general_adjusting_sum">Number of milliseconds the time adjustment buttons move when creating new segments</string>
-    <string name="sb_general_adjusting_invalid">Value must be a positive number</string>
-    <string name="sb_guidelines_preference_title">View guidelines</string>
-    <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
-    <string name="sb_guidelines_popup_title">Follow the guidelines</string>
-    <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
-    <string name="sb_guidelines_popup_already_read">Already read</string>
-    <string name="sb_guidelines_popup_open">Show me</string>
-
-    <string name="sb_general">General</string>
-    <string name="sb_toast_on_connection_error_title">Show toast if API is not available</string>
-    <string name="sb_toast_on_connection_error_summary_on">Toast shown if SponsorBlock API is not available</string>
-    <string name="sb_toast_on_connection_error_summary_off">Toast not shown if SponsorBlock API is not available</string>
-    <string name="sb_general_skipcount">Enable skip count tracking</string>
-    <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
-    <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
-    <string name="sb_general_min_duration">Minimum segment duration</string>
-    <string name="sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
-    <string name="sb_general_uuid">Your private user id</string>
-    <string name="sb_general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
-    <string name="sb_general_uuid_invalid">Private user id must be at least 30 characters long</string>
-    <string name="sb_general_api_url">Change API URL</string>
-    <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. Do not change this unless you know what you\'re doing</string>
-    <string name="sb_api_url_reset">API URL reset</string>
-    <string name="sb_api_url_invalid">API URL is invalid</string>
-    <string name="sb_api_url_changed">API URL changed</string>
-    <string name="sb_settings_ie">Import/Export settings</string>
-    <string name="sb_settings_copy">Copy</string>
-    <string name="sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms. This includes your private user id. Be sure to share this wisely</string>
-    <string name="sb_settings_import_successful">Settings imported successfully</string>
-    <string name="sb_settings_import_failed">Failed to import: %s</string>
-    <string name="sb_settings_export_failed">Failed to export: %s</string>
-
-    <string name="sb_settings_revanced_export_user_id_warning">Your settings contain a private SponsorBlock user id.\n\nYour user id is like a password and it should never be shared.\n</string>
-    <string name="sb_settings_revanced_export_user_id_warning_dismiss">Do not show again</string>
-
-    <string name="sb_diff_segments">Change segment behavior</string>
-    <string name="sb_segments_sponsor">Sponsor</string>
-    <string name="sb_segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shout-outs to causes/creators/websites/products they like</string>
-    <string name="sb_segments_selfpromo">Unpaid/Self Promotion</string>
-    <string name="sb_segments_selfpromo_sum">Similar to \'Sponsor\' except for unpaid or self promotion. Includes sections about merchandise, donations, or information about who they collaborated with</string>
-    <string name="sb_segments_interaction">Interaction Reminder (Subscribe)</string>
-    <string name="sb_segments_interaction_sum">A short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should instead be under self promotion</string>
-    <string name="sb_segments_highlight">Highlight</string>
-    <string name="sb_segments_highlight_sum">The part of the video that most people are looking for</string>
-    <string name="sb_segments_intro">Intermission/Intro Animation</string>
-    <string name="sb_segments_intro_sum">An interval without actual content. Could be a pause, static frame, or repeating animation. Does not include transitions containing information</string>
-    <string name="sb_segments_outro">Endcards/Credits</string>
-    <string name="sb_segments_outro_sum">Credits or when the YouTube endcards appear. Not for conclusions with information</string>
-    <string name="sb_segments_preview">Preview/Recap</string>
-    <string name="sb_segments_preview_sum">Collection of clips that show what is coming up or what happened in the video or in other videos of a series, where all information is repeated elsewhere</string>
-    <string name="sb_segments_filler">Filler Tangent/Jokes</string>
-    <string name="sb_segments_filler_sum">Tangential scenes added only for filler or humor that are not required to understand the main content of the video. Does not include segments providing context or background details</string>
-    <string name="sb_segments_nomusic">Music: Non-Music Section</string>
-    <string name="sb_segments_nomusic_sum">Only for use in music videos. Sections of music videos without music, that aren\'t already covered by another category</string>
-
-    <string name="sb_skip_button_compact">Skip</string>
-    <string name="sb_skip_button_compact_highlight">Highlight</string>
-    <string name="sb_skip_button_sponsor">Skip sponsor</string>
-    <string name="sb_skip_button_selfpromo">Skip promo</string>
-    <string name="sb_skip_button_interaction">Skip interact</string>
-    <string name="sb_skip_button_highlight">Skip to highlight</string>
-    <string name="sb_skip_button_intro_beginning">Skip intro</string>
-    <string name="sb_skip_button_intro_middle">Skip intermission</string>
-    <string name="sb_skip_button_intro_end">Skip intermission</string>
-    <string name="sb_skip_button_outro">Skip outro</string>
-    <string name="sb_skip_button_preview_beginning">Skip preview</string>
-    <string name="sb_skip_button_preview_middle">Skip preview</string>
-    <string name="sb_skip_button_preview_end">Skip recap</string>
-    <string name="sb_skip_button_filler">Skip filler</string>
-    <string name="sb_skip_button_nomusic">Skip non-music</string>
-    <string name="sb_skip_button_unsubmitted">Skip segment</string>
-
-    <string name="sb_skipped_sponsor">Skipped sponsor</string>
-    <string name="sb_skipped_selfpromo">Skipped self promotion</string>
-    <string name="sb_skipped_interaction">Skipped annoying reminder</string>
-    <string name="sb_skipped_highlight">Skipped to highlight</string>
-    <string name="sb_skipped_intro_beginning">Skipped intro</string>
-    <string name="sb_skipped_intro_middle">Skipped intermission</string>
-    <string name="sb_skipped_intro_end">Skipped intermission</string>
-    <string name="sb_skipped_outro">Skipped outro</string>
-    <string name="sb_skipped_preview_beginning">Skipped preview</string>
-    <string name="sb_skipped_preview_middle">Skipped preview</string>
-    <string name="sb_skipped_preview_end">Skipped recap</string>
-    <string name="sb_skipped_filler">Skipped filler</string>
-    <string name="sb_skipped_nomusic">Skipped a non-music section</string>
-    <string name="sb_skipped_unsubmitted">Skipped unsubmitted segment</string>
-    <string name="sb_skipped_multiple_segments">Skipped multiple segments</string>
-
-    <string name="sb_skip_automatically">Skip automatically</string>
-    <string name="sb_skip_automatically_once">Skip automatically once</string>
-    <string name="sb_skip_showbutton">Show a skip button</string>
-    <string name="sb_skip_seekbaronly">Show in seek bar</string>
-    <string name="sb_skip_ignore">Disable</string>
-
-    <string name="sb_submit_failed_invalid" formatted="false">Unable to submit segment: %s</string>
-    <string name="sb_submit_failed_timeout">SponsorBlock is temporarily down</string>
-    <string name="sb_submit_failed_unknown_error" formatted="false">Unable to submit segment (status: %d %s)</string>
-    <string name="sb_submit_failed_rate_limit">Unable to submit segment.\nRate Limited (too many from the same user or IP)</string>
-    <string name="sb_submit_failed_forbidden" formatted="false">Can\'t submit the segment: %s</string>
-    <string name="sb_submit_failed_duplicate">Can\'t submit the segment.\nAlready exists</string>
-    <string name="sb_submit_succeeded">Segment submitted successfully</string>
-
-    <string name="sb_sponsorblock_connection_failure_generic">SponsorBlock temporarily not available</string>
-    <string name="sb_sponsorblock_connection_failure_status" formatted="false">SponsorBlock temporarily not available (status %d)</string>
-    <string name="sb_sponsorblock_connection_failure_timeout">SponsorBlock temporarily not available (API timed out)</string>
-
-    <string name="sb_vote_failed_timeout">Unable to vote for segment (API timed out)</string>
-    <string name="sb_vote_failed_unknown_error" formatted="false">Unable to vote for segment (status: %d %s)</string>
-    <string name="sb_vote_failed_forbidden" formatted="false">Unable to vote for segment: %s</string>
-    <string name="sb_vote_upvote">Upvote</string>
-    <string name="sb_vote_downvote">Downvote</string>
-    <string name="sb_vote_category">Change category</string>
-    <string name="sb_vote_no_segments">There are no segments to vote for</string>
-
-    <string name="sb_new_segment_choose_category">Choose the segment category</string>
-    <string name="sb_new_segment_disabled_category">Category is disabled in settings. Enable category to submit.</string>
-    <string name="sb_new_segment_title">New SponsorBlock segment</string>
-    <string name="sb_new_segment_mark_time_as_question" formatted="false">Set %02d:%02d:%03d as the start or end of a new segment?</string>
-    <string name="sb_new_segment_mark_start">start</string>
-    <string name="sb_new_segment_mark_end">end</string>
-    <string name="sb_new_segment_now">now</string>
-    <string name="sb_new_segment_time_start">Time the segment begins at</string>
-    <string name="sb_new_segment_time_end">Time the segment ends at</string>
-    <string name="sb_new_segment_confirm_title">Are the times correct?</string>
-    <string name="sb_new_segment_confirm_content" formatted="false">The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)\nIs it ready to submit?</string>
-    <string name="sb_new_segment_start_is_before_end">Start must be before the end</string>
-    <string name="sb_new_segment_mark_locations_first">Mark two locations on the time bar first</string>
-    <string name="sb_new_segment_preview_segment_first">Preview the segment, and ensure it skips smoothly</string>
-    <string name="sb_new_segment_edit_by_hand_title">Edit timing of segment manually</string>
-    <string name="sb_new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string>
-    <string name="sb_new_segment_edit_by_hand_parse_error">Invalid time given</string>
-
-    <string name="sb_stats">Stats</string>
-    <string name="sb_stats_connection_failure">Stats temporarily not available (API is down)</string>
-    <string name="sb_stats_loading">Loading...</string>
-    <string name="sb_stats_sb_disabled">SponsorBlock is disabled</string>
-    <string name="sb_stats_username" formatted="false">Your username: &lt;b>%s&lt;/b></string>
-    <string name="sb_stats_username_change">Tap here to change your username</string>
-    <string name="sb_stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string>
-    <string name="sb_stats_username_changed">Username successfully changed</string>
-    <string name="sb_stats_reputation" formatted="false">Your reputation is &lt;b>%.2f&lt;/b></string>
-    <string name="sb_stats_submissions" formatted="false">You\'ve created &lt;b>%s&lt;/b> segments</string>
-    <string name="sb_stats_saved_zero">SponsorBlock leaderboard</string>
-    <string name="sb_stats_saved" formatted="false">You\'ve saved people from &lt;b>%s&lt;/b> segments</string>
-    <string name="sb_stats_saved_sum_zero">Tap here to see the global stats and top contributors</string>
-    <string name="sb_stats_saved_sum" formatted="false">That\'s &lt;b>%s&lt;/b> of their lives.&lt;br>Tap here to see the leaderboard</string>
-    <string name="sb_stats_self_saved" formatted="false">You\'ve skipped &lt;b>%s&lt;/b> segments</string>
-    <string name="sb_stats_self_saved_sum" formatted="false">That\'s &lt;b>%s&lt;/b></string>
-    <string name="sb_stats_self_saved_reset_title">Reset skipped segments counter?</string>
-    <string name="sb_stats_saved_hour_format" formatted="false">%d hours %d minutes</string>
-    <string name="sb_stats_saved_minute_format" formatted="false">%d minutes %d seconds</string>
-    <string name="sb_stats_saved_second_format" formatted="false">%d seconds</string>
-
-    <string name="sb_color_dot_label">Color:</string>
-    <string name="sb_color_changed">Color changed</string>
-    <string name="sb_color_reset">Color reset</string>
-    <string name="sb_color_invalid">Invalid color code</string>
-    <string name="sb_reset_color">Reset color</string>
-
-    <string name="sb_reset">Reset</string>
-
-    <string name="sb_about">About</string>
-    <string name="sb_about_api">sponsor.ajay.app</string>
-    <string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
-</resources>
diff --git a/main/sponsorblock/layout/inline_sponsor_overlay.xml b/main/sponsorblock/layout/inline_sponsor_overlay.xml
deleted file mode 100644
index 2c03855498..0000000000
--- a/main/sponsorblock/layout/inline_sponsor_overlay.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
-        android:id="@+id/sb_skip_highlight_button"
-        android:contentDescription="@string/sb_skip_button_compact_highlight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
-        android:focusable="true"
-        android:visibility="gone" />
-
-    <app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
-        android:id="@+id/sb_skip_sponsor_button"
-        android:contentDescription="@string/sb_skip_button_compact"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
-        android:focusable="true"
-        android:visibility="gone" />
-
-    <app.revanced.integrations.sponsorblock.ui.NewSegmentLayout
-        android:id="@+id/sb_new_segment_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin"
-        android:focusable="true"
-        android:visibility="gone" />
-</merge>
\ No newline at end of file
diff --git a/main/sponsorblock/layout/new_segment.xml b/main/sponsorblock/layout/new_segment.xml
deleted file mode 100644
index be5020be27..0000000000
--- a/main/sponsorblock/layout/new_segment.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:yt="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:id="@+id/sb_new_segment_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#66000000"
-        android:gravity="start|center"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="36.0dip">
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_rewind"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="10.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="5.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/player_fast_rewind" />
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_forward"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="5.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="5.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/player_fast_forward" />
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_adjust"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="5.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="10.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/ic_sb_adjust" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="36.0dip">
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_compare"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="10.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="5.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/ic_sb_compare" />
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_edit"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="5.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="5.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/ic_sb_edit" />
-
-            <ImageButton
-                android:id="@+id/sb_new_segment_publish"
-                android:layout_width="45.0dip"
-                android:layout_height="36.0dip"
-                android:layout_gravity="start|center"
-                android:alpha="1.0"
-                android:background="@android:color/transparent"
-                android:contentDescription="@null"
-                android:paddingStart="5.0dip"
-                android:paddingTop="3.0dip"
-                android:paddingEnd="10.0dip"
-                android:paddingBottom="3.0dip"
-                android:src="@drawable/ic_sb_publish" />
-        </LinearLayout>
-    </LinearLayout>
-</merge>
\ No newline at end of file
diff --git a/main/sponsorblock/layout/skip_sponsor_button.xml b/main/sponsorblock/layout/skip_sponsor_button.xml
deleted file mode 100644
index 185960ec9e..0000000000
--- a/main/sponsorblock/layout/skip_sponsor_button.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:yt="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:id="@+id/sb_skip_sponsor_button_container"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="8dp">
-
-        <com.google.android.libraries.youtube.common.ui.YouTubeTextView
-            android:id="@+id/sb_skip_sponsor_button_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:includeFontPadding="false"
-            android:paddingRight="@dimen/ad_overlay_ad_text_padding"
-            android:singleLine="true"
-            android:text="@string/sb_skip_button_compact"
-            android:textColor="@color/skip_ad_button_foreground_color"
-            android:textSize="@dimen/extra_small_font_size"
-            yt:robotoFont="light" />
-
-        <ImageView
-            android:id="@+id/sb_skip_sponsor_button_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:alpha="0.8"
-            android:contentDescription="@null"
-            android:src="@drawable/quantum_ic_skip_next_white_24" />
-    </LinearLayout>
-</merge>
\ No newline at end of file
diff --git a/main/swipecontrols/drawable/ic_sc_brightness_auto.xml b/main/swipecontrols/drawable/ic_sc_brightness_auto.xml
deleted file mode 100644
index 469b335963..0000000000
--- a/main/swipecontrols/drawable/ic_sc_brightness_auto.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M10.85,12.65h2.3L12,9l-1.15,3.65zM20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69L23.31,12 20,8.69zM14.3,16l-0.7,-2h-3.2l-0.7,2H7.8L11,7h2l3.2,9h-1.9z"/>
-</vector>
diff --git a/main/swipecontrols/drawable/ic_sc_brightness_manual.xml b/main/swipecontrols/drawable/ic_sc_brightness_manual.xml
deleted file mode 100644
index 2f6c7072dd..0000000000
--- a/main/swipecontrols/drawable/ic_sc_brightness_manual.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18V6c3.31,0 6,2.69 6,6s-2.69,6 -6,6z"/>
-</vector>
diff --git a/main/swipecontrols/drawable/ic_sc_volume_mute.xml b/main/swipecontrols/drawable/ic_sc_volume_mute.xml
deleted file mode 100644
index 73dc595f46..0000000000
--- a/main/swipecontrols/drawable/ic_sc_volume_mute.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v2.21l2.45,2.45c0.03,-0.2 0.05,-0.41 0.05,-0.63zM19,12c0,0.94 -0.2,1.82 -0.54,2.64l1.51,1.51C20.63,14.91 21,13.5 21,12c0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM4.27,3L3,4.27 7.73,9L3,9v6h4l5,5v-6.73l4.25,4.25c-0.67,0.52 -1.42,0.93 -2.25,1.18v2.06c1.38,-0.31 2.63,-0.95 3.69,-1.81L19.73,21 21,19.73l-9,-9L4.27,3zM12,4L9.91,6.09 12,8.18L12,4z"/>
-</vector>
diff --git a/main/swipecontrols/drawable/ic_sc_volume_normal.xml b/main/swipecontrols/drawable/ic_sc_volume_normal.xml
deleted file mode 100644
index 30dff4be10..0000000000
--- a/main/swipecontrols/drawable/ic_sc_volume_normal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
-</vector>
diff --git a/main/twitch/settings/xml/revanced_prefs.xml b/main/twitch/settings/xml/revanced_prefs.xml
deleted file mode 100644
index 14e1c85de5..0000000000
--- a/main/twitch/settings/xml/revanced_prefs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-</PreferenceScreen>
\ No newline at end of file