diff --git a/FBYE01.ini b/FBYE01.ini
index e2fd280d27..d063d693df 100644
--- a/FBYE01.ini
+++ b/FBYE01.ini
@@ -4,5 +4,4 @@
 EmulationStateId = 3
 EmulationIssues = Can't see graphics
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
\ No newline at end of file
+[ActionReplay] Add action replay cheats here.
\ No newline at end of file
diff --git a/G2MP01.ini b/G2MP01.ini
index ca94aac829..8a6e781915 100644
--- a/G2MP01.ini
+++ b/G2MP01.ini
@@ -9,7 +9,7 @@ Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 [ActionReplay]
 [EmuState]
 EmulationStateId = 4
-EmulationIssues = needs safe texture cache and EFB to Ram
+EmulationIssues = needs EFB to Ram
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -18,9 +18,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
diff --git a/G2OE41.ini b/G2OE41.ini
index 38829382ef..920a6da175 100644
--- a/G2OE41.ini
+++ b/G2OE41.ini
@@ -14,7 +14,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/G2OP41.ini b/G2OP41.ini
index e2afb7c0bd..2e0308f65f 100644
--- a/G2OP41.ini
+++ b/G2OP41.ini
@@ -9,5 +9,3 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/G3AD69.ini b/G3AD69.ini
index 01fbb79385..a9770ea9fb 100644
--- a/G3AD69.ini
+++ b/G3AD69.ini
@@ -14,5 +14,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/G3AE69.ini b/G3AE69.ini
index 50fa7af370..c736274351 100644
--- a/G3AE69.ini
+++ b/G3AE69.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/G3AF69.ini b/G3AF69.ini
index 6096a11729..e907d623a3 100644
--- a/G3AF69.ini
+++ b/G3AF69.ini
@@ -13,6 +13,4 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/G3AP69.ini b/G3AP69.ini
index 5956160dcb..bfc515250f 100644
--- a/G3AP69.ini
+++ b/G3AP69.ini
@@ -14,5 +14,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/G3FE69.ini b/G3FE69.ini
index 09a9c6dc81..6be102c85f 100644
--- a/G3FE69.ini
+++ b/G3FE69.ini
@@ -17,8 +17,5 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/G3FF69.ini b/G3FF69.ini
index 74e01bc005..83bb99085d 100644
--- a/G3FF69.ini
+++ b/G3FF69.ini
@@ -17,8 +17,5 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/G3FP69.ini b/G3FP69.ini
index cdb7e8478a..a69c0e178c 100644
--- a/G3FP69.ini
+++ b/G3FP69.ini
@@ -17,8 +17,5 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/G3XE52.ini b/G3XE52.ini
index ad8d6a7476..f925036f54 100644
--- a/G3XE52.ini
+++ b/G3XE52.ini
@@ -14,7 +14,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/G3XP52.ini b/G3XP52.ini
index e9b35a34c8..93243c770d 100644
--- a/G3XP52.ini
+++ b/G3XP52.ini
@@ -8,6 +8,4 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/G4ME69.ini b/G4ME69.ini
index f082c8ca0d..babfa98df1 100644
--- a/G4ME69.ini
+++ b/G4ME69.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/G4MP69.ini b/G4MP69.ini
index a97f19579e..84d5fa8ca8 100644
--- a/G4MP69.ini
+++ b/G4MP69.ini
@@ -14,5 +14,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/G4QP01.ini b/G4QP01.ini
index a78c574d22..69c9b75bbc 100644
--- a/G4QP01.ini
+++ b/G4QP01.ini
@@ -1,5 +1,5 @@
 # G4QP01 - Mario Smash Football
-
+[Core] Values set here will override the main dolphin settings.
 [EmuState]
 #The Emulation State.
 EmulationStateId = 5
diff --git a/G4SE01.ini b/G4SE01.ini
index a0ce7ade1e..18b82dee6b 100644
--- a/G4SE01.ini
+++ b/G4SE01.ini
@@ -13,7 +13,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/G4SP01.ini b/G4SP01.ini
index c6ac41749c..44b98a823a 100644
--- a/G4SP01.ini
+++ b/G4SP01.ini
@@ -104,5 +104,3 @@ $Have Power Bracelet
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/G6TE5G.ini b/G6TE5G.ini
index 90f14427ed..2b7b10225e 100644
--- a/G6TE5G.ini
+++ b/G6TE5G.ini
@@ -14,6 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+
diff --git a/G6TP5G.ini b/G6TP5G.ini
index 6f32916865..5483eebd17 100644
--- a/G6TP5G.ini
+++ b/G6TP5G.ini
@@ -14,5 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/G8WP01.ini b/G8WP01.ini
index afe5bd513d..1fffe31938 100644
--- a/G8WP01.ini
+++ b/G8WP01.ini
@@ -13,5 +13,4 @@ $Invincible
 0752E977 08000000
 04338650 00000001
 $Infinite Time
-0752E978 08000000
-[Video]
\ No newline at end of file
+0752E978 08000000
\ No newline at end of file
diff --git a/G9SE8P.ini b/G9SE8P.ini
index 94e91c3c37..e167be725e 100644
--- a/G9SE8P.ini
+++ b/G9SE8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,7 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 EFBScale = 2
 
diff --git a/G9SJ8P.ini b/G9SJ8P.ini
index 2eb543f7e8..298badced7 100644
--- a/G9SJ8P.ini
+++ b/G9SJ8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 EFBScale = 2
\ No newline at end of file
diff --git a/G9SP8P.ini b/G9SP8P.ini
index db14e49d3e..c99e4e9c98 100644
--- a/G9SP8P.ini
+++ b/G9SP8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 EFBScale = 2
\ No newline at end of file
diff --git a/GAFE01.ini b/GAFE01.ini
index 7c4daea517..055b9440e9 100644
--- a/GAFE01.ini
+++ b/GAFE01.ini
@@ -316,8 +316,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/GAFJ01.ini b/GAFJ01.ini
index 148a5ef15a..0027141eb6 100644
--- a/GAFJ01.ini
+++ b/GAFJ01.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/GAFP01.ini b/GAFP01.ini
index 6a4effbf39..1930b4db5f 100644
--- a/GAFP01.ini
+++ b/GAFP01.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/GAFU01.ini b/GAFU01.ini
index 8d81be9e8b..3ff5938f61 100644
--- a/GAFU01.ini
+++ b/GAFU01.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/GAUE08.ini b/GAUE08.ini
index 86c546a939..324e495f04 100644
--- a/GAUE08.ini
+++ b/GAUE08.ini
@@ -2,9 +2,8 @@
 [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 = Use Real XFB and Safe texture cache
+EmulationIssues = Use Real XFB
 [OnFrame] Add memory patches to be applied every frame here.
-[Video]
 [ActionReplay] Add action replay cheats here.
 $Master Code
 C40EBABC 0000FF00
@@ -58,6 +57,4 @@ $C-Stick Sends All Car Back To Start
 00000000 00070B60
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
-SafeTextureCache = True
-
+UseRealXFB = True
\ No newline at end of file
diff --git a/GAUJ08.ini b/GAUJ08.ini
index bf4a323cb7..5a865502d6 100644
--- a/GAUJ08.ini
+++ b/GAUJ08.ini
@@ -2,11 +2,9 @@
 [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 = Use Real XFB and Safe texture cache
+EmulationIssues = Use Real XFB
 [OnFrame] Add memory patches to be applied every frame here.
-[Video]
 [ActionReplay] Add action replay cheats here.
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
-SafeTextureCache = True
+UseRealXFB = True
\ No newline at end of file
diff --git a/GAVE78.ini b/GAVE78.ini
index 1e39963483..a50d36fca7 100644
--- a/GAVE78.ini
+++ b/GAVE78.ini
@@ -8,8 +8,4 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
+[Gecko]
\ No newline at end of file
diff --git a/GBVE41.ini b/GBVE41.ini
index 48873b44fb..311e239697 100644
--- a/GBVE41.ini
+++ b/GBVE41.ini
@@ -1,7 +1,4 @@
 # GBVE41 - Batman: Vengeance
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
 [Core]
 [Video]
 ProjectionHack = 0
@@ -14,5 +11,6 @@ PH_ZFar =
 EmulationStateId = 3
 EmulationIssues = Needs Real xfb for videos to show up.(r7459)
 [OnFrame]
-[ActionReplay]
-[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
\ No newline at end of file
diff --git a/GBVP41.ini b/GBVP41.ini
index 439ef14205..719a94e1e5 100644
--- a/GBVP41.ini
+++ b/GBVP41.ini
@@ -1,7 +1,4 @@
 # GBVP41 - Batman Vengeance
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
 [Core]
 [Video]
 ProjectionHack = 0
@@ -14,5 +11,6 @@ PH_ZFar =
 EmulationStateId = 3
 EmulationIssues = Needs Real xfb for videos to show up.(r7459)
 [OnFrame]
-[ActionReplay]
-[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
\ No newline at end of file
diff --git a/GC6E01.ini b/GC6E01.ini
index f802ab00bb..3ed1b740d7 100644
--- a/GC6E01.ini
+++ b/GC6E01.ini
@@ -15,6 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
-
diff --git a/GC6P01.ini b/GC6P01.ini
index 26c7ee2401..50c34ce8e4 100644
--- a/GC6P01.ini
+++ b/GC6P01.ini
@@ -15,5 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
diff --git a/GC9P6S.ini b/GC9P6S.ini
index ce306fbb9a..8e661fb336 100644
--- a/GC9P6S.ini
+++ b/GC9P6S.ini
@@ -3,8 +3,6 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache
+EmulationIssues = Need ZTP BLoom Hack
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
+[ActionReplay] Add action replay cheats here.
\ No newline at end of file
diff --git a/GCCE01.ini b/GCCE01.ini
index 2e0dccc4c7..a3387f2cdf 100644
--- a/GCCE01.ini
+++ b/GCCE01.ini
@@ -298,10 +298,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-[Video_Enhancements]
-PostProcessingShader =
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/GCCP01.ini b/GCCP01.ini
index bd51e4c97e..53ac244ca5 100644
--- a/GCCP01.ini
+++ b/GCCP01.ini
@@ -15,8 +15,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/GCTP51.ini b/GCTP51.ini
index f4ebeb351b..fcc221a3dc 100644
--- a/GCTP51.ini
+++ b/GCTP51.ini
@@ -4,6 +4,4 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-[Video]
-[Gecko]
 
diff --git a/GCZE69.ini b/GCZE69.ini
index eaba11ce0b..00533030fc 100644
--- a/GCZE69.ini
+++ b/GCZE69.ini
@@ -10,8 +10,3 @@ EmulationStateId = 4
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-[Video_Enhancements]
-PostProcessingShader = 
diff --git a/GCZP69.ini b/GCZP69.ini
index c37bc8827e..f303e46a88 100644
--- a/GCZP69.ini
+++ b/GCZP69.ini
@@ -8,7 +8,4 @@ EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+ProjectionHack = 0
\ No newline at end of file
diff --git a/GDEE71.ini b/GDEE71.ini
index fdc28586f1..94ebf4298d 100644
--- a/GDEE71.ini
+++ b/GDEE71.ini
@@ -14,7 +14,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/GDLEA4.ini b/GDLEA4.ini
index 4e8adde846..85353cceff 100644
--- a/GDLEA4.ini
+++ b/GDLEA4.ini
@@ -4,5 +4,4 @@
 EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
+[ActionReplay] Add action replay cheats here.
\ No newline at end of file
diff --git a/GEAE8P.ini b/GEAE8P.ini
index c032bc3e73..25e3ec2106 100644
--- a/GEAE8P.ini
+++ b/GEAE8P.ini
@@ -12,8 +12,5 @@ PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 1.99998
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+
 
diff --git a/GEAP8P.ini b/GEAP8P.ini
index ff88026d45..ad5ba8df54 100644
--- a/GEAP8P.ini
+++ b/GEAP8P.ini
@@ -11,7 +11,4 @@ PH_SZNear = 0
 PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
-PH_ZFar = 1.99998
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+PH_ZFar = 1.99998
\ No newline at end of file
diff --git a/GEDE01.ini b/GEDE01.ini
index 43454cf0b0..aee645a35a 100644
--- a/GEDE01.ini
+++ b/GEDE01.ini
@@ -12,7 +12,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 5
 PH_ZFar = 0.15
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/GEDP01.ini b/GEDP01.ini
index f7ae147375..3d49a5f59d 100644
--- a/GEDP01.ini
+++ b/GEDP01.ini
@@ -12,7 +12,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 5
 PH_ZFar = 0.15
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/GENE69.ini b/GENE69.ini
index b30dad3b14..8972aacde5 100644
--- a/GENE69.ini
+++ b/GENE69.ini
@@ -8,5 +8,3 @@ EmulationStateId = 2
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-
diff --git a/GENS69.ini b/GENS69.ini
index 8f89df5ec1..5f1570a279 100644
--- a/GENS69.ini
+++ b/GENS69.ini
@@ -7,5 +7,4 @@ EmulationStateId = 2
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
-[Gecko]
+ProjectionHack = 0
\ No newline at end of file
diff --git a/GEOE08.ini b/GEOE08.ini
index 060ad29139..ff8c810ac0 100644
--- a/GEOE08.ini
+++ b/GEOE08.ini
@@ -8,8 +8,6 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]
 ProjectionHack = 0
@@ -18,5 +16,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
diff --git a/GEOP08.ini b/GEOP08.ini
index a5e69b5b0f..c40b35c994 100644
--- a/GEOP08.ini
+++ b/GEOP08.ini
@@ -8,8 +8,6 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]
 ProjectionHack = 0
@@ -17,6 +15,4 @@ PH_SZNear = 0
 PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Enhancements]
+PH_ZFar = 
\ No newline at end of file
diff --git a/GEZE8P.ini b/GEZE8P.ini
index 2c9afa3700..4cb966df2f 100644
--- a/GEZE8P.ini
+++ b/GEZE8P.ini
@@ -12,10 +12,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-[Video_Enhancements]
-PostProcessingShader = 
-[Video_Hacks]
diff --git a/GEZP8P.ini b/GEZP8P.ini
index ceb07208e7..06873a6fb4 100644
--- a/GEZP8P.ini
+++ b/GEZP8P.ini
@@ -12,10 +12,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-[Video_Enhancements]
-PostProcessingShader = 
-[Video_Hacks]
diff --git a/GF5E69.ini b/GF5E69.ini
index 40e4375018..5a6618b055 100644
--- a/GF5E69.ini
+++ b/GF5E69.ini
@@ -9,5 +9,3 @@ EmulationStateId = 3
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-
diff --git a/GF6E69.ini b/GF6E69.ini
index 037aeb7404..d806dc14de 100644
--- a/GF6E69.ini
+++ b/GF6E69.ini
@@ -8,5 +8,3 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-
diff --git a/GF6F69.ini b/GF6F69.ini
index 19bc8b9072..381db6a0ef 100644
--- a/GF6F69.ini
+++ b/GF6F69.ini
@@ -7,5 +7,4 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
-[Gecko]
+ProjectionHack = 0
\ No newline at end of file
diff --git a/GF7E01.ini b/GF7E01.ini
index caa783726c..c52f864d16 100644
--- a/GF7E01.ini
+++ b/GF7E01.ini
@@ -78,8 +78,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/GF7P01.ini b/GF7P01.ini
index 56a1d6ff09..8c458621c6 100644
--- a/GF7P01.ini
+++ b/GF7P01.ini
@@ -75,8 +75,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/GFYE69.ini b/GFYE69.ini
index 8289b3d2ac..f8c2beb920 100644
--- a/GFYE69.ini
+++ b/GFYE69.ini
@@ -36,7 +36,4 @@ $Away Team Low Trick Points
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GFYP69.ini b/GFYP69.ini
index 74f910c9e1..1798bc843b 100644
--- a/GFYP69.ini
+++ b/GFYP69.ini
@@ -10,5 +10,3 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/GGSEA4.ini b/GGSEA4.ini
index 2b360866c4..f6f8a1ea81 100644
--- a/GGSEA4.ini
+++ b/GGSEA4.ini
@@ -15,7 +15,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GGSJA4.ini b/GGSJA4.ini
index 6b2af534ed..e3fed0b08e 100644
--- a/GGSJA4.ini
+++ b/GGSJA4.ini
@@ -10,5 +10,3 @@ EmulationIssues =
 [ActionReplay]
 [Video]
 ProjectionHack = 0
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GGSPA4.ini b/GGSPA4.ini
index 30375b69c0..df5a7a31f6 100644
--- a/GGSPA4.ini
+++ b/GGSPA4.ini
@@ -10,5 +10,3 @@ EmulationIssues =
 [ActionReplay]
 [Video]
 ProjectionHack = 0
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GGYE41.ini b/GGYE41.ini
index 50fe9ee3e0..de572f1c63 100644
--- a/GGYE41.ini
+++ b/GGYE41.ini
@@ -18,6 +18,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GGYP41.ini b/GGYP41.ini
index fbad8671ce..f420dadf1e 100644
--- a/GGYP41.ini
+++ b/GGYP41.ini
@@ -18,5 +18,5 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-SafeTextureCache = True
+
 
diff --git a/GIKE70.ini b/GIKE70.ini
index e3254eb0af..c1f8b8e54f 100644
--- a/GIKE70.ini
+++ b/GIKE70.ini
@@ -5,5 +5,4 @@ EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GIKP70.ini b/GIKP70.ini
index 264ea3055d..64db20f18e 100644
--- a/GIKP70.ini
+++ b/GIKP70.ini
@@ -5,5 +5,4 @@ EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GILE51.ini b/GILE51.ini
index a68e2e48dc..97f52f64f9 100644
--- a/GILE51.ini
+++ b/GILE51.ini
@@ -1,7 +1,4 @@
 # GILE51 - Aggressive Inline
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/GILP51.ini b/GILP51.ini
index d87a00d5b7..9fd90640ba 100644
--- a/GILP51.ini
+++ b/GILP51.ini
@@ -1,7 +1,4 @@
 # GILP51 - Aggressive Inline
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/GJ3PA4.ini b/GJ3PA4.ini
index 02c0919f46..b0be706bb9 100644
--- a/GJ3PA4.ini
+++ b/GJ3PA4.ini
@@ -2,7 +2,7 @@
 [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
+EmulationIssues = Need a Projection Hack Bloom
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -12,5 +12,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [ActionReplay] Add action replay cheats here.
-[Video_Settings]
-SafeTextureCache = True
diff --git a/GJXE51.ini b/GJXE51.ini
index 07db84890e..99cab04f30 100644
--- a/GJXE51.ini
+++ b/GJXE51.ini
@@ -12,9 +12,6 @@ EmulationIssues = Slow,needs mmu and lle audio plugin for proper audio(r7411).
 [OnFrame]
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 FastDiscSpeed = 1
diff --git a/GK5E78.ini b/GK5E78.ini
index bb27d40b41..51166031b8 100644
--- a/GK5E78.ini
+++ b/GK5E78.ini
@@ -9,7 +9,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GKLE69.ini b/GKLE69.ini
index 760bc023a3..79f569b430 100644
--- a/GKLE69.ini
+++ b/GKLE69.ini
@@ -9,5 +9,4 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GKLF69.ini b/GKLF69.ini
index f7e2ef20f2..f4a9acc88b 100644
--- a/GKLF69.ini
+++ b/GKLF69.ini
@@ -9,5 +9,4 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GKLP69.ini b/GKLP69.ini
index 4c7302bfa3..f03cdbfba2 100644
--- a/GKLP69.ini
+++ b/GKLP69.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GKLS69.ini b/GKLS69.ini
index f34abbae8a..871afd3f1f 100644
--- a/GKLS69.ini
+++ b/GKLS69.ini
@@ -9,5 +9,4 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GKME41.ini b/GKME41.ini
index 4f738d5674..dcb62875a9 100644
--- a/GKME41.ini
+++ b/GKME41.ini
@@ -9,8 +9,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/GKOE70.ini b/GKOE70.ini
index cc267dd4dd..eaf5845468 100644
--- a/GKOE70.ini
+++ b/GKOE70.ini
@@ -9,6 +9,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+
diff --git a/GKOP70.ini b/GKOP70.ini
index 239477ef97..1058fa8d0c 100644
--- a/GKOP70.ini
+++ b/GKOP70.ini
@@ -9,5 +9,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
+
diff --git a/GKUE9G.ini b/GKUE9G.ini
index 4fce1959df..abdf02d167 100644
--- a/GKUE9G.ini
+++ b/GKUE9G.ini
@@ -14,6 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+
diff --git a/GLCE52.ini b/GLCE52.ini
index 2d296b4cc3..9a324fdef5 100644
--- a/GLCE52.ini
+++ b/GLCE52.ini
@@ -17,7 +17,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 DstAlphaPass = True
 [Video_Hacks]
 EFBCopyEnable = True
diff --git a/GM5E7D.ini b/GM5E7D.ini
index f7aa5f8eee..1e67b1035e 100644
--- a/GM5E7D.ini
+++ b/GM5E7D.ini
@@ -1,7 +1,4 @@
 # GM5E7D - Metal Arms: Glitch in the System
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/GM5F7D.ini b/GM5F7D.ini
index 4c8b28f81e..4d24520ad7 100644
--- a/GM5F7D.ini
+++ b/GM5F7D.ini
@@ -1,7 +1,4 @@
 # GM5F7D - Metal Arms: Glitch in the System
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/GM5P7D.ini b/GM5P7D.ini
index 3d61a5be29..a3f1f84e8d 100644
--- a/GM5P7D.ini
+++ b/GM5P7D.ini
@@ -1,7 +1,4 @@
 # GM5P7D - Metal Arms: Glitch in the System
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/GM6EE9.ini b/GM6EE9.ini
index 37fa68e57c..3a383e92e8 100644
--- a/GM6EE9.ini
+++ b/GM6EE9.ini
@@ -13,6 +13,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
+
diff --git a/GM6PE9.ini b/GM6PE9.ini
index 2a8664ebbb..1efffc3d37 100644
--- a/GM6PE9.ini
+++ b/GM6PE9.ini
@@ -13,6 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
diff --git a/GM8E01.ini b/GM8E01.ini
index f706caab46..ddb1d4a98a 100644
--- a/GM8E01.ini
+++ b/GM8E01.ini
@@ -94,9 +94,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
diff --git a/GM8J01.ini b/GM8J01.ini
index 7f6944b210..6b54ede197 100644
--- a/GM8J01.ini
+++ b/GM8J01.ini
@@ -18,9 +18,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
diff --git a/GM8P01.ini b/GM8P01.ini
index a1dcbc1d45..9e37e56d64 100644
--- a/GM8P01.ini
+++ b/GM8P01.ini
@@ -7,7 +7,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-EmulationIssues = needs safe texture cache
+EmulationIssues = 
 [EmuState]
 EmulationStateId = 0
 [OnFrame]
@@ -20,9 +20,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
diff --git a/GNNE69.ini b/GNNE69.ini
index e089c40997..64c9f47f14 100644
--- a/GNNE69.ini
+++ b/GNNE69.ini
@@ -8,5 +8,3 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/GNOE78.ini b/GNOE78.ini
index cd8c06fa53..b763445491 100644
--- a/GNOE78.ini
+++ b/GNOE78.ini
@@ -15,6 +15,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.000153
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
+
diff --git a/GOYD69.ini b/GOYD69.ini
index 0a8955ef74..553dc1f834 100644
--- a/GOYD69.ini
+++ b/GOYD69.ini
@@ -6,9 +6,6 @@ EmulationIssues = Videos are messed up. Use LLE for proper sound.(r7446)
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/GOYE69.ini b/GOYE69.ini
index 0643b0faa5..a5f8dc919e 100644
--- a/GOYE69.ini
+++ b/GOYE69.ini
@@ -35,9 +35,6 @@ $Slow Enemies (Use On A Empty Profile)
 044F7FFC 3D000000
 $Disable Shadows (Use On A Empty Profile)
 044FA2A4 00000001
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/GPHE52.ini b/GPHE52.ini
index 3047d82bc4..54dcb325e7 100644
--- a/GPHE52.ini
+++ b/GPHE52.ini
@@ -9,7 +9,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+
 
diff --git a/GPOE8P.ini b/GPOE8P.ini
index 7b94b09ec5..aa9c9c883d 100644
--- a/GPOE8P.ini
+++ b/GPOE8P.ini
@@ -44,6 +44,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/GPOP8P.ini b/GPOP8P.ini
index c6fe1f33e1..9aec854486 100644
--- a/GPOP8P.ini
+++ b/GPOP8P.ini
@@ -2,7 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-EmulationIssues = needs texture cache
+EmulationIssues = 
 [OnFrame]
 [ActionReplay]
 $ENABLE
@@ -61,6 +61,4 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Video_Settings]
-SafeTextureCache = True
 [Gecko]
diff --git a/GPSP8P.ini b/GPSP8P.ini
index 787743cc82..7563f068e0 100644
--- a/GPSP8P.ini
+++ b/GPSP8P.ini
@@ -2,7 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
-EmulationIssues = needs texture cache
+EmulationIssues = 
 [Speedhacks]
 # Patch OSYieldThread in attempt to make a speedhack (gave me a few fps more :) )
 0x8036eba0=400
@@ -60,6 +60,4 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Video_Settings]
-SafeTextureCache = True
 [Gecko]
diff --git a/GQSDAF.ini b/GQSDAF.ini
index b2ca3063f2..4f38f0c417 100644
--- a/GQSDAF.ini
+++ b/GQSDAF.ini
@@ -16,5 +16,3 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GQSEAF.ini b/GQSEAF.ini
index c190a0f463..44111ea158 100644
--- a/GQSEAF.ini
+++ b/GQSEAF.ini
@@ -786,8 +786,5 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/GQSFAF.ini b/GQSFAF.ini
index 901cba8f92..83fd5bed07 100644
--- a/GQSFAF.ini
+++ b/GQSFAF.ini
@@ -16,5 +16,3 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GQSPAF.ini b/GQSPAF.ini
index df727db8b2..dc12c2d671 100644
--- a/GQSPAF.ini
+++ b/GQSPAF.ini
@@ -16,5 +16,3 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GRKE41.ini b/GRKE41.ini
index fd75690f3b..990258a873 100644
--- a/GRKE41.ini
+++ b/GRKE41.ini
@@ -15,7 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-SafeTextureCache = True
 UseRealXFB = False
-SafeTextureCacheColorSamples = 512
 
diff --git a/GRKP7G.ini b/GRKP7G.ini
index 49a5f1d6cc..3382e405bf 100644
--- a/GRKP7G.ini
+++ b/GRKP7G.ini
@@ -15,4 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-SafeTextureCache = True
\ No newline at end of file
diff --git a/GRSPAF.ini b/GRSPAF.ini
index 214f087b16..2fabd40ae6 100644
--- a/GRSPAF.ini
+++ b/GRSPAF.ini
@@ -557,5 +557,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-SafeTextureCache = True
 
diff --git a/GT7E41.ini b/GT7E41.ini
index 99426db64a..0fe4bd8515 100644
--- a/GT7E41.ini
+++ b/GT7E41.ini
@@ -17,6 +17,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GT7P41.ini b/GT7P41.ini
index 13cb3250bc..da46609de2 100644
--- a/GT7P41.ini
+++ b/GT7P41.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
-SafeTextureCache = True
+UseRealXFB = True
\ No newline at end of file
diff --git a/GT7X41.ini b/GT7X41.ini
index e8144424d3..b9460865cc 100644
--- a/GT7X41.ini
+++ b/GT7X41.ini
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
-SafeTextureCache = True
+UseRealXFB = True
\ No newline at end of file
diff --git a/GTKP51.ini b/GTKP51.ini
index a3bf07df79..f7929de832 100644
--- a/GTKP51.ini
+++ b/GTKP51.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
diff --git a/GWYE41.ini b/GWYE41.ini
index 9aa12b7bd6..8b9e221709 100644
--- a/GWYE41.ini
+++ b/GWYE41.ini
@@ -17,4 +17,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-SafeTextureCache = True
diff --git a/GXNE5D.ini b/GXNE5D.ini
index a23df80156..9feb8de37a 100644
--- a/GXNE5D.ini
+++ b/GXNE5D.ini
@@ -9,7 +9,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/GXXE01.ini b/GXXE01.ini
index a66e71accf..1d471b86e0 100644
--- a/GXXE01.ini
+++ b/GXXE01.ini
@@ -17,5 +17,3 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
diff --git a/GXXP01.ini b/GXXP01.ini
index 9d2a0435d5..70565475eb 100644
--- a/GXXP01.ini
+++ b/GXXP01.ini
@@ -17,6 +17,3 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
-
diff --git a/GZ2E01.ini b/GZ2E01.ini
index 760ac4368b..18a54a8b19 100644
--- a/GZ2E01.ini
+++ b/GZ2E01.ini
@@ -1488,6 +1488,4 @@ PH_ZFar =
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
-[Video_Settings]
-SafeTextureCache = False
-SafeTextureCacheColorSamples = 512
+
diff --git a/GZ2P01.ini b/GZ2P01.ini
index 9252b294c7..17e4022af7 100644
--- a/GZ2P01.ini
+++ b/GZ2P01.ini
@@ -88,6 +88,4 @@ PH_ZFar =
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
-[Video_Settings]
-SafeTextureCache = False
-SafeTextureCacheColorSamples = 512
+
diff --git a/GZEE70.ini b/GZEE70.ini
index 837b4c2f29..176287df84 100644
--- a/GZEE70.ini
+++ b/GZEE70.ini
@@ -7,9 +7,6 @@ Issues="Playable,but sometimes slowdown FPS maybe is patched"
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/GZWE01.ini b/GZWE01.ini
index ad6eda6c35..c2b727f34e 100644
--- a/GZWE01.ini
+++ b/GZWE01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 3
 EmulationIssues = Need Save texture cache,graphic glitches
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video_Hacks]
 [Video]
diff --git a/HACA01.ini b/HACA01.ini
index d3a9f197b8..cb7a4b7f3c 100644
--- a/HACA01.ini
+++ b/HACA01.ini
@@ -7,5 +7,3 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Video_Settings]
-SafeTextureCache = True
diff --git a/R3NEXS.ini b/R3NEXS.ini
index a4cd53830f..90da0ce799 100644
--- a/R3NEXS.ini
+++ b/R3NEXS.ini
@@ -8,7 +8,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/R3OE01.ini b/R3OE01.ini
index 308cb3e4eb..fbd28cb030 100644
--- a/R3OE01.ini
+++ b/R3OE01.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/R3OJ01.ini b/R3OJ01.ini
index 2616b66fda..ee1a83d621 100644
--- a/R3OJ01.ini
+++ b/R3OJ01.ini
@@ -13,5 +13,3 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/R3OP01.ini b/R3OP01.ini
index 11284c5749..cab59460ee 100644
--- a/R3OP01.ini
+++ b/R3OP01.ini
@@ -13,5 +13,3 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/R5IE4Q.ini b/R5IE4Q.ini
index 54dd70a5a4..9d8a4442da 100644
--- a/R5IE4Q.ini
+++ b/R5IE4Q.ini
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/R5IX4Q.ini b/R5IX4Q.ini
index 2ef502fe6c..12bc6febae 100644
--- a/R5IX4Q.ini
+++ b/R5IX4Q.ini
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/R5WEA4.ini b/R5WEA4.ini
index c00ce1cfe4..f4c698b915 100644
--- a/R5WEA4.ini
+++ b/R5WEA4.ini
@@ -13,7 +13,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/R5WJA4.ini b/R5WJA4.ini
index 95e8288a51..4853ecc6b9 100644
--- a/R5WJA4.ini
+++ b/R5WJA4.ini
@@ -7,6 +7,4 @@ EmulationIssues = Flashlight glitches (r6521)
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/R6YPH3.ini b/R6YPH3.ini
index cc17213f48..ab14abfc76 100644
--- a/R6YPH3.ini
+++ b/R6YPH3.ini
@@ -7,6 +7,4 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/R7EE8P.ini b/R7EE8P.ini
index debcf62f86..98eedfe29b 100644
--- a/R7EE8P.ini
+++ b/R7EE8P.ini
@@ -13,7 +13,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/R7EJ8P.ini b/R7EJ8P.ini
index ba735e5b0f..95d75be274 100644
--- a/R7EJ8P.ini
+++ b/R7EJ8P.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/R7EP8P.ini b/R7EP8P.ini
index 9f7615756b..9a8147ab04 100644
--- a/R7EP8P.ini
+++ b/R7EP8P.ini
@@ -14,7 +14,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/R84EE9.ini b/R84EE9.ini
index cb3930e4b3..caa969a4ee 100644
--- a/R84EE9.ini
+++ b/R84EE9.ini
@@ -1,7 +1,4 @@
 # R84EE9 - Harvest Moon Tree Of Tranquility
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/R84P99.ini b/R84P99.ini
index 7e578edbde..d17fcf8b37 100644
--- a/R84P99.ini
+++ b/R84P99.ini
@@ -1,7 +1,4 @@
 # R84P99 - Harvest Moon Tree Of Tranquility
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RBBE18.ini b/RBBE18.ini
index a6983f3157..49b955246d 100644
--- a/RBBE18.ini
+++ b/RBBE18.ini
@@ -1,9 +1,6 @@
 # RBBE18 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/RBBJ18.ini b/RBBJ18.ini
index b8618a5021..a1247a2205 100644
--- a/RBBJ18.ini
+++ b/RBBJ18.ini
@@ -1,9 +1,6 @@
 # RBBJ18 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/RBBP99.ini b/RBBP99.ini
index f4254a565e..27cccb9119 100644
--- a/RBBP99.ini
+++ b/RBBP99.ini
@@ -1,9 +1,6 @@
 # RBBP99 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/RBHE08.ini b/RBHE08.ini
index 70e107228b..1e321df00f 100644
--- a/RBHE08.ini
+++ b/RBHE08.ini
@@ -16,6 +16,3 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 DlistCachingEnable = False
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/RBHJ08.ini b/RBHJ08.ini
index 3d8cc9f715..256076df6e 100644
--- a/RBHJ08.ini
+++ b/RBHJ08.ini
@@ -17,7 +17,4 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Video_Enhancements]
-PostProcessingShader = 
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+PostProcessingShader = 
\ No newline at end of file
diff --git a/RBHP08.ini b/RBHP08.ini
index b7bd141069..304de45c4b 100644
--- a/RBHP08.ini
+++ b/RBHP08.ini
@@ -16,7 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 DlistCachingEnable = False
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/RDBPAF.ini b/RDBPAF.ini
index 9d3ddb23e9..2f65f24462 100644
--- a/RDBPAF.ini
+++ b/RDBPAF.ini
@@ -13,7 +13,4 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/RDSE70.ini b/RDSE70.ini
index e3f23aa99c..2d515d296d 100644
--- a/RDSE70.ini
+++ b/RDSE70.ini
@@ -13,7 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/RDSJAF.ini b/RDSJAF.ini
index 8b208019f3..693b8c5e93 100644
--- a/RDSJAF.ini
+++ b/RDSJAF.ini
@@ -8,5 +8,3 @@ EmulationStateId = 5
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RDSPAF.ini b/RDSPAF.ini
index 58cbbb496a..9688ca994f 100644
--- a/RDSPAF.ini
+++ b/RDSPAF.ini
@@ -7,6 +7,4 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/RFCEGD.ini b/RFCEGD.ini
index 23d3a8cbcc..32894402c7 100644
--- a/RFCEGD.ini
+++ b/RFCEGD.ini
@@ -8,8 +8,5 @@ EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/RFCPGD.ini b/RFCPGD.ini
index 0a8daa4dbe..3664c76ecc 100644
--- a/RFCPGD.ini
+++ b/RFCPGD.ini
@@ -6,6 +6,4 @@ EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/RFFEGD.ini b/RFFEGD.ini
index bbe10445f4..adbb0b282f 100644
--- a/RFFEGD.ini
+++ b/RFFEGD.ini
@@ -14,7 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 EFBScale = 2
-SafeTextureCacheColorSamples = 512
-
diff --git a/RFFJGD.ini b/RFFJGD.ini
index 749f5e068f..4d2c593203 100644
--- a/RFFJGD.ini
+++ b/RFFJGD.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 EFBScale = 2
 
diff --git a/RFFPGD.ini b/RFFPGD.ini
index 9c24e2df88..1eaf97653b 100644
--- a/RFFPGD.ini
+++ b/RFFPGD.ini
@@ -14,5 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 EFBScale = 2
diff --git a/RFQP69.ini b/RFQP69.ini
index ced45265c7..27dfd98093 100644
--- a/RFQP69.ini
+++ b/RFQP69.ini
@@ -7,5 +7,3 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 Hack = 3
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RIPEAF.ini b/RIPEAF.ini
index 192d024521..2c27cc583e 100644
--- a/RIPEAF.ini
+++ b/RIPEAF.ini
@@ -8,8 +8,5 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/RIPJAF.ini b/RIPJAF.ini
index 8daa461e7c..cb1ef986a2 100644
--- a/RIPJAF.ini
+++ b/RIPJAF.ini
@@ -8,5 +8,3 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RIPPAF.ini b/RIPPAF.ini
index f0756110ea..a312e98433 100644
--- a/RIPPAF.ini
+++ b/RIPPAF.ini
@@ -8,5 +8,3 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RIUJAF.ini b/RIUJAF.ini
index c5dea403f9..1ae02f22d6 100644
--- a/RIUJAF.ini
+++ b/RIUJAF.ini
@@ -8,5 +8,3 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RIUPAF.ini b/RIUPAF.ini
index 2b45e950b1..66bfc6854f 100644
--- a/RIUPAF.ini
+++ b/RIUPAF.ini
@@ -8,7 +8,4 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/RK2EEB.ini b/RK2EEB.ini
index 7c63634d23..90226d557c 100644
--- a/RK2EEB.ini
+++ b/RK2EEB.ini
@@ -8,6 +8,3 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/RK2JEB.ini b/RK2JEB.ini
index 8016eac272..28d2e3d4ba 100644
--- a/RK2JEB.ini
+++ b/RK2JEB.ini
@@ -8,5 +8,3 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RK2P01.ini b/RK2P01.ini
index 9d8895d1d2..3b13813b82 100644
--- a/RK2P01.ini
+++ b/RK2P01.ini
@@ -7,6 +7,4 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/RKDEEB.ini b/RKDEEB.ini
index 0494409839..ca2424bc64 100644
--- a/RKDEEB.ini
+++ b/RKDEEB.ini
@@ -8,7 +8,4 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/RKDP01.ini b/RKDP01.ini
index 5e430c75b9..629d9257d1 100644
--- a/RKDP01.ini
+++ b/RKDP01.ini
@@ -6,6 +6,4 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-[Video_Settings]
-SafeTextureCache = True
 
diff --git a/RKDPEB.ini b/RKDPEB.ini
index f6c8b3f8a2..a3e6db572f 100644
--- a/RKDPEB.ini
+++ b/RKDPEB.ini
@@ -7,6 +7,4 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/RM3E01.ini b/RM3E01.ini
index 5ef96b0d77..07f4b0f57f 100644
--- a/RM3E01.ini
+++ b/RM3E01.ini
@@ -15,9 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/RM3J01.ini b/RM3J01.ini
index f27e1e111d..c5c874a296 100644
--- a/RM3J01.ini
+++ b/RM3J01.ini
@@ -15,9 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/RM3P01.ini b/RM3P01.ini
index 42dc04ed9d..093d705781 100644
--- a/RM3P01.ini
+++ b/RM3P01.ini
@@ -17,9 +17,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/ROLE8P.ini b/ROLE8P.ini
index 450f94131d..0bed89710d 100644
--- a/ROLE8P.ini
+++ b/ROLE8P.ini
@@ -8,7 +8,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/ROUJAF.ini b/ROUJAF.ini
index 6300f9c9c0..b2abb4e988 100644
--- a/ROUJAF.ini
+++ b/ROUJAF.ini
@@ -8,5 +8,3 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/ROUPAF.ini b/ROUPAF.ini
index e362c4cf29..9da6c9826d 100644
--- a/ROUPAF.ini
+++ b/ROUPAF.ini
@@ -8,6 +8,3 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/ROWE08.ini b/ROWE08.ini
index 77c8759e7a..6951708de1 100644
--- a/ROWE08.ini
+++ b/ROWE08.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBAccessEnable = True
 EFBToTextureEnable = False
diff --git a/ROWJ08.ini b/ROWJ08.ini
index be9440a87c..5f78be5b6f 100644
--- a/ROWJ08.ini
+++ b/ROWJ08.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBAccessEnable = True
 EFBToTextureEnable = False
diff --git a/ROWP08.ini b/ROWP08.ini
index a7f764a350..2cdc8e7cb0 100644
--- a/ROWP08.ini
+++ b/ROWP08.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBAccessEnable = True
 EFBToTextureEnable = False
diff --git a/RPBE01.ini b/RPBE01.ini
index 317a718b98..cc4c2282e5 100644
--- a/RPBE01.ini
+++ b/RPBE01.ini
@@ -2,7 +2,7 @@
 [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 texture cache set to "Safe"(r6906).
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
+
 
diff --git a/RPBJ01.ini b/RPBJ01.ini
index 4701961228..29f82ea4a9 100644
--- a/RPBJ01.ini
+++ b/RPBJ01.ini
@@ -2,7 +2,7 @@
 [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 texture cache set to "Safe"(r6906).
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -12,7 +12,4 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
\ No newline at end of file
+[Gecko]
\ No newline at end of file
diff --git a/RPBP01.ini b/RPBP01.ini
index 5e696efd6a..7c4cdd5087 100644
--- a/RPBP01.ini
+++ b/RPBP01.ini
@@ -2,7 +2,7 @@
 [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 texture cache set to "Safe"(r6906).
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,6 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
diff --git a/RPJE7U.ini b/RPJE7U.ini
index c9639856c5..ce878fd88d 100644
--- a/RPJE7U.ini
+++ b/RPJE7U.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/RPJJ99.ini b/RPJJ99.ini
index fe608fbbe1..c5145004c4 100644
--- a/RPJJ99.ini
+++ b/RPJJ99.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/RQ6EJJ.ini b/RQ6EJJ.ini
index d9bcac7936..a92e512764 100644
--- a/RQ6EJJ.ini
+++ b/RQ6EJJ.ini
@@ -2,9 +2,6 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/RQ6PKM.ini b/RQ6PKM.ini
index cfc87e365d..1923406043 100644
--- a/RQ6PKM.ini
+++ b/RQ6PKM.ini
@@ -2,9 +2,6 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/RQ6XKM.ini b/RQ6XKM.ini
index b8e03b8b37..b4e43089de 100644
--- a/RQ6XKM.ini
+++ b/RQ6XKM.ini
@@ -2,9 +2,6 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/RQREXJ.ini b/RQREXJ.ini
index 83b5f9f9ce..1e153e176e 100644
--- a/RQREXJ.ini
+++ b/RQREXJ.ini
@@ -1,7 +1,4 @@
 # RQREXJ - The Sky Crawlers
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/RQRJAF.ini b/RQRJAF.ini
index b60c421d9a..01f4f827d4 100644
--- a/RQRJAF.ini
+++ b/RQRJAF.ini
@@ -1,7 +1,4 @@
 # RQRJAF - The Sky Crawlers
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/RQRPAF.ini b/RQRPAF.ini
index 7253a3ac5f..d5c6807696 100644
--- a/RQRPAF.ini
+++ b/RQRPAF.ini
@@ -1,7 +1,4 @@
 # RQRPAF - The Sky Crawlers
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/RRKE70.ini b/RRKE70.ini
index 9a28e7535d..57121c93e9 100644
--- a/RRKE70.ini
+++ b/RRKE70.ini
@@ -1,7 +1,4 @@
 # RRKE70 - Alone In The Dark
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RRKP70.ini b/RRKP70.ini
index 04cdba86b7..02b8855b0f 100644
--- a/RRKP70.ini
+++ b/RRKP70.ini
@@ -1,7 +1,4 @@
 # RRKP70 - Alone In The Dark
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RSLEAF.ini b/RSLEAF.ini
index ff0b93d089..7d0d533b24 100644
--- a/RSLEAF.ini
+++ b/RSLEAF.ini
@@ -1,7 +1,4 @@
 # RSLEAF - SOULCALIBUR Legends
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RSLJAF.ini b/RSLJAF.ini
index cdaa23bae8..8a7767dcfd 100644
--- a/RSLJAF.ini
+++ b/RSLJAF.ini
@@ -1,7 +1,4 @@
 # RSLJAF - SOULCALIBUR Legends
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RSLKAF.ini b/RSLKAF.ini
index 190f5ba029..19283ceb82 100644
--- a/RSLKAF.ini
+++ b/RSLKAF.ini
@@ -1,7 +1,4 @@
 # RSLKAF - SOULCALIBUR Legends
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RSLPAF.ini b/RSLPAF.ini
index faf79d36e3..0c6efbbc73 100644
--- a/RSLPAF.ini
+++ b/RSLPAF.ini
@@ -1,7 +1,4 @@
 # RSLPAF - SOULCALIBUR Legends
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/RX3E01.ini b/RX3E01.ini
index 39f17958fe..db7cce96f8 100644
--- a/RX3E01.ini
+++ b/RX3E01.ini
@@ -8,7 +8,4 @@ EmulationIssues = Tested with (r6521)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/RZDE01.ini b/RZDE01.ini
index 05ef8be870..9b7ebfee31 100644
--- a/RZDE01.ini
+++ b/RZDE01.ini
@@ -20,6 +20,3 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 EFBAccessEnable = True
-[Video_Settings]
-SafeTextureCache = False
-SafeTextureCacheColorSamples = 512
diff --git a/RZDJ01.ini b/RZDJ01.ini
index 691be27e10..7f2ddb00f1 100644
--- a/RZDJ01.ini
+++ b/RZDJ01.ini
@@ -19,6 +19,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
-[Video_Settings]
-SafeTextureCache = False
\ No newline at end of file
+EFBAccessEnable = True
\ No newline at end of file
diff --git a/RZDK01.ini b/RZDK01.ini
index b0007ffe6f..2f6d5d7a24 100644
--- a/RZDK01.ini
+++ b/RZDK01.ini
@@ -19,6 +19,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
-[Video_Settings]
-SafeTextureCache = False
\ No newline at end of file
+EFBAccessEnable = True
\ No newline at end of file
diff --git a/RZDP01.ini b/RZDP01.ini
index e26bff70b2..6c5cc20af0 100644
--- a/RZDP01.ini
+++ b/RZDP01.ini
@@ -19,6 +19,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
-[Video_Settings]
-SafeTextureCache = False
\ No newline at end of file
+EFBAccessEnable = True
\ No newline at end of file
diff --git a/RZJD69.ini b/RZJD69.ini
index b5511f120e..809af4f4b1 100644
--- a/RZJD69.ini
+++ b/RZJD69.ini
@@ -8,5 +8,3 @@ EmulationIssues =
 ProjectionHack = 0
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RZJE69.ini b/RZJE69.ini
index 3999569fcf..6140e3f0a5 100644
--- a/RZJE69.ini
+++ b/RZJE69.ini
@@ -13,8 +13,5 @@ PH_ZNear =
 PH_ZFar = 
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/RZJJ13.ini b/RZJJ13.ini
index 2054dfecf7..fb6d6903b5 100644
--- a/RZJJ13.ini
+++ b/RZJJ13.ini
@@ -8,5 +8,3 @@ EmulationIssues =
 ProjectionHack = 0
 [ActionReplay]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/RZJP69.ini b/RZJP69.ini
index f6bbffccb3..c4f3a45c70 100644
--- a/RZJP69.ini
+++ b/RZJP69.ini
@@ -26,6 +26,4 @@ $Infinite Health [TNTkryzt]
 $Infinite Ammo [TNTkryzt]
 0421AA54 3BC00000
 $Rapid Fire [TNTkryzt]
-0423A4DC 60000000
-[Video_Settings]
-SafeTextureCache = True
+0423A4DC 60000000
\ No newline at end of file
diff --git a/S2WE78.ini b/S2WE78.ini
index 6c5eb28f80..d5e67048cd 100644
--- a/S2WE78.ini
+++ b/S2WE78.ini
@@ -1,7 +1,4 @@
 # S2WE78 - WWE All Stars
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/S2WP78.ini b/S2WP78.ini
index 12669e1c62..d37598258c 100644
--- a/S2WP78.ini
+++ b/S2WP78.ini
@@ -1,7 +1,4 @@
 # S2WP78 - WWE All Stars
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/S3BEWR.ini b/S3BEWR.ini
index b6bafb956c..b45f3cd925 100644
--- a/S3BEWR.ini
+++ b/S3BEWR.ini
@@ -1,7 +1,4 @@
 # S3BEWR - Batman: The Brave and the Bold
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]
diff --git a/S3BPWR.ini b/S3BPWR.ini
index 2aa2b5049c..627008a404 100644
--- a/S3BPWR.ini
+++ b/S3BPWR.ini
@@ -1,7 +1,4 @@
 # S3BPWR - Batman: The Brave and the Bold
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]
diff --git a/S59E01.ini b/S59E01.ini
index adac044e0c..50a264e3f5 100644
--- a/S59E01.ini
+++ b/S59E01.ini
@@ -7,6 +7,4 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/S59JC8.ini b/S59JC8.ini
index a35db392e7..769f0416c4 100644
--- a/S59JC8.ini
+++ b/S59JC8.ini
@@ -7,6 +7,4 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/S59P01.ini b/S59P01.ini
index f903683190..578e7b588d 100644
--- a/S59P01.ini
+++ b/S59P01.ini
@@ -8,6 +8,3 @@ EmulationStateId = 5
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/S75E69.ini b/S75E69.ini
index c831a31231..5cf6bf206a 100644
--- a/S75E69.ini
+++ b/S75E69.ini
@@ -14,7 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 EFBScale = 1
-SafeTextureCacheColorSamples = 512
 
diff --git a/S75P69.ini b/S75P69.ini
index 6da8aa338c..29cc185b92 100644
--- a/S75P69.ini
+++ b/S75P69.ini
@@ -14,5 +14,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-SafeTextureCache = True
 EFBScale = 1
diff --git a/SAKENS.ini b/SAKENS.ini
index f8c4f52479..866fb9d272 100644
--- a/SAKENS.ini
+++ b/SAKENS.ini
@@ -8,7 +8,4 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/SAKPNS.ini b/SAKPNS.ini
index e702bc182f..e80cff0cd3 100644
--- a/SAKPNS.ini
+++ b/SAKPNS.ini
@@ -7,6 +7,4 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/SBDE08.ini b/SBDE08.ini
index ca64242918..bc452f9a76 100644
--- a/SBDE08.ini
+++ b/SBDE08.ini
@@ -12,7 +12,4 @@ PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+[Gecko]
\ No newline at end of file
diff --git a/SBDJ08.ini b/SBDJ08.ini
index a281b91c1a..f230a5d4c0 100644
--- a/SBDJ08.ini
+++ b/SBDJ08.ini
@@ -13,5 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/SBDK08.ini b/SBDK08.ini
index d3166632f1..8ad914f40d 100644
--- a/SBDK08.ini
+++ b/SBDK08.ini
@@ -13,5 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/SBDP08.ini b/SBDP08.ini
index 529c32a43a..332a34e86b 100644
--- a/SBDP08.ini
+++ b/SBDP08.ini
@@ -13,5 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/SCAE18.ini b/SCAE18.ini
index 6a41856208..6025bde64d 100644
--- a/SCAE18.ini
+++ b/SCAE18.ini
@@ -1,9 +1,6 @@
 # SCAE18 - CALLING
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SCAJ18.ini b/SCAJ18.ini
index 7ba36f6af5..d219b11ff4 100644
--- a/SCAJ18.ini
+++ b/SCAJ18.ini
@@ -1,9 +1,6 @@
 # SCAJ18 - CALLING Kuroki Chakushin
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SCAP18.ini b/SCAP18.ini
index 6fec8cd117..2c77f5eabb 100644
--- a/SCAP18.ini
+++ b/SCAP18.ini
@@ -1,9 +1,6 @@
 # SCAP18 - CALLING
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SD2E41.ini b/SD2E41.ini
index e5b2d686c7..74129642c1 100644
--- a/SD2E41.ini
+++ b/SD2E41.ini
@@ -1,7 +1,4 @@
 # SD2E41 - Just Dance 2
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/SD2P41.ini b/SD2P41.ini
index d446b13273..6ae5995dc9 100644
--- a/SD2P41.ini
+++ b/SD2P41.ini
@@ -1,7 +1,4 @@
 # SD2P41 - Just Dance 2
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/SD2Y41.ini b/SD2Y41.ini
index 3af0cc5950..6749f60dea 100644
--- a/SD2Y41.ini
+++ b/SD2Y41.ini
@@ -1,7 +1,4 @@
 # SD2Y41 - Just Dance 2
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/SE2P69.ini b/SE2P69.ini
index 55d89a5b50..61d19e0e54 100644
--- a/SE2P69.ini
+++ b/SE2P69.ini
@@ -8,7 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/SEAE69.ini b/SEAE69.ini
index f9fe4d44aa..ea27ad50a2 100644
--- a/SEAE69.ini
+++ b/SEAE69.ini
@@ -8,7 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/SEAJ13.ini b/SEAJ13.ini
index edf92d59d9..ab22e3105d 100644
--- a/SEAJ13.ini
+++ b/SEAJ13.ini
@@ -8,7 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/SEAP69.ini b/SEAP69.ini
index 81ca65bf49..1c6f75ac40 100644
--- a/SEAP69.ini
+++ b/SEAP69.ini
@@ -8,7 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/SEME4Q.ini b/SEME4Q.ini
index 3955caebb4..b3a36b73d6 100644
--- a/SEME4Q.ini
+++ b/SEME4Q.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/SEMP4Q.ini b/SEMP4Q.ini
index 0d2acb5188..127e6440ba 100644
--- a/SEMP4Q.ini
+++ b/SEMP4Q.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/SEMX4Q.ini b/SEMX4Q.ini
index d1c180f1ba..87c8685b68 100644
--- a/SEMX4Q.ini
+++ b/SEMX4Q.ini
@@ -13,9 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/SF8E01.ini b/SF8E01.ini
index 7be1be3c3f..706185036c 100644
--- a/SF8E01.ini
+++ b/SF8E01.ini
@@ -14,8 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
diff --git a/SF8J01.ini b/SF8J01.ini
index a7a58eab98..09ab9ee04d 100644
--- a/SF8J01.ini
+++ b/SF8J01.ini
@@ -14,8 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
diff --git a/SF8P01.ini b/SF8P01.ini
index 5b2cf6121f..ee2d37765e 100644
--- a/SF8P01.ini
+++ b/SF8P01.ini
@@ -14,8 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
\ No newline at end of file
diff --git a/SFWP69.ini b/SFWP69.ini
index 40eaf1269d..5a3d3ab6fe 100644
--- a/SFWP69.ini
+++ b/SFWP69.ini
@@ -7,5 +7,3 @@ EmulationIssues = Lacks HLE Sound
 [ActionReplay] Add action replay cheats here.
 [Video]
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/SILE78.ini b/SILE78.ini
index f399598cb6..63623d77a9 100644
--- a/SILE78.ini
+++ b/SILE78.ini
@@ -16,6 +16,3 @@ PH_ZFar =
 [Gecko]
 [Video_Hardware]
 VSync = False
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
diff --git a/SILP78.ini b/SILP78.ini
index dfd8bf299c..8e01bfa1f4 100644
--- a/SILP78.ini
+++ b/SILP78.ini
@@ -15,7 +15,4 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hardware]
-VSync = False
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+VSync = False
\ No newline at end of file
diff --git a/SK3EEB.ini b/SK3EEB.ini
index cd1026b8da..722ef5f9a3 100644
--- a/SK3EEB.ini
+++ b/SK3EEB.ini
@@ -13,8 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/SMNE01.ini b/SMNE01.ini
index 4e903aa999..3295f5f03f 100644
--- a/SMNE01.ini
+++ b/SMNE01.ini
@@ -37,7 +37,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/SMNJ01.ini b/SMNJ01.ini
index 5e182fc027..b0e7b42a39 100644
--- a/SMNJ01.ini
+++ b/SMNJ01.ini
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/SMNK01.ini b/SMNK01.ini
index b4701e7f9c..d5c04d2142 100644
--- a/SMNK01.ini
+++ b/SMNK01.ini
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/SMNP01.ini b/SMNP01.ini
index f53b9e0f13..bb2ec872f4 100644
--- a/SMNP01.ini
+++ b/SMNP01.ini
@@ -22,9 +22,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
 
diff --git a/SMNW01.ini b/SMNW01.ini
index bf01c022b7..46a6c639e3 100644
--- a/SMNW01.ini
+++ b/SMNW01.ini
@@ -13,7 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/SNJE69.ini b/SNJE69.ini
index fdc2b28e7f..66f52ce2af 100644
--- a/SNJE69.ini
+++ b/SNJE69.ini
@@ -30,7 +30,4 @@ $Time Stop ( - and B Button on/off ) [ZiT]
 04521C84 60000000
 CC000000 00000000
 04521C84 D01D0040
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 
diff --git a/SNJP69.ini b/SNJP69.ini
index 5b87dc2614..17072959cf 100644
--- a/SNJP69.ini
+++ b/SNJP69.ini
@@ -8,6 +8,4 @@ EmulationStateId = 4
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
 
diff --git a/SPTJEB.ini b/SPTJEB.ini
index 3d223c0d5a..94012593be 100644
--- a/SPTJEB.ini
+++ b/SPTJEB.ini
@@ -7,6 +7,4 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
-[Video_Settings]
-SafeTextureCache = True
+[Gecko]
\ No newline at end of file
diff --git a/SPVEA4.ini b/SPVEA4.ini
index f03ffc2272..8bd17cad23 100644
--- a/SPVEA4.ini
+++ b/SPVEA4.ini
@@ -1,7 +1,4 @@
 # SPVEA4 - Pro Evolution Soccer 2011
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SPVPA4.ini b/SPVPA4.ini
index 6b1ebabca9..0e71f5ec9c 100644
--- a/SPVPA4.ini
+++ b/SPVPA4.ini
@@ -1,7 +1,4 @@
 # SPVPA4 - Pro Evolution Soccer 2011
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SPVXA4.ini b/SPVXA4.ini
index b69413e399..dbaf0ec24b 100644
--- a/SPVXA4.ini
+++ b/SPVXA4.ini
@@ -1,7 +1,4 @@
 # SPVXA4 - Pro Evolution Soccer 2011
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SPVYA4.ini b/SPVYA4.ini
index 81b7d14bb4..6ac9001f01 100644
--- a/SPVYA4.ini
+++ b/SPVYA4.ini
@@ -1,7 +1,4 @@
 # SPVYA4 - Pro Evolution Soccer 2011
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/SXCE52.ini b/SXCE52.ini
index b003fc70d3..ad4f06a4a8 100644
--- a/SXCE52.ini
+++ b/SXCE52.ini
@@ -8,7 +8,3 @@ EmulationIssues = Create a quitar profile and use that for controls instead of w
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
diff --git a/SXCP52.ini b/SXCP52.ini
index 29bf6aab48..5cc9846d2a 100644
--- a/SXCP52.ini
+++ b/SXCP52.ini
@@ -8,5 +8,3 @@ EmulationIssues = Create a quitar profile and use that for controls instead of w
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/WF4EGD.ini b/WF4EGD.ini
index 38e0f8875b..96287ccee3 100644
--- a/WF4EGD.ini
+++ b/WF4EGD.ini
@@ -8,5 +8,3 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Video_Settings]
-SafeTextureCache = True
diff --git a/WR9E08.ini b/WR9E08.ini
index b4b24bdb60..291be8f011 100644
--- a/WR9E08.ini
+++ b/WR9E08.ini
@@ -16,6 +16,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-EFBScale = 2
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+EFBScale = 2
\ No newline at end of file
diff --git a/WR9P08.ini b/WR9P08.ini
index b10a3cc2cb..0a3e407888 100644
--- a/WR9P08.ini
+++ b/WR9P08.ini
@@ -16,6 +16,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-EFBScale = 2
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
+EFBScale = 2
\ No newline at end of file
diff --git a/WRXE08.ini b/WRXE08.ini
index 63feb0023c..28b83b32ea 100644
--- a/WRXE08.ini
+++ b/WRXE08.ini
@@ -16,6 +16,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
 EFBScale = 2