diff --git a/Data/Sys/GameSettings/GND.ini b/Data/Sys/GameSettings/GND.ini
diff --git a/Data/Sys/GameSettings/GNE.ini b/Data/Sys/GameSettings/GNE.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/GNH.ini b/Data/Sys/GameSettings/GNH.ini
diff --git a/Data/Sys/GameSettings/GNI.ini b/Data/Sys/GameSettings/GNI.ini
diff --git a/Data/Sys/GameSettings/GNJ.ini b/Data/Sys/GameSettings/GNJ.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/GNL.ini b/Data/Sys/GameSettings/GNL.ini
diff --git a/Data/Sys/GameSettings/GNM.ini b/Data/Sys/GameSettings/GNM.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/GNN.ini b/Data/Sys/GameSettings/GNN.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/GNO.ini b/Data/Sys/GameSettings/GNO.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/GNQ.ini b/Data/Sys/GameSettings/GNQ.ini
diff --git a/Data/Sys/GameSettings/GNR.ini b/Data/Sys/GameSettings/GNR.ini
diff --git a/Data/Sys/GameSettings/GNU.ini b/Data/Sys/GameSettings/GNU.ini
diff --git a/Data/Sys/GameSettings/GNW.ini b/Data/Sys/GameSettings/GNW.ini
diff --git a/Data/Sys/GameSettings/GNZ.ini b/Data/Sys/GameSettings/GNZ.ini
diff --git a/Data/Sys/GameSettings/GO2.ini b/Data/Sys/GameSettings/GO2.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/GO7.ini b/Data/Sys/GameSettings/GO7.ini
diff --git a/Data/Sys/GameSettings/GOA.ini b/Data/Sys/GameSettings/GOA.ini
diff --git a/Data/Sys/GameSettings/GOB.ini b/Data/Sys/GameSettings/GOB.ini
diff --git a/Data/Sys/GameSettings/GOC.ini b/Data/Sys/GameSettings/GOC.ini
diff --git a/Data/Sys/GameSettings/GOG.ini b/Data/Sys/GameSettings/GOG.ini
diff --git a/Data/Sys/GameSettings/GOM.ini b/Data/Sys/GameSettings/GOM.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 = STC is needed for the goo in the Delfino Plaza court.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GON.ini b/Data/Sys/GameSettings/GON.ini
diff --git a/Data/Sys/GameSettings/GOO.ini b/Data/Sys/GameSettings/GOO.ini
diff --git a/Data/Sys/GameSettings/GOP.ini b/Data/Sys/GameSettings/GOP.ini
diff --git a/Data/Sys/GameSettings/GOQ.ini b/Data/Sys/GameSettings/GOQ.ini
diff --git a/Data/Sys/GameSettings/GOS.ini b/Data/Sys/GameSettings/GOS.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/GOW.ini b/Data/Sys/GameSettings/GOW.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/GOY.ini b/Data/Sys/GameSettings/GOY.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/GP2.ini b/Data/Sys/GameSettings/GP2.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/GP4.ini b/Data/Sys/GameSettings/GP4.ini
diff --git a/Data/Sys/GameSettings/GP5.ini b/Data/Sys/GameSettings/GP5.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/GP6.ini b/Data/Sys/GameSettings/GP6.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 = Mini games tour bus needs emulate format changes to preview the mini games.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GP7.ini b/Data/Sys/GameSettings/GP7.ini
diff --git a/Data/Sys/GameSettings/GP8.ini b/Data/Sys/GameSettings/GP8.ini
diff --git a/Data/Sys/GameSettings/GPA.ini b/Data/Sys/GameSettings/GPA.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 Efb to Ram for painting.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GPD.ini b/Data/Sys/GameSettings/GPD.ini
diff --git a/Data/Sys/GameSettings/GPE.ini b/Data/Sys/GameSettings/GPE.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/GPH.ini b/Data/Sys/GameSettings/GPH.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/GPI.ini b/Data/Sys/GameSettings/GPI.ini
diff --git a/Data/Sys/GameSettings/GPK.ini b/Data/Sys/GameSettings/GPK.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/GPN.ini b/Data/Sys/GameSettings/GPN.ini
diff --git a/Data/Sys/GameSettings/GPO.ini b/Data/Sys/GameSettings/GPO.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/GPS.ini b/Data/Sys/GameSettings/GPS.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 = D3D11 has issues.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GPT.ini b/Data/Sys/GameSettings/GPT.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/GPV.ini b/Data/Sys/GameSettings/GPV.ini
diff --git a/Data/Sys/GameSettings/GPX.ini b/Data/Sys/GameSettings/GPX.ini
diff --git a/Data/Sys/GameSettings/GPZ.ini b/Data/Sys/GameSettings/GPZ.ini
diff --git a/Data/Sys/GameSettings/GQ8.ini b/Data/Sys/GameSettings/GQ8.ini
diff --git a/Data/Sys/GameSettings/GQC.ini b/Data/Sys/GameSettings/GQC.ini
@@ -2,10 +2,6 @@
 [Core]
 # 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 = Slow because it needs mmu to run.
-EmulationStateId = 4
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 [OnFrame]

diff --git a/Data/Sys/GameSettings/GQL.ini b/Data/Sys/GameSettings/GQL.ini
diff --git a/Data/Sys/GameSettings/GQN.ini b/Data/Sys/GameSettings/GQN.ini
diff --git a/Data/Sys/GameSettings/GQQ.ini b/Data/Sys/GameSettings/GQQ.ini
diff --git a/Data/Sys/GameSettings/GQS.ini b/Data/Sys/GameSettings/GQS.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/GQT.ini b/Data/Sys/GameSettings/GQT.ini
diff --git a/Data/Sys/GameSettings/GQW.ini b/Data/Sys/GameSettings/GQW.ini
diff --git a/Data/Sys/GameSettings/GQX.ini b/Data/Sys/GameSettings/GQX.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/GR2.ini b/Data/Sys/GameSettings/GR2.ini
diff --git a/Data/Sys/GameSettings/GR6.ini b/Data/Sys/GameSettings/GR6.ini
diff --git a/Data/Sys/GameSettings/GR8.ini b/Data/Sys/GameSettings/GR8.ini
diff --git a/Data/Sys/GameSettings/GRA.ini b/Data/Sys/GameSettings/GRA.ini
diff --git a/Data/Sys/GameSettings/GRB.ini b/Data/Sys/GameSettings/GRB.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/GRE.ini b/Data/Sys/GameSettings/GRE.ini
diff --git a/Data/Sys/GameSettings/GRF.ini b/Data/Sys/GameSettings/GRF.ini
diff --git a/Data/Sys/GameSettings/GRH.ini b/Data/Sys/GameSettings/GRH.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/GRJ.ini b/Data/Sys/GameSettings/GRJ.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 = Efb to Ram is needed for video cutscenes.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GRK.ini b/Data/Sys/GameSettings/GRK.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/GRL.ini b/Data/Sys/GameSettings/GRL.ini
diff --git a/Data/Sys/GameSettings/GRN.ini b/Data/Sys/GameSettings/GRN.ini
diff --git a/Data/Sys/GameSettings/GRO.ini b/Data/Sys/GameSettings/GRO.ini
diff --git a/Data/Sys/GameSettings/GRQ.ini b/Data/Sys/GameSettings/GRQ.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/GRS.ini b/Data/Sys/GameSettings/GRS.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/GRU.ini b/Data/Sys/GameSettings/GRU.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/GRV.ini b/Data/Sys/GameSettings/GRV.ini
diff --git a/Data/Sys/GameSettings/GRY.ini b/Data/Sys/GameSettings/GRY.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/GS2.ini b/Data/Sys/GameSettings/GS2.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/GS8.ini b/Data/Sys/GameSettings/GS8.ini
diff --git a/Data/Sys/GameSettings/GSA.ini b/Data/Sys/GameSettings/GSA.ini
diff --git a/Data/Sys/GameSettings/GSB.ini b/Data/Sys/GameSettings/GSB.ini
diff --git a/Data/Sys/GameSettings/GSC.ini b/Data/Sys/GameSettings/GSC.ini
diff --git a/Data/Sys/GameSettings/GSE.ini b/Data/Sys/GameSettings/GSE.ini
diff --git a/Data/Sys/GameSettings/GSM.ini b/Data/Sys/GameSettings/GSM.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/GSN.ini b/Data/Sys/GameSettings/GSN.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 CPUThread = False
 
-[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/GSO.ini b/Data/Sys/GameSettings/GSO.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/GSP.ini b/Data/Sys/GameSettings/GSP.ini
diff --git a/Data/Sys/GameSettings/GSQ.ini b/Data/Sys/GameSettings/GSQ.ini
@@ -1,8 +1,5 @@
 # GSQE78, GSQP78 - SpongeBob SquarePants ROTFD
 [Core]
-[EmuState]
-EmulationStateId = 3
-EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Gecko]

diff --git a/Data/Sys/GameSettings/GSR.ini b/Data/Sys/GameSettings/GSR.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/GSS.ini b/Data/Sys/GameSettings/GSS.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 = 5
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GST.ini b/Data/Sys/GameSettings/GST.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 = 3
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GSW.ini b/Data/Sys/GameSettings/GSW.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/GSX.ini b/Data/Sys/GameSettings/GSX.ini
@@ -4,10 +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
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GSZ.ini b/Data/Sys/GameSettings/GSZ.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/GT3.ini b/Data/Sys/GameSettings/GT3.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/GT4.ini b/Data/Sys/GameSettings/GT4.ini
diff --git a/Data/Sys/GameSettings/GT6.ini b/Data/Sys/GameSettings/GT6.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/GT7.ini b/Data/Sys/GameSettings/GT7.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/GT8.ini b/Data/Sys/GameSettings/GT8.ini
diff --git a/Data/Sys/GameSettings/GTC.ini b/Data/Sys/GameSettings/GTC.ini
diff --git a/Data/Sys/GameSettings/GTE.ini b/Data/Sys/GameSettings/GTE.ini
diff --git a/Data/Sys/GameSettings/GTF.ini b/Data/Sys/GameSettings/GTF.ini
diff --git a/Data/Sys/GameSettings/GTK.ini b/Data/Sys/GameSettings/GTK.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/GTL.ini b/Data/Sys/GameSettings/GTL.ini
diff --git a/Data/Sys/GameSettings/GTO.ini b/Data/Sys/GameSettings/GTO.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/GTR.ini b/Data/Sys/GameSettings/GTR.ini
@@ -1,8 +1,5 @@
 # GTRE78, GTRP78 - Tetris Worlds
 [Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues =
 [OnFrame]
 [ActionReplay]
 [Video_Settings]

diff --git a/Data/Sys/GameSettings/GTS.ini b/Data/Sys/GameSettings/GTS.ini
diff --git a/Data/Sys/GameSettings/GTU.ini b/Data/Sys/GameSettings/GTU.ini
diff --git a/Data/Sys/GameSettings/GTW.ini b/Data/Sys/GameSettings/GTW.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/GTY.ini b/Data/Sys/GameSettings/GTY.ini
diff --git a/Data/Sys/GameSettings/GTZ.ini b/Data/Sys/GameSettings/GTZ.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/GUB.ini b/Data/Sys/GameSettings/GUB.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/GUC.ini b/Data/Sys/GameSettings/GUC.ini
diff --git a/Data/Sys/GameSettings/GUF.ini b/Data/Sys/GameSettings/GUF.ini
diff --git a/Data/Sys/GameSettings/GUG.ini b/Data/Sys/GameSettings/GUG.ini
diff --git a/Data/Sys/GameSettings/GUM.ini b/Data/Sys/GameSettings/GUM.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/GUN.ini b/Data/Sys/GameSettings/GUN.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 = Needs safe texture cache for videos.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GUP.ini b/Data/Sys/GameSettings/GUP.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 = 2P mode is playable only with EFB to RAM.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GUT.ini b/Data/Sys/GameSettings/GUT.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/GUV.ini b/Data/Sys/GameSettings/GUV.ini
diff --git a/Data/Sys/GameSettings/GUZ.ini b/Data/Sys/GameSettings/GUZ.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/GV3.ini b/Data/Sys/GameSettings/GV3.ini
diff --git a/Data/Sys/GameSettings/GV4.ini b/Data/Sys/GameSettings/GV4.ini
diff --git a/Data/Sys/GameSettings/GVC.ini b/Data/Sys/GameSettings/GVC.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/GVD.ini b/Data/Sys/GameSettings/GVD.ini
diff --git a/Data/Sys/GameSettings/GVH.ini b/Data/Sys/GameSettings/GVH.ini
diff --git a/Data/Sys/GameSettings/GVJ.ini b/Data/Sys/GameSettings/GVJ.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/GVK.ini b/Data/Sys/GameSettings/GVK.ini
diff --git a/Data/Sys/GameSettings/GVL.ini b/Data/Sys/GameSettings/GVL.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/GVO.ini b/Data/Sys/GameSettings/GVO.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/GVR.ini b/Data/Sys/GameSettings/GVR.ini
diff --git a/Data/Sys/GameSettings/GVS.ini b/Data/Sys/GameSettings/GVS.ini
@@ -4,10 +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
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.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/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.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/GW2.ini b/Data/Sys/GameSettings/GW2.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 Efb to Ram for created fighters.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GW3.ini b/Data/Sys/GameSettings/GW3.ini
diff --git a/Data/Sys/GameSettings/GW5.ini b/Data/Sys/GameSettings/GW5.ini
diff --git a/Data/Sys/GameSettings/GW7.ini b/Data/Sys/GameSettings/GW7.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 real xfb for the video cutscenes to display.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GW8.ini b/Data/Sys/GameSettings/GW8.ini
diff --git a/Data/Sys/GameSettings/GW9.ini b/Data/Sys/GameSettings/GW9.ini
diff --git a/Data/Sys/GameSettings/GWA.ini b/Data/Sys/GameSettings/GWA.ini
diff --git a/Data/Sys/GameSettings/GWB.ini b/Data/Sys/GameSettings/GWB.ini
diff --git a/Data/Sys/GameSettings/GWE.ini b/Data/Sys/GameSettings/GWE.ini
diff --git a/Data/Sys/GameSettings/GWG.ini b/Data/Sys/GameSettings/GWG.ini
diff --git a/Data/Sys/GameSettings/GWJ.ini b/Data/Sys/GameSettings/GWJ.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/GWK.ini b/Data/Sys/GameSettings/GWK.ini
diff --git a/Data/Sys/GameSettings/GWL.ini b/Data/Sys/GameSettings/GWL.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MemoryCard251 = 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/GWM.ini b/Data/Sys/GameSettings/GWM.ini
diff --git a/Data/Sys/GameSettings/GWO.ini b/Data/Sys/GameSettings/GWO.ini
diff --git a/Data/Sys/GameSettings/GWP.ini b/Data/Sys/GameSettings/GWP.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 Efb to Ram for created fighters.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GWQ.ini b/Data/Sys/GameSettings/GWQ.ini
diff --git a/Data/Sys/GameSettings/GWR.ini b/Data/Sys/GameSettings/GWR.ini
diff --git a/Data/Sys/GameSettings/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.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/GWS.ini b/Data/Sys/GameSettings/GWS.ini
diff --git a/Data/Sys/GameSettings/GWT.ini b/Data/Sys/GameSettings/GWT.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 = 4
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GWV.ini b/Data/Sys/GameSettings/GWV.ini
diff --git a/Data/Sys/GameSettings/GWW.ini b/Data/Sys/GameSettings/GWW.ini
diff --git a/Data/Sys/GameSettings/GWY.ini b/Data/Sys/GameSettings/GWY.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 = Videos require real XFB.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

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

diff --git a/Data/Sys/GameSettings/GXB.ini b/Data/Sys/GameSettings/GXB.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/GXC.ini b/Data/Sys/GameSettings/GXC.ini
diff --git a/Data/Sys/GameSettings/GXE.ini b/Data/Sys/GameSettings/GXE.ini
diff --git a/Data/Sys/GameSettings/GXF.ini b/Data/Sys/GameSettings/GXF.ini
diff --git a/Data/Sys/GameSettings/GXG.ini b/Data/Sys/GameSettings/GXG.ini
@@ -1,10 +1,6 @@
 # GXGE08 - MEGAMAN X COLLECTION
 [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.
 [OnFrame]

diff --git a/Data/Sys/GameSettings/GXL.ini b/Data/Sys/GameSettings/GXL.ini
diff --git a/Data/Sys/GameSettings/GXM.ini b/Data/Sys/GameSettings/GXM.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/GXN.ini b/Data/Sys/GameSettings/GXN.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/GXO.ini b/Data/Sys/GameSettings/GXO.ini
diff --git a/Data/Sys/GameSettings/GXR.ini b/Data/Sys/GameSettings/GXR.ini
diff --git a/Data/Sys/GameSettings/GXS.ini b/Data/Sys/GameSettings/GXS.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/GXU.ini b/Data/Sys/GameSettings/GXU.ini
@@ -4,11 +4,6 @@
 # Values set here will override the main Dolphin settings.
 MMU = True
 
-[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/GXX.ini b/Data/Sys/GameSettings/GXX.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 = 4
-EmulationIssues =
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GY2.ini b/Data/Sys/GameSettings/GY2.ini
diff --git a/Data/Sys/GameSettings/GYA.ini b/Data/Sys/GameSettings/GYA.ini
diff --git a/Data/Sys/GameSettings/GYB.ini b/Data/Sys/GameSettings/GYB.ini
diff --git a/Data/Sys/GameSettings/GYF.ini b/Data/Sys/GameSettings/GYF.ini
diff --git a/Data/Sys/GameSettings/GYK.ini b/Data/Sys/GameSettings/GYK.ini
diff --git a/Data/Sys/GameSettings/GYQ.ini b/Data/Sys/GameSettings/GYQ.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/GYR.ini b/Data/Sys/GameSettings/GYR.ini
diff --git a/Data/Sys/GameSettings/GYT.ini b/Data/Sys/GameSettings/GYT.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/GYW.ini b/Data/Sys/GameSettings/GYW.ini
diff --git a/Data/Sys/GameSettings/GZ2.ini b/Data/Sys/GameSettings/GZ2.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/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini
@@ -1,8 +1,5 @@
 # GZ2E01 - The Legend of Zelda: Twilight Princess [GC]
 
-[EmuState]
-EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini
@@ -1,8 +1,5 @@
 # GZ2J01 - The Legend of Zelda: Twilight Princess [GC]
 
-[EmuState]
-EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini
@@ -1,8 +1,5 @@
 # GZ2P01 - The Legend of Zelda: Twilight Princess [GC]
 
-[EmuState]
-EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
-
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
 

diff --git a/Data/Sys/GameSettings/GZ3.ini b/Data/Sys/GameSettings/GZ3.ini
diff --git a/Data/Sys/GameSettings/GZD.ini b/Data/Sys/GameSettings/GZD.ini
@@ -1,8 +1,5 @@
 # GZDE70, GZDJ70, GZDP70 - Godzilla
 [Core]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 [Gecko]

diff --git a/Data/Sys/GameSettings/GZE.ini b/Data/Sys/GameSettings/GZE.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/GZL.ini b/Data/Sys/GameSettings/GZL.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/GZM.ini b/Data/Sys/GameSettings/GZM.ini