diff --git a/src/Data/Gems.lua b/src/Data/Gems.lua
index e3b0e26da3..b57cf3d684 100644
--- a/src/Data/Gems.lua
+++ b/src/Data/Gems.lua
@@ -2057,27 +2057,6 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemPhaseRun"] = {
-		name = "Phase Run",
-		baseTypeName = "Phase Run",
-		gameId = "Metadata/Items/Gems/SkillGemPhaseRun",
-		variantId = "PhaseRun",
-		grantedEffectId = "PhaseRun",
-		tags = {
-			dexterity = true,
-			grants_active_skill = true,
-			spell = true,
-			duration = true,
-			movement = true,
-			physical = true,
-			travel = true,
-		},
-		tagString = "Spell, Duration, Movement, Physical, Travel",
-		reqStr = 0,
-		reqDex = 100,
-		reqInt = 0,
-		naturalMaxLevel = 20,
-	},
 	["Metadata/Items/Gems/SkillGemSupportMeleePhysicalDamage"] = {
 		name = "Melee Physical Damage",
 		gameId = "Metadata/Items/Gems/SupportGemMeleePhysicalDamage",
@@ -4174,25 +4153,6 @@ return {
 		reqInt = 40,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemArcticArmour"] = {
-		name = "Arctic Armour",
-		baseTypeName = "Arctic Armour",
-		gameId = "Metadata/Items/Gems/SkillGemArcticArmour",
-		variantId = "ArcticArmour",
-		grantedEffectId = "ArcticArmour",
-		tags = {
-			dexterity = true,
-			grants_active_skill = true,
-			spell = true,
-			duration = true,
-			cold = true,
-		},
-		tagString = "Spell, Duration, Cold",
-		reqStr = 0,
-		reqDex = 60,
-		reqInt = 40,
-		naturalMaxLevel = 20,
-	},
 	["Metadata/Items/Gems/SkillGemVaalArcticArmour"] = {
 		name = "Vaal Arctic Armour",
 		baseTypeName = "Vaal Arctic Armour",
@@ -6327,27 +6287,6 @@ return {
 		reqInt = 100,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemLightningTendrils"] = {
-		name = "Lightning Tendrils",
-		baseTypeName = "Lightning Tendrils",
-		gameId = "Metadata/Items/Gems/SkillGemLightningTendrilsChannelled",
-		variantId = "LightningTendrils",
-		grantedEffectId = "LightningTendrils",
-		tags = {
-			critical = true,
-			intelligence = true,
-			grants_active_skill = true,
-			spell = true,
-			area = true,
-			lightning = true,
-			channelling = true,
-		},
-		tagString = "Critical, Spell, AoE, Lightning, Channelling",
-		reqStr = 0,
-		reqDex = 0,
-		reqInt = 100,
-		naturalMaxLevel = 1,
-	},
 	["Metadata/Items/Gems/SkillGemKineticBlast"] = {
 		name = "Kinetic Blast",
 		baseTypeName = "Kinetic Blast",
diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua
index dc793d934f..f5b5bd10ef 100644
--- a/src/Export/Scripts/skills.lua
+++ b/src/Export/Scripts/skills.lua
@@ -534,6 +534,7 @@ out:write('-- Gem data (c) Grinding Gear Games\n\nreturn {\n')
 for skillGem in dat("SkillGems"):Rows() do
 	for _, gemEffect in ipairs(skillGem.GemVariants) do
 		if gems[gemEffect.Id] then
+			gems[gemEffect.Id] = nil -- Some skills have an additional old version that exists in the game files and messes up transfigured gem matching
 			out:write('\t["', "Metadata/Items/Gems/SkillGem" .. gemEffect.Id, '"] = {\n')
 			out:write('\t\tname = "', fullNameGems[skillGem.BaseItemType.Id] and skillGem.BaseItemType.Name or trueGemNames[gemEffect.Id] or skillGem.BaseItemType.Name:gsub(" Support",""), '",\n')
 			-- Hybrid gems (e.g. Vaal gems) use the display name of the active skill e.g. Vaal Summon Skeletons of Sorcery