diff --git a/Data/Sys/GameSettings/GD7.ini b/Data/Sys/GameSettings/GD7.ini
diff --git a/Data/Sys/GameSettings/GD9.ini b/Data/Sys/GameSettings/GD9.ini
diff --git a/Data/Sys/GameSettings/GDD.ini b/Data/Sys/GameSettings/GDD.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDE.ini b/Data/Sys/GameSettings/GDE.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDF.ini b/Data/Sys/GameSettings/GDF.ini
diff --git a/Data/Sys/GameSettings/GDG.ini b/Data/Sys/GameSettings/GDG.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDI.ini b/Data/Sys/GameSettings/GDI.ini
diff --git a/Data/Sys/GameSettings/GDJ.ini b/Data/Sys/GameSettings/GDJ.ini
diff --git a/Data/Sys/GameSettings/GDK.ini b/Data/Sys/GameSettings/GDK.ini
@@ -6,11 +6,6 @@
 # see http://www.nintendo.com/consumer/memorycard1019.jsp
 MemoryCard251 = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need Projection Before R945
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDL.ini b/Data/Sys/GameSettings/GDL.ini
diff --git a/Data/Sys/GameSettings/GDM.ini b/Data/Sys/GameSettings/GDM.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDQ.ini b/Data/Sys/GameSettings/GDQ.ini
@@ -6,10 +6,6 @@
 # see http://www.nintendo.com/consumer/memorycard1019.jsp
 MemoryCard251 = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDR.ini b/Data/Sys/GameSettings/GDR.ini
diff --git a/Data/Sys/GameSettings/GDS.ini b/Data/Sys/GameSettings/GDS.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDT.ini b/Data/Sys/GameSettings/GDT.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDV.ini b/Data/Sys/GameSettings/GDV.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 UseDualCore = 0
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Grapics Glitches
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GDW.ini b/Data/Sys/GameSettings/GDW.ini
diff --git a/Data/Sys/GameSettings/GE3.ini b/Data/Sys/GameSettings/GE3.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GE4.ini b/Data/Sys/GameSettings/GE4.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 SyncOnSkipIdle = False
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GE5.ini b/Data/Sys/GameSettings/GE5.ini
diff --git a/Data/Sys/GameSettings/GE9.ini b/Data/Sys/GameSettings/GE9.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GEA.ini b/Data/Sys/GameSettings/GEA.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 SyncGPU = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GEB.ini b/Data/Sys/GameSettings/GEB.ini
diff --git a/Data/Sys/GameSettings/GED.ini b/Data/Sys/GameSettings/GED.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 GPUDeterminismMode = fake-completion
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GEM.ini b/Data/Sys/GameSettings/GEM.ini
diff --git a/Data/Sys/GameSettings/GEN.ini b/Data/Sys/GameSettings/GEN.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GEO.ini b/Data/Sys/GameSettings/GEO.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GES.ini b/Data/Sys/GameSettings/GES.ini
diff --git a/Data/Sys/GameSettings/GEW.ini b/Data/Sys/GameSettings/GEW.ini
diff --git a/Data/Sys/GameSettings/GEX.ini b/Data/Sys/GameSettings/GEX.ini
diff --git a/Data/Sys/GameSettings/GEY.ini b/Data/Sys/GameSettings/GEY.ini
diff --git a/Data/Sys/GameSettings/GEZ.ini b/Data/Sys/GameSettings/GEZ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GF2.ini b/Data/Sys/GameSettings/GF2.ini
diff --git a/Data/Sys/GameSettings/GF4.ini b/Data/Sys/GameSettings/GF4.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GF5.ini b/Data/Sys/GameSettings/GF5.ini
diff --git a/Data/Sys/GameSettings/GF6.ini b/Data/Sys/GameSettings/GF6.ini
diff --git a/Data/Sys/GameSettings/GF7.ini b/Data/Sys/GameSettings/GF7.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 FPRF = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GF8.ini b/Data/Sys/GameSettings/GF8.ini
diff --git a/Data/Sys/GameSettings/GFA.ini b/Data/Sys/GameSettings/GFA.ini
diff --git a/Data/Sys/GameSettings/GFB.ini b/Data/Sys/GameSettings/GFB.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFC.ini b/Data/Sys/GameSettings/GFC.ini
diff --git a/Data/Sys/GameSettings/GFD.ini b/Data/Sys/GameSettings/GFD.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFE.ini b/Data/Sys/GameSettings/GFE.ini
diff --git a/Data/Sys/GameSettings/GFF.ini b/Data/Sys/GameSettings/GFF.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFG.ini b/Data/Sys/GameSettings/GFG.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFH.ini b/Data/Sys/GameSettings/GFH.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MMU = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFK.ini b/Data/Sys/GameSettings/GFK.ini
diff --git a/Data/Sys/GameSettings/GFO.ini b/Data/Sys/GameSettings/GFO.ini
diff --git a/Data/Sys/GameSettings/GFP.ini b/Data/Sys/GameSettings/GFP.ini
diff --git a/Data/Sys/GameSettings/GFQ.ini b/Data/Sys/GameSettings/GFQ.ini
diff --git a/Data/Sys/GameSettings/GFT.ini b/Data/Sys/GameSettings/GFT.ini
diff --git a/Data/Sys/GameSettings/GFU.ini b/Data/Sys/GameSettings/GFU.ini
diff --git a/Data/Sys/GameSettings/GFX.ini b/Data/Sys/GameSettings/GFX.ini
diff --git a/Data/Sys/GameSettings/GFY.ini b/Data/Sys/GameSettings/GFY.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFZ.ini b/Data/Sys/GameSettings/GFZ.ini
@@ -6,11 +6,6 @@
 FPRF = True
 SyncGPU = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Synchronize GPU thread for stability.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GFZJ8P.ini b/Data/Sys/GameSettings/GFZJ8P.ini
@@ -5,11 +5,6 @@
 # Values set here will override the main Dolphin settings.
 FPRF = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = Crashes on startup (Triforce game)
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GG4.ini b/Data/Sys/GameSettings/GG4.ini
diff --git a/Data/Sys/GameSettings/GG4P08.ini b/Data/Sys/GameSettings/GG4P08.ini
diff --git a/Data/Sys/GameSettings/GG5.ini b/Data/Sys/GameSettings/GG5.ini
diff --git a/Data/Sys/GameSettings/GGA.ini b/Data/Sys/GameSettings/GGA.ini
diff --git a/Data/Sys/GameSettings/GGC.ini b/Data/Sys/GameSettings/GGC.ini
diff --git a/Data/Sys/GameSettings/GGCOSD.ini b/Data/Sys/GameSettings/GGCOSD.ini
diff --git a/Data/Sys/GameSettings/GGE.ini b/Data/Sys/GameSettings/GGE.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GGM.ini b/Data/Sys/GameSettings/GGM.ini
diff --git a/Data/Sys/GameSettings/GGN.ini b/Data/Sys/GameSettings/GGN.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GGP.ini b/Data/Sys/GameSettings/GGP.ini
diff --git a/Data/Sys/GameSettings/GGPE01.ini b/Data/Sys/GameSettings/GGPE01.ini
diff --git a/Data/Sys/GameSettings/GGPE02.ini b/Data/Sys/GameSettings/GGPE02.ini
diff --git a/Data/Sys/GameSettings/GGR.ini b/Data/Sys/GameSettings/GGR.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Graphic glitches.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GGS.ini b/Data/Sys/GameSettings/GGS.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GGT.ini b/Data/Sys/GameSettings/GGT.ini
diff --git a/Data/Sys/GameSettings/GGV.ini b/Data/Sys/GameSettings/GGV.ini
@@ -1,8 +1,5 @@
 # GGVD78, GGVE78, GGVP78, GGVX78 - The SpongeBob SquarePants Movie
 [Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]

diff --git a/Data/Sys/GameSettings/GGY.ini b/Data/Sys/GameSettings/GGY.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GGZ.ini b/Data/Sys/GameSettings/GGZ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = GFX glitches.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GH2.ini b/Data/Sys/GameSettings/GH2.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = The game is slow.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GH4.ini b/Data/Sys/GameSettings/GH4.ini
diff --git a/Data/Sys/GameSettings/GH5.ini b/Data/Sys/GameSettings/GH5.ini
diff --git a/Data/Sys/GameSettings/GH6.ini b/Data/Sys/GameSettings/GH6.ini
diff --git a/Data/Sys/GameSettings/GH7.ini b/Data/Sys/GameSettings/GH7.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GH9.ini b/Data/Sys/GameSettings/GH9.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MMU = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHA.ini b/Data/Sys/GameSettings/GHA.ini
diff --git a/Data/Sys/GameSettings/GHB.ini b/Data/Sys/GameSettings/GHB.ini
diff --git a/Data/Sys/GameSettings/GHC.ini b/Data/Sys/GameSettings/GHC.ini
diff --git a/Data/Sys/GameSettings/GHG.ini b/Data/Sys/GameSettings/GHG.ini
diff --git a/Data/Sys/GameSettings/GHK.ini b/Data/Sys/GameSettings/GHK.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 SyncOnSkipIdle = False
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHL.ini b/Data/Sys/GameSettings/GHL.ini
diff --git a/Data/Sys/GameSettings/GHM.ini b/Data/Sys/GameSettings/GHM.ini
diff --git a/Data/Sys/GameSettings/GHN.ini b/Data/Sys/GameSettings/GHN.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHQ.ini b/Data/Sys/GameSettings/GHQ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHR.ini b/Data/Sys/GameSettings/GHR.ini
@@ -3,10 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHS.ini b/Data/Sys/GameSettings/GHS.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHU.ini b/Data/Sys/GameSettings/GHU.ini
diff --git a/Data/Sys/GameSettings/GHV.ini b/Data/Sys/GameSettings/GHV.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHW.ini b/Data/Sys/GameSettings/GHW.ini
diff --git a/Data/Sys/GameSettings/GHY.ini b/Data/Sys/GameSettings/GHY.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GHZ.ini b/Data/Sys/GameSettings/GHZ.ini
diff --git a/Data/Sys/GameSettings/GIA.ini b/Data/Sys/GameSettings/GIA.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GIB.ini b/Data/Sys/GameSettings/GIB.ini
diff --git a/Data/Sys/GameSettings/GIC.ini b/Data/Sys/GameSettings/GIC.ini
@@ -3,10 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GIG.ini b/Data/Sys/GameSettings/GIG.ini
diff --git a/Data/Sys/GameSettings/GIK.ini b/Data/Sys/GameSettings/GIK.ini
diff --git a/Data/Sys/GameSettings/GIL.ini b/Data/Sys/GameSettings/GIL.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GIN.ini b/Data/Sys/GameSettings/GIN.ini
diff --git a/Data/Sys/GameSettings/GIP.ini b/Data/Sys/GameSettings/GIP.ini
diff --git a/Data/Sys/GameSettings/GIQ.ini b/Data/Sys/GameSettings/GIQ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GIS.ini b/Data/Sys/GameSettings/GIS.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MMU = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GIT.ini b/Data/Sys/GameSettings/GIT.ini
diff --git a/Data/Sys/GameSettings/GIV.ini b/Data/Sys/GameSettings/GIV.ini
diff --git a/Data/Sys/GameSettings/GIZ.ini b/Data/Sys/GameSettings/GIZ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GJ3.ini b/Data/Sys/GameSettings/GJ3.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Need a Projection Hack Bloom and Safe Texture cache
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GJB.ini b/Data/Sys/GameSettings/GJB.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues = Graphic glitches / unstable during videos.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GJC.ini b/Data/Sys/GameSettings/GJC.ini
diff --git a/Data/Sys/GameSettings/GJD.ini b/Data/Sys/GameSettings/GJD.ini
diff --git a/Data/Sys/GameSettings/GJK.ini b/Data/Sys/GameSettings/GJK.ini
@@ -3,10 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GJN.ini b/Data/Sys/GameSettings/GJN.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GJS.ini b/Data/Sys/GameSettings/GJS.ini
diff --git a/Data/Sys/GameSettings/GJU.ini b/Data/Sys/GameSettings/GJU.ini
diff --git a/Data/Sys/GameSettings/GJW.ini b/Data/Sys/GameSettings/GJW.ini
diff --git a/Data/Sys/GameSettings/GJX.ini b/Data/Sys/GameSettings/GJX.ini
diff --git a/Data/Sys/GameSettings/GJZ.ini b/Data/Sys/GameSettings/GJZ.ini
diff --git a/Data/Sys/GameSettings/GK2.ini b/Data/Sys/GameSettings/GK2.ini
@@ -3,10 +3,6 @@
 [Core]
 MMU = 1
 
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnFrame]
 
 [ActionReplay]

diff --git a/Data/Sys/GameSettings/GK4.ini b/Data/Sys/GameSettings/GK4.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GK5.ini b/Data/Sys/GameSettings/GK5.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GK6.ini b/Data/Sys/GameSettings/GK6.ini
diff --git a/Data/Sys/GameSettings/GK7.ini b/Data/Sys/GameSettings/GK7.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GK9.ini b/Data/Sys/GameSettings/GK9.ini
diff --git a/Data/Sys/GameSettings/GKA.ini b/Data/Sys/GameSettings/GKA.ini
diff --git a/Data/Sys/GameSettings/GKB.ini b/Data/Sys/GameSettings/GKB.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 CPUThread = 0
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKD.ini b/Data/Sys/GameSettings/GKD.ini
diff --git a/Data/Sys/GameSettings/GKF.ini b/Data/Sys/GameSettings/GKF.ini
diff --git a/Data/Sys/GameSettings/GKG.ini b/Data/Sys/GameSettings/GKG.ini
diff --git a/Data/Sys/GameSettings/GKH.ini b/Data/Sys/GameSettings/GKH.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKJ.ini b/Data/Sys/GameSettings/GKJ.ini
diff --git a/Data/Sys/GameSettings/GKK.ini b/Data/Sys/GameSettings/GKK.ini
diff --git a/Data/Sys/GameSettings/GKL.ini b/Data/Sys/GameSettings/GKL.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKM.ini b/Data/Sys/GameSettings/GKM.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKN.ini b/Data/Sys/GameSettings/GKN.ini
diff --git a/Data/Sys/GameSettings/GKO.ini b/Data/Sys/GameSettings/GKO.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKQ.ini b/Data/Sys/GameSettings/GKQ.ini
diff --git a/Data/Sys/GameSettings/GKS.ini b/Data/Sys/GameSettings/GKS.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKT.ini b/Data/Sys/GameSettings/GKT.ini
diff --git a/Data/Sys/GameSettings/GKU.ini b/Data/Sys/GameSettings/GKU.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKY.ini b/Data/Sys/GameSettings/GKY.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 5
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GKZ.ini b/Data/Sys/GameSettings/GKZ.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GL5.ini b/Data/Sys/GameSettings/GL5.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Slow
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GL7.ini b/Data/Sys/GameSettings/GL7.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GL8.ini b/Data/Sys/GameSettings/GL8.ini
diff --git a/Data/Sys/GameSettings/GLB.ini b/Data/Sys/GameSettings/GLB.ini
diff --git a/Data/Sys/GameSettings/GLC.ini b/Data/Sys/GameSettings/GLC.ini
@@ -5,11 +5,6 @@
 CPUThread = 1
 SkipIdle = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Still encountering slowdowns, but no major issues so far.
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GLE.ini b/Data/Sys/GameSettings/GLE.ini
diff --git a/Data/Sys/GameSettings/GLG.ini b/Data/Sys/GameSettings/GLG.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GLL.ini b/Data/Sys/GameSettings/GLL.ini
diff --git a/Data/Sys/GameSettings/GLM.ini b/Data/Sys/GameSettings/GLM.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GLN.ini b/Data/Sys/GameSettings/GLN.ini
diff --git a/Data/Sys/GameSettings/GLO.ini b/Data/Sys/GameSettings/GLO.ini
diff --git a/Data/Sys/GameSettings/GLQ.ini b/Data/Sys/GameSettings/GLQ.ini
diff --git a/Data/Sys/GameSettings/GLR.ini b/Data/Sys/GameSettings/GLR.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MMU = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GLS.ini b/Data/Sys/GameSettings/GLS.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 SyncGPU = 1
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GLU.ini b/Data/Sys/GameSettings/GLU.ini
diff --git a/Data/Sys/GameSettings/GLW.ini b/Data/Sys/GameSettings/GLW.ini
diff --git a/Data/Sys/GameSettings/GLY.ini b/Data/Sys/GameSettings/GLY.ini
diff --git a/Data/Sys/GameSettings/GLZ.ini b/Data/Sys/GameSettings/GLZ.ini
diff --git a/Data/Sys/GameSettings/GM2.ini b/Data/Sys/GameSettings/GM2.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 FPRF = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Shadows need fast depth enabled.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GM3.ini b/Data/Sys/GameSettings/GM3.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GM4.ini b/Data/Sys/GameSettings/GM4.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GM5.ini b/Data/Sys/GameSettings/GM5.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GM6.ini b/Data/Sys/GameSettings/GM6.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GM8.ini b/Data/Sys/GameSettings/GM8.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMB.ini b/Data/Sys/GameSettings/GMB.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 FPRF = True
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMD.ini b/Data/Sys/GameSettings/GMD.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
-EmulationStateId = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMF.ini b/Data/Sys/GameSettings/GMF.ini
diff --git a/Data/Sys/GameSettings/GMH.ini b/Data/Sys/GameSettings/GMH.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMI.ini b/Data/Sys/GameSettings/GMI.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMK.ini b/Data/Sys/GameSettings/GMK.ini
diff --git a/Data/Sys/GameSettings/GML.ini b/Data/Sys/GameSettings/GML.ini
diff --git a/Data/Sys/GameSettings/GMN.ini b/Data/Sys/GameSettings/GMN.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMP.ini b/Data/Sys/GameSettings/GMP.ini
diff --git a/Data/Sys/GameSettings/GMS.ini b/Data/Sys/GameSettings/GMS.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Needs Store EFB Copies to Texture Only disabled and Force Texture Filtering disabled for the goo. Needs Skip EFB Access from CPU disabled for making the analog stick not act as if Mario constantly is behind a tree. Needs anti-aliasing disabled for both, unless using Direct3D 12.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GMT.ini b/Data/Sys/GameSettings/GMT.ini
diff --git a/Data/Sys/GameSettings/GMU.ini b/Data/Sys/GameSettings/GMU.ini
diff --git a/Data/Sys/GameSettings/GMX.ini b/Data/Sys/GameSettings/GMX.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GN4.ini b/Data/Sys/GameSettings/GN4.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = 
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GN5.ini b/Data/Sys/GameSettings/GN5.ini
diff --git a/Data/Sys/GameSettings/GN6.ini b/Data/Sys/GameSettings/GN6.ini
diff --git a/Data/Sys/GameSettings/GN7.ini b/Data/Sys/GameSettings/GN7.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GN8.ini b/Data/Sys/GameSettings/GN8.ini
diff --git a/Data/Sys/GameSettings/GNC.ini b/Data/Sys/GameSettings/GNC.ini
@@ -3,11 +3,6 @@
 [Core]
 # Values set here will override the main Dolphin settings.
 
-[EmuState]
-# The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.