diff --git a/Data/Sys/GameSettings/G2R.ini b/Data/Sys/GameSettings/G2R.ini
index 62d18fb189..c51e5f9e70 100644
--- a/Data/Sys/GameSettings/G2R.ini
+++ b/Data/Sys/GameSettings/G2R.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GAC.ini b/Data/Sys/GameSettings/GAC.ini
index 8d8f467164..71d035b6d1 100644
--- a/Data/Sys/GameSettings/GAC.ini
+++ b/Data/Sys/GameSettings/GAC.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GB3.ini b/Data/Sys/GameSettings/GB3.ini
index 8336dfd953..936341400c 100644
--- a/Data/Sys/GameSettings/GB3.ini
+++ b/Data/Sys/GameSettings/GB3.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GBV.ini b/Data/Sys/GameSettings/GBV.ini
index 24a840e071..0b99af1684 100644
--- a/Data/Sys/GameSettings/GBV.ini
+++ b/Data/Sys/GameSettings/GBV.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
+EmulationIssues = Needs Real xfb for videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,7 +20,3 @@ EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True
-
diff --git a/Data/Sys/GameSettings/GBX.ini b/Data/Sys/GameSettings/GBX.ini
index 468af38620..6830160bae 100644
--- a/Data/Sys/GameSettings/GBX.ini
+++ b/Data/Sys/GameSettings/GBX.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,7 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
-
diff --git a/Data/Sys/GameSettings/GDD.ini b/Data/Sys/GameSettings/GDD.ini
index 7c2ff71444..b14da616cc 100644
--- a/Data/Sys/GameSettings/GDD.ini
+++ b/Data/Sys/GameSettings/GDD.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE. Needs real xfb for the videos to display.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,11 +17,6 @@ EmulationIssues = Slow audio with HLE. Needs real xfb for the videos to display.
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-
-[DSP]
-EnableJIT = True
-
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GE5.ini b/Data/Sys/GameSettings/GE5.ini
index 0777586fdb..22e4998f85 100644
--- a/Data/Sys/GameSettings/GE5.ini
+++ b/Data/Sys/GameSettings/GE5.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GFG.ini b/Data/Sys/GameSettings/GFG.ini
index 0f8a20c08d..7e3d551cb4 100644
--- a/Data/Sys/GameSettings/GFG.ini
+++ b/Data/Sys/GameSettings/GFG.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,9 +17,6 @@ EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
 [ActionReplay]
 # Add action replay cheats here.
 
-[DSP]
-EnableJIT = True
-
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GFO.ini b/Data/Sys/GameSettings/GFO.ini
index a079bdc637..8f7d5dc444 100644
--- a/Data/Sys/GameSettings/GFO.ini
+++ b/Data/Sys/GameSettings/GFO.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GIL.ini b/Data/Sys/GameSettings/GIL.ini
index cb324b63bb..4e40e56094 100644
--- a/Data/Sys/GameSettings/GIL.ini
+++ b/Data/Sys/GameSettings/GIL.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -20,6 +19,3 @@ EmulationIssues = Slow audio with HLE.
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GMN.ini b/Data/Sys/GameSettings/GMN.ini
index 636a2126d2..847e98d75b 100644
--- a/Data/Sys/GameSettings/GMN.ini
+++ b/Data/Sys/GameSettings/GMN.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Videos require real XFB, slow audio with HLE.
+EmulationIssues = Videos require real XFB.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,6 +20,3 @@ EmulationIssues = Videos require real XFB, slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GNH.ini b/Data/Sys/GameSettings/GNH.ini
index 33f5151d3b..a6cd582b85 100644
--- a/Data/Sys/GameSettings/GNH.ini
+++ b/Data/Sys/GameSettings/GNH.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GOB.ini b/Data/Sys/GameSettings/GOB.ini
index 884d708529..eabb4f5eff 100644
--- a/Data/Sys/GameSettings/GOB.ini
+++ b/Data/Sys/GameSettings/GOB.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GP8.ini b/Data/Sys/GameSettings/GP8.ini
index e22fa5c61f..8a0ec4bf27 100644
--- a/Data/Sys/GameSettings/GP8.ini
+++ b/Data/Sys/GameSettings/GP8.ini
@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
diff --git a/Data/Sys/GameSettings/GZP.ini b/Data/Sys/GameSettings/GZP.ini
index 209b040234..e64360681e 100644
--- a/Data/Sys/GameSettings/GZP.ini
+++ b/Data/Sys/GameSettings/GZP.ini
@@ -1,13 +1,12 @@
-# GZPE70, GZPP70- Zapper
+# GZPE70, GZPP70 - Zapper
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,6 +20,3 @@ EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True