diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index 8055119..19fa700 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -471,3 +471,59 @@ for _, v in pairs(data.raw.recipe) do
         v.hidden_in_factoriopedia = true
     end
 end
+
+-- GM-VP C 3 QUALITY MODULE,RECIPE,RESEARCH_EFFECT
+-- GM-VP C 5 QUALITY QUALITY,RESEARCH
+-- GM-VP C 6 QUALITY ACHIEVEMENT
+-- GM-VP H 4 QUALITY QUALITY
+-- GM-VP H 4 QUALITY TIPS_AND_TRICKS
+for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
+    if data.raw.technology[v] then
+        data.raw.technology[v].hidden = true
+        data.raw.technology[v].hidden_in_factoriopedia = true
+        data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
+        data.raw.technology[v].effects = {}
+    end
+
+    if data.raw.module[v] then
+        data.raw.module[v].hidden = true
+        data.raw.module[v].hidden_in_factoriopedia = true
+    end
+
+    if data.raw.recipe[v] then
+        data.raw.recipe[v].hidden = true
+        data.raw.recipe[v].hidden_in_factoriopedia = true
+    end
+end
+
+for _, v in pairs({'epic-quality', 'legendary-quality'}) do
+    if data.raw.technology[v] then
+        data.raw.technology[v].hidden = true
+        data.raw.technology[v].hidden_in_factoriopedia = true
+        data.raw.technology[v].unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}}
+        data.raw.technology[v].effects = {}
+    end
+end
+
+for _, v in pairs({'uncommon', 'rare', 'epic', 'legendary'}) do
+    if data.raw.quality[v] then
+        data.raw.quality[v].next = nil
+        data.raw.quality[v].next_probability = nil
+        data.raw.quality[v].hidden = true
+        data.raw.quality[v].hidden_in_factoriopedia = true
+    end
+end
+
+for _, v in pairs({{'produce-achievement', 'crafting-with-quality'}, {'module-transfer-achievement', 'make-it-better'}, {'produce-achievement', 'my-modules-are-legendary'}, {'equip-armor-achievement', 'look-at-my-shiny-rare-armor'}, {'use-item-achievement', 'todays-fish-is-trout-a-la-creme'}, {'place-equipment-achievement', 'no-room-for-more'}}) do
+    if data.raw[v[1]] and data.raw[v[1]][v[2]] then
+        data.raw[v[1]][v[2]].hidden = true
+        data.raw[v[1]][v[2]].hidden_in_factoriopedia = true
+    end
+end
+
+for _, v in pairs({'quality', 'quality-modules', 'quality-factoriopedia', 'quality-probabilities'}) do
+    if data.raw['tips-and-tricks-item'][v] then
+        data.raw['tips-and-tricks-item'][v].hidden = true
+        data.raw['tips-and-tricks-item'][v].hidden_in_factoriopedia = true
+    end
+end
diff --git a/PHI-CL/data/b/sa.lua b/PHI-CL/data/b/sa.lua
index 65b9e37..c2dda6d 100644
--- a/PHI-CL/data/b/sa.lua
+++ b/PHI-CL/data/b/sa.lua
@@ -113,64 +113,6 @@ if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-SPOIL'].v
     end
 end
 
--- SA C 3 SPACE_AGE MODULE,RECIPE,RESEARCH_EFFECT
--- SA C 5 SPACE_AGE QUALITY,RESEARCH
--- SA C 6 SPACE_AGE ACHIEVEMENT
--- SA H 5 SPACE_AGE QUALITY
--- SA H 4 SPACE_AGE TIPS_AND_TRICKS
-if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP') then
-    for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
-        if data.raw.technology[v] then
-            data.raw.technology[v].hidden = true
-            data.raw.technology[v].hidden_in_factoriopedia = true
-            data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
-            data.raw.technology[v].effects = {}
-        end
-
-        if data.raw.module[v] then
-            data.raw.module[v].hidden = true
-            data.raw.module[v].hidden_in_factoriopedia = true
-        end
-
-        if data.raw.recipe[v] then
-            data.raw.recipe[v].hidden = true
-            data.raw.recipe[v].hidden_in_factoriopedia = true
-        end
-    end
-
-    for _, v in pairs({'epic-quality', 'legendary-quality'}) do
-        if data.raw.technology[v] then
-            data.raw.technology[v].hidden = true
-            data.raw.technology[v].hidden_in_factoriopedia = true
-            data.raw.technology[v].unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}}
-            data.raw.technology[v].effects = {}
-        end
-    end
-
-    for _, v in pairs({'normal', 'uncommon', 'rare', 'epic', 'legendary'}) do
-        if data.raw.quality[v] then
-            data.raw.quality[v].next = nil
-            data.raw.quality[v].next_probability = nil
-            data.raw.quality[v].hidden = true
-            data.raw.quality[v].hidden_in_factoriopedia = true
-        end
-    end
-
-    for _, v in pairs({{'produce-achievement', 'crafting-with-quality'}, {'module-transfer-achievement', 'make-it-better'}, {'produce-achievement', 'my-modules-are-legendary'}, {'equip-armor-achievement', 'look-at-my-shiny-rare-armor'}, {'use-item-achievement', 'todays-fish-is-trout-a-la-creme'}, {'place-equipment-achievement', 'no-room-for-more'}}) do
-        if data.raw[v[1]] and data.raw[v[1]][v[2]] then
-            data.raw[v[1]][v[2]].hidden = true
-            data.raw[v[1]][v[2]].hidden_in_factoriopedia = true
-        end
-    end
-
-    for _, v in pairs({'quality', 'quality-modules', 'quality-factoriopedia', 'quality-probabilities'}) do
-        if data.raw['tips-and-tricks-item'][v] then
-            data.raw['tips-and-tricks-item'][v].hidden = true
-            data.raw['tips-and-tricks-item'][v].hidden_in_factoriopedia = true
-        end
-    end
-end
-
 if not settings.startup['PHI-SA'].value then
     return
 end