diff --git a/Data/Sys/GameSettings/GAU.ini b/Data/Sys/GameSettings/GAU.ini
index ceafa32032..dd38a27bb0 100644
--- a/Data/Sys/GameSettings/GAU.ini
+++ b/Data/Sys/GameSettings/GAU.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
-# Avoids constant flickering while in game.
+# Avoids constant flickering of graphical layers while in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GDJ.ini b/Data/Sys/GameSettings/GDJ.ini
deleted file mode 100644
index 6b27ce67fb..0000000000
--- a/Data/Sys/GameSettings/GDJ.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# GDJEB2, GDJJB2 - Digimon World 4
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GJU.ini b/Data/Sys/GameSettings/GJU.ini
deleted file mode 100644
index eb88311dbe..0000000000
--- a/Data/Sys/GameSettings/GJU.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# GJUF78, GJUE78, GJUD78, GJUP78 - Tak and the Power of Juju
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GSM.ini b/Data/Sys/GameSettings/GSM.ini
index 4190a2fcd5..a621043d9d 100644
--- a/Data/Sys/GameSettings/GSM.ini
+++ b/Data/Sys/GameSettings/GSM.ini
@@ -15,5 +15,5 @@
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
-# Avoids stuck FMVs and black screen flickering while in game.
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GVR.ini b/Data/Sys/GameSettings/GVR.ini
deleted file mode 100644
index 259184d580..0000000000
--- a/Data/Sys/GameSettings/GVR.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GVRE7H - Grooverider: Slot Car Thunder
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-
-[Video_Hacks]
-# Avoids constant flickering while in game.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GXL.ini b/Data/Sys/GameSettings/GXL.ini
deleted file mode 100644
index 77d728972a..0000000000
--- a/Data/Sys/GameSettings/GXL.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# GXLE52, GXLP52, GXLX52 - X-Men Legends
-
-[Video_Hacks]
-# Avoids constant black frame flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R2D.ini b/Data/Sys/GameSettings/R2D.ini
deleted file mode 100644
index 06bae4e140..0000000000
--- a/Data/Sys/GameSettings/R2D.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# R2DJEP, R2DEEB, R2DPJW - Dokapon Kingdom
-
-[Video_Hacks]
-# Prevents flickering throughout the game.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R2P.ini b/Data/Sys/GameSettings/R2P.ini
index ee9668f623..ac376fbef1 100644
--- a/Data/Sys/GameSettings/R2P.ini
+++ b/Data/Sys/GameSettings/R2P.ini
@@ -2,7 +2,3 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/R3P.ini b/Data/Sys/GameSettings/R3P.ini
deleted file mode 100644
index 54a61bc97e..0000000000
--- a/Data/Sys/GameSettings/R3P.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# R3PEWR, R3PJ52, R3PPWR - Speed Racer
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM6.ini b/Data/Sys/GameSettings/RM6.ini
deleted file mode 100644
index f60a40b539..0000000000
--- a/Data/Sys/GameSettings/RM6.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# RM6EEB, RM6P99 - Baroque
-
-[Video_Hacks]
-# Avoids constant flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/ROQ.ini b/Data/Sys/GameSettings/ROQ.ini
deleted file mode 100644
index bbafbc32ac..0000000000
--- a/Data/Sys/GameSettings/ROQ.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# ROQJEP - Baroque
-
-[Video_Hacks]
-# Avoids constant flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RPY.ini b/Data/Sys/GameSettings/RPY.ini
index 1cd647ef5d..72848bbd5f 100644
--- a/Data/Sys/GameSettings/RPY.ini
+++ b/Data/Sys/GameSettings/RPY.ini
@@ -1,18 +1,7 @@
 # RPYE9B, RPYJ9B, RPYP9B - Super Swing Golf
 
 [Core]
-# Values set here will override the main Dolphin settings.
 FPRF = True
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SuggestedAspectRatio = 2
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/SAK.ini b/Data/Sys/GameSettings/SAK.ini
index 7c2edf9ade..d345cc94e2 100644
--- a/Data/Sys/GameSettings/SAK.ini
+++ b/Data/Sys/GameSettings/SAK.ini
@@ -1,18 +1,7 @@
 # SAKENS, SAKPNS - Sakura Wars: So Long, My Love
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Hacks]
 EFBToTextureEnable = False
-# Avoids constant black flickering.
-ImmediateXFBenable = False
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SCY.ini b/Data/Sys/GameSettings/SCY.ini
index f2311e3fb4..a1170c5ef6 100644
--- a/Data/Sys/GameSettings/SCY.ini
+++ b/Data/Sys/GameSettings/SCY.ini
@@ -1,18 +1,7 @@
 # SCYE4Q, SCYP4Q, SCYX4Q, SCYY4Q, SCYZ4Q - Cars 2
 
 [Core]
-# Values set here will override the main Dolphin settings.
 LowDCBZHack = True
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SEM.ini b/Data/Sys/GameSettings/SEM.ini
index 1b923e0360..2e299243b3 100644
--- a/Data/Sys/GameSettings/SEM.ini
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -1,20 +1,7 @@
 # SEME4Q, SEMJ01, SEMP4Q, SEMX4Q, SEMY4Q, SEMZ4Q - Disney Epic Mickey
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 
 [Video_Enhancements]
 ForceTextureFiltering = 0
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SK8.ini b/Data/Sys/GameSettings/SK8.ini
index 48d3cf4dda..3065be4b8b 100644
--- a/Data/Sys/GameSettings/SK8.ini
+++ b/Data/Sys/GameSettings/SK8.ini
@@ -1,16 +1,5 @@
 # SK8P52, SK8D52, SK8V52, SK8I52, SK8E52 - Skylanders: Trap Team
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Hacks]
 # Properly emulate the blur in the backgrounds.
 EFBEmulateFormatChanges = True
-# Prevent epilepsy-inducing FMVs.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SKY.ini b/Data/Sys/GameSettings/SKY.ini
index 1e62b67c11..8f8e81758e 100644
--- a/Data/Sys/GameSettings/SKY.ini
+++ b/Data/Sys/GameSettings/SKY.ini
@@ -1,16 +1,5 @@
 # SKYP52, SKYZ52, SKYE52, SKYX52, SKYY52 - Skylanders: Giants
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Hacks]
 # Properly emulates the blur in the pause screen.
 EFBEmulateFormatChanges = True
-# Prevent epilepsy-inducing FMVs and menus.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SQI.ini b/Data/Sys/GameSettings/SQI.ini
index 0b65c7e8ee..cbb8527008 100644
--- a/Data/Sys/GameSettings/SQI.ini
+++ b/Data/Sys/GameSettings/SQI.ini
@@ -1,18 +1,7 @@
 # SQIE4Q, SQIP4Q, SQIY4Q - Disney Infinity
 
 [Core]
-# Values set here will override the main Dolphin settings.
 LowDCBZHack = True
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SSP.ini b/Data/Sys/GameSettings/SSP.ini
index 3622961727..5184e821a8 100644
--- a/Data/Sys/GameSettings/SSP.ini
+++ b/Data/Sys/GameSettings/SSP.ini
@@ -1,16 +1,5 @@
 # SSPE52, SSPP52, SSPX52, SSPY52, SSPJGD - Skylanders: Spyro's Adventure
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Hacks]
 # Properly emulates the blur in the pause screen.
 EFBEmulateFormatChanges = True
-# Prevent epilepsy-inducing FMVs and menus.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/STS.ini b/Data/Sys/GameSettings/STS.ini
index 0139cf71ff..76e38e9593 100644
--- a/Data/Sys/GameSettings/STS.ini
+++ b/Data/Sys/GameSettings/STS.ini
@@ -1,19 +1,4 @@
 # STSE4Q, STSP4Q, STSX4Q, STSY4Q, STSZ4Q - Toy Story 3
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
-[Video_Hacks]
-# Avoids constant black flickering.
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SVX.ini b/Data/Sys/GameSettings/SVX.ini
deleted file mode 100644
index 4808e6ff92..0000000000
--- a/Data/Sys/GameSettings/SVX.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# SVXE52, SVXF52, SVXI52, SVXP52, SVXY52 - Skylanders: Swap Force
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Hacks]
-# Prevent epilepsy-inducing FMVs.
-ImmediateXFBEnable = False