diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/video/bytecode/patch/VideoAdsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/video/bytecode/patch/VideoAdsBytecodePatch.kt
index dface2daa..c06c1e7ad 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/video/bytecode/patch/VideoAdsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/video/bytecode/patch/VideoAdsBytecodePatch.kt
@@ -7,7 +7,6 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patches.youtube.misc.videoid.mainstream.patch.MainstreamVideoIdPatch
 import app.revanced.shared.annotation.YouTubeCompatibility
 import app.revanced.shared.patches.videoads.GeneralVideoAdsPatch
 import app.revanced.shared.util.bytecode.BytecodeHelper
@@ -15,8 +14,7 @@ import app.revanced.shared.util.integrations.Constants.ADS_PATH
 
 @DependsOn(
     [
-        GeneralVideoAdsPatch::class,
-        MainstreamVideoIdPatch::class
+        GeneralVideoAdsPatch::class
     ]
 )
 @Name("hide-video-ads-bytecode-patch")
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/video/resource/patch/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/video/resource/patch/VideoAdsPatch.kt
index 699a1c4bc..41e7bacb6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/video/resource/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/video/resource/patch/VideoAdsPatch.kt
@@ -38,14 +38,6 @@ class VideoAdsPatch : ResourcePatch {
             "SETTINGS: HIDE_VIDEO_ADS"
         )
 
-        ResourceHelper.addSettings2(
-            context,
-            "PREFERENCE_CATEGORY: REVANCED_EXTENDED_SETTINGS",
-            "PREFERENCE: EXTENDED_SETTINGS",
-            "SETTINGS: EXPERIMENTAL_FLAGS",
-            "SETTINGS: FIX_VIDEO_PLAYBACK"
-        )
-
         ResourceHelper.patchSuccess(
             context,
             "hide-video-ads"
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 8b58f289c..21a8213a4 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -269,9 +269,6 @@ Is it ready to submit?"</string>
     <string name="revanced_extended_settings">ReVanced Extended settings</string>
     <string name="revanced_extended_summary">Extended related settings</string>
     <string name="revanced_extended_title">Extended settings</string>
-    <string name="revanced_fix_video_playback_summary_off">Fix video playback buffer issues turned off</string>
-    <string name="revanced_fix_video_playback_summary_on">Fix video playback buffer issues turned on</string>
-    <string name="revanced_fix_video_playback_title">Fix video playback buffer issues</string>
     <string name="revanced_hide_auto_captions_summary_off">Captions are enabled when playing a video with captioning is enforced</string>
     <string name="revanced_hide_auto_captions_summary_on">"Captions aren't enabled when playing a video with captioning is enforced"</string>
     <string name="revanced_hide_auto_captions_title">Hide auto captions</string>
@@ -465,10 +462,6 @@ In the app settings, the YouTube version may be marked as v17.28.35"</string>
 If you enable this setting, the following features are available:
 - Community Posts
 - Hide Mix playlist"</string>
-    <string name="revanced_reboot_warning_playback">"Fix video playback buffer issues in some regions.
-
-If you enable this setting, following issue may occurs:
-- When playing a video in the playlist, the issue may not be fixed"</string>
     <string name="revanced_reboot_warning_swipe">"Enable always swipe gesture regardless of player controller visibility.
 
 If you enable this setting, the following features are not available:
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index de1f9e97b..2e443589f 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -334,8 +334,6 @@
 
         <!-- SETTINGS: EXPERIMENTAL_FLAGS
         <Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />SETTINGS: EXPERIMENTAL_FLAGS -->
-        <!-- SETTINGS: FIX_VIDEO_PLAYBACK
-        <SwitchPreference android:title="@string/revanced_fix_video_playback_title" android:key="revanced_fix_video_playback" android:defaultValue="false" android:summaryOn="@string/revanced_fix_video_playback_summary_on" android:summaryOff="@string/revanced_fix_video_playback_summary_off" />SETTINGS: FIX_VIDEO_PLAYBACK -->
         <!-- SETTINGS: ENABLE_OLD_LAYOUT
         <SwitchPreference android:title="@string/revanced_enable_old_layout_title" android:key="revanced_enable_old_layout" android:defaultValue="false" android:summaryOn="@string/revanced_enable_old_layout_summary_on" android:summaryOff="@string/revanced_enable_old_layout_summary_off" />SETTINGS: ENABLE_OLD_LAYOUT -->
         <!-- SETTINGS: LAYOUT_SWITCH