diff --git a/README-template.md b/README-template.md
index 7b60ea6dc..9b2102645 100644
--- a/README-template.md
+++ b/README-template.md
@@ -34,9 +34,7 @@ Example:
           "18.37.36",
           "18.38.44",
           "18.39.41",
-          "18.40.34",
-          "18.41.39",
-          "18.42.41"
+          "18.40.34"
         ]
       }
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
index d4e2bb0d5..8c7df08f5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt
@@ -43,9 +43,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt
index 9a075ef27..c60dc838e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt
@@ -28,9 +28,7 @@ import app.revanced.util.integrations.Constants.ADS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt
index 70784a6ea..1aa0f2d57 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt
@@ -37,9 +37,7 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt
index d7df3cb9d..2a9970b4a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt
index 2d4c6612a..056c37513 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt
index 4331d7d48..0d074aea8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt
@@ -43,9 +43,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt
index 10bed286c..1bda5ce6e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt
@@ -43,9 +43,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt
index 638022ee2..e927f4e23 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt
@@ -47,9 +47,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt
index 677ce766a..137e789ee 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt
@@ -42,9 +42,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt
index 4e0a5fb02..7e57c847b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt
@@ -38,9 +38,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt
index 531023d46..78554d115 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt
@@ -37,9 +37,7 @@ import app.revanced.util.integrations.Constants.FULLSCREEN
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt
index 33f0cb730..5b4712586 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt
@@ -49,9 +49,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt
index ef6a53b0f..49d7a5316 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt
@@ -36,9 +36,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt
index 2deab8d29..a50c4cd16 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt
@@ -34,9 +34,7 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt
index f9f9ce89a..8fd4d06f7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt
@@ -44,9 +44,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt
index b2f2a8dcd..d4ae282f4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt
@@ -43,9 +43,7 @@ import app.revanced.util.integrations.Constants.GENERAL
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt
index 281fd67b8..ccd4aff4f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt
@@ -33,9 +33,7 @@ import app.revanced.util.integrations.Constants.GENERAL
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt
index c56e9e1fc..f46fdf1e9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt
@@ -41,9 +41,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt
index 02ecf9e79..282940484 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt
@@ -37,9 +37,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt
index 4b018cdf3..8f028ef3b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -37,9 +37,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt
index 4e0861d73..f0a7c125a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt
index 528d77c56..007f4abfa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt
@@ -37,9 +37,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt
index b9eb96159..35993c645 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt
@@ -40,9 +40,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt
index 23006c49e..f71399e11 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt
@@ -37,9 +37,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
index 718b917c0..96d756418 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt
index d6590ce74..ef20435f8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt
@@ -35,9 +35,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt
index ec109e70c..67cc5c6b7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt
@@ -38,9 +38,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt
index db9bda1b7..8ebc5c564 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt
@@ -46,9 +46,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt
index e8ca7b168..5d1b9df61 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt
@@ -33,9 +33,7 @@ import app.revanced.util.integrations.Constants.GENERAL
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt
index 0c48bfac6..62c160dc1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt
@@ -50,9 +50,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt
index d3d9d9b13..cf115f638 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt
@@ -44,9 +44,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt
index 7fdd5bc8d..5ae55dce4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.GENERAL
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt
index 4cc265e11..70bb82149 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt
@@ -42,9 +42,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt
index 65e901939..f9e0adcea 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt
@@ -42,9 +42,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt
index 64e69ca35..3ae49fb47 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt
@@ -29,9 +29,7 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt
index c16e5f2c2..f4831b037 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt
@@ -29,9 +29,7 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt
index 40439cbbc..4349ac839 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt
@@ -29,9 +29,7 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
index 6bc3dcc2c..01b65afdd 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
@@ -33,9 +33,7 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusLabel
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt
index 6816051cb..48768ae4a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt
@@ -27,9 +27,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt
index 66bb01a49..41499929f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.resources.ResourceUtils.copyResources
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt
index 56b9e4d1b..b53795387 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt
@@ -29,9 +29,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt
index 67ab9c259..c02f9de80 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt
@@ -31,9 +31,7 @@ import kotlin.io.path.copyTo
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt
index 72a1f7f97..7a01d728c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt
@@ -36,9 +36,7 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt
index 991b9c198..e06f7c134 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt
@@ -35,9 +35,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt
index 9d664cd40..8110f94c1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt
@@ -29,9 +29,7 @@ import kotlin.io.path.exists
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
index eefbab122..12bb02b6d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
@@ -35,9 +35,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt
index e2a762336..91e1d4ad4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt
@@ -34,9 +34,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt
index 1d56cefe0..fdec04a9d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt
@@ -40,9 +40,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt
index 60a1ea745..a34ba4c64 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt
@@ -28,9 +28,7 @@ import app.revanced.util.integrations.Constants.MISC_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt
index dc8db428b..3c39a2a99 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt
@@ -43,9 +43,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt
index 04a758f91..7ff52a8b7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt
@@ -27,9 +27,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt
index 53a989c81..e54df448c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt
@@ -36,9 +36,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt
index 0ef1250c0..be449f0ca 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt
@@ -34,9 +34,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt
index 33666979f..3f6416137 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt
@@ -39,9 +39,7 @@ import com.android.tools.smali.dexlib2.Opcode
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
index a1eff01c6..ada4c2387 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
@@ -44,9 +44,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt
index 754b7e5d1..12621cd4c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt
@@ -36,9 +36,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt
index 953c57c2f..a7ca3e669 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.MISC_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt
index 7d1e13fbd..99db4753d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt
@@ -44,9 +44,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
@@ -69,10 +67,7 @@ object NewSplashAnimationPatch : BytecodePatch(
          */
         WatchWhileActivityWithInFlagsFingerprint.result?.let {
             it.mutableMethod.apply {
-                var targetIndex = getWide32LiteralIndex(45407550) + 3
-                if (getInstruction(targetIndex).opcode == Opcode.MOVE_RESULT)
-                    targetIndex += 1
-
+                val targetIndex = getWide32LiteralIndex(45407550) + 3
                 inject(targetIndex)
             }
         }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt
index 66159bde2..b2fdc0510 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt
@@ -32,9 +32,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt
index afbc645c1..d5ad7c034 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt
@@ -33,9 +33,7 @@ import com.android.tools.smali.dexlib2.util.MethodUtil
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt
index 747386cbd..edac8afde 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt
@@ -28,9 +28,7 @@ import app.revanced.util.resources.ResourceHelper.addTranslations
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt
index d30a508fb..4823a2cec 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt
@@ -35,9 +35,7 @@ import app.revanced.util.integrations.Constants.NAVIGATION
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt
index c59dc4cff..5feb191e9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt
@@ -34,9 +34,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt
index 238431ead..d27fafa32 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt
@@ -47,9 +47,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt
index fea06197b..b01b796fa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt
@@ -35,9 +35,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
index ae3a6a100..34e082c54 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
@@ -52,9 +52,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt
index 81214adcb..6c883a857 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt
@@ -42,9 +42,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt
index 580945381..6275cc19d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt
@@ -38,9 +38,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt
index b684f184c..0f05c5e9f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt
@@ -31,9 +31,7 @@ import app.revanced.util.integrations.Constants.PLAYER
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt
index aae079081..7bac4ede2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt
index 137470721..7cfab8593 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt
@@ -39,9 +39,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt
index e12a3f9f1..295227a54 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt
@@ -52,9 +52,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt
index 085e3c552..b108324a7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt
@@ -41,9 +41,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt
index 55040dfdd..0867feb42 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt
@@ -38,9 +38,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt
index 1a0496572..847f9589f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt
@@ -37,9 +37,7 @@ import app.revanced.util.integrations.Constants.PLAYER
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
index 2c8623681..2eb284795 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt
@@ -35,9 +35,7 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt
index cc28124f0..a07538e5e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt
@@ -41,9 +41,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt
index 5eacf547d..48f0d1503 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt
@@ -31,9 +31,7 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt
index 4eb35be82..13404d347 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt
@@ -46,9 +46,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt
index 8d735dba9..464e4091b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt
@@ -36,9 +36,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt
index 739c50bfc..1e6a70eb7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt
@@ -41,9 +41,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt
index 0c6de29f3..399d71e65 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt
@@ -43,9 +43,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt
index dc38e9472..d086fbb4f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt
@@ -40,9 +40,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt
index 8df350094..60756cfba 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt
@@ -45,9 +45,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt
index 490a09c1e..720548d5d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt
@@ -50,9 +50,7 @@ import org.w3c.dom.Element
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt
index 2f86f6003..adef420ab 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt
@@ -38,9 +38,7 @@ import app.revanced.util.integrations.Constants.SEEKBAR
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt
index 114599590..4b1d320af 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt
@@ -5,14 +5,18 @@ 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.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.seekbar.tapping.fingerprints.SeekbarTappingFingerprint
-import app.revanced.patches.youtube.seekbar.tapping.fingerprints.SeekbarTappingReferenceFingerprint
 import app.revanced.patches.youtube.utils.settings.SettingsPatch
 import app.revanced.util.integrations.Constants.SEEKBAR
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
+import com.android.tools.smali.dexlib2.dexbacked.reference.DexBackedMethodReference
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction11n
 
 @Patch(
     name = "Enable seekbar tapping",
@@ -35,41 +39,65 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
 )
 @Suppress("unused")
 object SeekbarTappingPatch : BytecodePatch(
-    setOf(
-        SeekbarTappingReferenceFingerprint,
-        SeekbarTappingFingerprint
-    )
+    setOf(SeekbarTappingFingerprint)
 ) {
     override fun execute(context: BytecodeContext) {
-        SeekbarTappingReferenceFingerprint.result?.let {
-            it.mutableMethod.apply {
-                TappingLabel = """
-                    invoke-static {}, $SEEKBAR->enableSeekbarTapping()Z
-                    move-result v0
-                    if-eqz v0, :disabled
-                    invoke-virtual { p0, v2 }, ${getInstruction<ReferenceInstruction>(it.scanResult.patternScanResult!!.startIndex).reference}
-                    invoke-virtual { p0, v2 }, ${getInstruction<ReferenceInstruction>(it.scanResult.patternScanResult!!.endIndex - 1).reference}
-                    """
-            }
-        } ?: throw SeekbarTappingReferenceFingerprint.exception
-
         SeekbarTappingFingerprint.result?.let {
             it.mutableMethod.apply {
+                val tapSeekIndex = it.scanResult.patternScanResult!!.startIndex + 1
+                val tapSeekReference = getInstruction<BuilderInstruction35c>(tapSeekIndex).reference
+                val tapSeekClass =
+                    context
+                        .findClass(((tapSeekReference) as DexBackedMethodReference).definingClass)!!
+                        .mutableClass
+                val tapSeekMethods = mutableMapOf<String, MutableMethod>()
+
+                for (method in tapSeekClass.methods) {
+                    if (method.implementation == null)
+                        continue
+
+                    val instructions = method.implementation!!.instructions
+                    // here we make sure we actually find the method because it has more than 7 instructions
+                    if (instructions.count() != 10)
+                        continue
+
+                    // we know that the 7th instruction has the opcode CONST_4
+                    val instruction = instructions.elementAt(6)
+                    if (instruction.opcode != Opcode.CONST_4)
+                        continue
+
+                    // the literal for this instruction has to be either 1 or 2
+                    val literal = (instruction as Instruction11n).narrowLiteral
+
+                    // method founds
+                    if (literal == 1)
+                        tapSeekMethods["P"] = method
+                    else if (literal == 2)
+                        tapSeekMethods["O"] = method
+                }
+
+                val pMethod = tapSeekMethods["P"]
+                    ?: throw PatchException("tapSeekMethod not found")
+                val oMethod = tapSeekMethods["O"]
+                    ?: throw PatchException("tapSeekMethod not found")
+
                 val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
 
                 addInstructionsWithLabels(
-                    insertIndex,
-                    TappingLabel,
-                    ExternalLabel("disabled", getInstruction(insertIndex))
+                    insertIndex, """
+                        invoke-static {}, $SEEKBAR->enableSeekbarTapping()Z
+                        move-result v0
+                        if-eqz v0, :disabled
+                        invoke-virtual { p0, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
+                        invoke-virtual { p0, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
+                        """, ExternalLabel("disabled", getInstruction(insertIndex))
                 )
             }
         } ?: throw SeekbarTappingFingerprint.exception
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/fingerprints/SeekbarTappingReferenceFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/fingerprints/SeekbarTappingReferenceFingerprint.kt
deleted file mode 100644
index 743465a6e..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/fingerprints/SeekbarTappingReferenceFingerprint.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package app.revanced.patches.youtube.seekbar.tapping.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-object SeekbarTappingReferenceFingerprint : MethodFingerprint(
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.PUBLIC,
-    parameters = listOf("L"),
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL, // oMethodReference
-        Opcode.RETURN,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN,
-        Opcode.INT_TO_FLOAT,
-        Opcode.INT_TO_FLOAT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.RETURN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL, // pMethodReference
-        Opcode.RETURN
-    ),
-    customFingerprint = { methodDef, _ -> methodDef.name == "onTouchEvent" }
-)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt
index 315529a0e..c5e85e60f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt
@@ -33,9 +33,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt
index 96c4248bf..049ff0eab 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt
@@ -38,9 +38,7 @@ import app.revanced.util.integrations.Constants.SEEKBAR
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt
index 6658b9aff..532549eda 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt
@@ -68,9 +68,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt
index 1449b0d3a..0c12d23d8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt
@@ -35,9 +35,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
index f946c7957..77bf589e5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
@@ -47,9 +47,7 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt
index fc25967fe..ff2e2f120 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt
@@ -48,9 +48,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt
index 37436ef70..657cfcbe1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt
@@ -40,9 +40,7 @@ import app.revanced.util.resources.ResourceHelper.setMicroG
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt
index 1ff14ab58..c4db2da0d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt
@@ -18,7 +18,6 @@ import app.revanced.patches.youtube.utils.playerresponse.PlayerResponsePatch
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.DislikeFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.LikeFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.RemoveLikeFingerprint
-import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.SpoofAppVersionPatchFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.TextComponentAtomicReferenceFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.TextComponentAtomicReferenceLegacyFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints.TextComponentConstructorFingerprint
@@ -45,7 +44,6 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference
         ReturnYouTubeDislikeOldLayoutPatch::class,
         ReturnYouTubeDislikeShortsPatch::class,
         SettingsPatch::class,
-        SpoofAppVersionPatch::class,
         VideoIdPatch::class
     ],
     compatiblePackages = [
@@ -65,9 +63,7 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
@@ -78,7 +74,6 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         DislikeFingerprint,
         LikeFingerprint,
         RemoveLikeFingerprint,
-        SpoofAppVersionPatchFingerprint,
         TextComponentConstructorFingerprint
     )
 ) {
@@ -196,23 +191,6 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
             }
         } ?: throw TextComponentConstructorFingerprint.exception
 
-        if (SettingsPatch.upward1840) {
-            SpoofAppVersionPatchFingerprint.result?.let {
-                it.mutableMethod.apply {
-                    addInstructionsWithLabels(
-                        0, """
-                            sget-object v0, Lapp/revanced/integrations/settings/SettingsEnum;->INITIALIZED:Lapp/revanced/integrations/settings/SettingsEnum;
-                            invoke-virtual {v0}, Lapp/revanced/integrations/settings/SettingsEnum;->getBoolean()Z
-                            move-result v0
-                            if-nez v0, :initialized
-                            const-string v0, "18.39.41"
-                            return-object v0
-                            """, ExternalLabel("initialized", getInstruction(0))
-                    )
-                }
-            } ?: throw SpoofAppVersionPatchFingerprint.exception
-        }
-
         if (SettingsPatch.upward1834) {
             LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
             PlayerResponsePatch.injectCall("$FILTER_CLASS_DESCRIPTOR->newPlayerResponseVideoId(Ljava/lang/String;Z)V")
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/fingerprints/SpoofAppVersionPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/fingerprints/SpoofAppVersionPatchFingerprint.kt
deleted file mode 100644
index 9ecb86a4e..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/fingerprints/SpoofAppVersionPatchFingerprint.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.utils.returnyoutubedislike.general.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-/**
- * In YouTube v18.40.34+, |segmented_like_dislike_button.eml| is no longer used by some accounts (a/b tests).
- * https://github.com/ReVanced/revanced-patches/issues/2904
- *
- * I suspect this is due to a new type of SpannableString called 'RollingNumber' in YouTube's internal code.
- * No in-depth reverse engineering has been done on this yet.
- *
- * After installing the app for the first time, the app version is spoofed to v18.39.41 for about 500ms before the restart dialog is shown.
- * By doing this we can bypass these a/b tests being applied.
- */
-object SpoofAppVersionPatchFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lapp/revanced/integrations/patches/misc/SpoofAppVersionPatch;"
-                && methodDef.name == "getVersionOverride"
-    }
-)
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/ReturnYouTubeDislikeShortsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/ReturnYouTubeDislikeShortsPatch.kt
index 6580f395f..d02539bc5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/ReturnYouTubeDislikeShortsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/ReturnYouTubeDislikeShortsPatch.kt
@@ -8,7 +8,9 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.utils.returnyoutubedislike.shorts.fingerprints.IncognitoFingerprint
 import app.revanced.patches.youtube.utils.returnyoutubedislike.shorts.fingerprints.ShortsTextViewFingerprint
@@ -31,23 +33,25 @@ object ReturnYouTubeDislikeShortsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext) {
         ShortsTextViewFingerprint.result?.let {
             it.mutableMethod.apply {
-                val patternResult = it.scanResult.patternScanResult!!
+                val startIndex = it.scanResult.patternScanResult!!.startIndex
+
+                val isDisLikesBooleanIndex = getTargetIndexDownTo(startIndex, Opcode.IGET_BOOLEAN)
+                val textViewFieldIndex = getTargetIndexDownTo(startIndex, Opcode.IGET_OBJECT)
 
-                val isDisLikesBooleanIndex =
-                    implementation!!.instructions.indexOfFirst { instruction ->
-                        instruction.opcode == Opcode.IGET_BOOLEAN
-                    }
                 // If the field is true, the TextView is for a dislike button.
                 val isDisLikesBooleanReference =
                     getInstruction<ReferenceInstruction>(isDisLikesBooleanIndex).reference
 
                 val textViewFieldReference = // Like/Dislike button TextView field
-                    getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
+                    getInstruction<ReferenceInstruction>(textViewFieldIndex).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
+                val insertIndex = implementation!!.instructions.indexOfFirst { instruction ->
+                    instruction.opcode == Opcode.CHECK_CAST
+                } + 1
+
                 addInstructionsWithLabels(
                     insertIndex, """
                     # Check, if the TextView is for a dislike button
@@ -100,6 +104,19 @@ object ReturnYouTubeDislikeShortsPatch : BytecodePatch(
         }
     }
 
+    private fun MutableMethod.getTargetIndexDownTo(
+        startIndex: Int,
+        opcode: Opcode
+    ): Int {
+        for (index in startIndex downTo 0) {
+            if (getInstruction(index).opcode != opcode)
+                continue
+
+            return index
+        }
+        throw PatchException("Failed to find target method")
+    }
+
     private const val INTEGRATIONS_RYD_CLASS_DESCRIPTOR =
         "$UTILS_PATH/ReturnYouTubeDislikePatch;"
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/fingerprints/ShortsTextViewFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/fingerprints/ShortsTextViewFingerprint.kt
index a3d016860..08095a23f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/fingerprints/ShortsTextViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/fingerprints/ShortsTextViewFingerprint.kt
@@ -7,22 +7,38 @@ object ShortsTextViewFingerprint : MethodFingerprint(
     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.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.GOTO,
+        Opcode.IGET,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT8,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.GOTO,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT8,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
+    ),
+    customFingerprint = custom@{ _, classDef ->
+        classDef.methods.count() == 3
+    }
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
index 278ba183a..fb3999e95 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
@@ -47,9 +47,7 @@ import java.util.concurrent.TimeUnit
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ],
@@ -94,7 +92,6 @@ object SettingsPatch : AbstractSettingsResourcePatch(
                         is1836 = playServicesVersion in 233700000..233801999
                         upward1828 = 232900000 <= playServicesVersion
                         upward1834 = 233502000 <= playServicesVersion
-                        upward1840 = 234102000 <= playServicesVersion
 
                         break
                     }
@@ -204,7 +201,6 @@ object SettingsPatch : AbstractSettingsResourcePatch(
     internal var is1836: Boolean = false
     internal var upward1828: Boolean = false
     internal var upward1834: Boolean = false
-    internal var upward1840: Boolean = false
 
     internal fun addPreference(settingArray: Array<String>) {
         contexts.addPreference(settingArray)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt
index 42d290f3c..0742b5cdb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt
@@ -34,9 +34,7 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt
index 302eda33f..dc6eec9c0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt
@@ -32,9 +32,7 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt
index 236537dfb..88c162067 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt
@@ -34,9 +34,7 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
index 2759a409d..ac7fafdc1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
@@ -49,9 +49,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
index 65ffaea92..d032f9183 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -41,9 +41,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.37.36",
                 "18.38.44",
                 "18.39.41",
-                "18.40.34",
-                "18.41.39",
-                "18.42.41"
+                "18.40.34"
             ]
         )
     ]