diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 83d2e9797..0a16ebeec 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -1845,7 +1845,6 @@
         <ShieldFlashType value="Header"/>
     </CActorAction>
     <CActorBeamSimple id="AP_HellionAttackBeam" parent="GenericAttackBeam">
-        <On Terms="ActorCreation; ValidateUnit AP_HasHighCapacityBarrels" Send="ModelSwap HellionUpgradeAttackBeam"/>
         <On Terms="Effect.InfernalFlameThrowerE.Start; EffectExecuteIndex 24" Send="RefSet ::HostImpact AP_HellionAttackBeamImpactSite"/>
         <On Terms="ActorOrphan" Send="Destroy"/>
         <On Terms="ActorCreation; ValidateUnit AP_HasHellionInfernalPreIgniter" Send="ModelSwap HellionUpgradeAttackBeam"/>
@@ -1857,13 +1856,13 @@
         <HostSiteOps Ops="SOpTargetPoint SOpShadow SOpHeightLaunch"/>
     </CActorSite>
     <CActorModel id="AP_HellionAttackDamageReaction" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; !ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType NotStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; !ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType NotStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachHead SOpForwardCasterCenter"/>
         <Model value="HellionAttackDamageReaction"/>
     </CActorModel>
     <CActorModel id="AP_HellionAttackDamageReactionStructure" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; !ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType IsStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; !ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType IsStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachRandomDamage"/>
         <Model value="SiegeTankSiegedAttackDamage"/>
@@ -1894,13 +1893,13 @@
         <ShieldFlashType value="Header"/>
     </CActorAction>
     <CActorModel id="AP_HellionUpgradedAttackDamageReaction" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType NotStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType NotStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachHead SOpForwardCasterCenter"/>
         <Model value="HellionUpgradedAttackDamageReaction"/>
     </CActorModel>
     <CActorModel id="AP_HellionUpgradedAttackDamageReactionStructure" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType IsStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrower.Start; At Target; ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType IsStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachRandomDamage"/>
         <Model value="HellionUpgradedAttackDamageReactionStructure"/>
@@ -8972,13 +8971,13 @@
         <ImpactMap index="None" Sound="Hellion_AttackImpact"/>
     </CActorAction>
     <CActorModel id="AP_HellionTankAttackFireAddition" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; !ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType NotStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; !ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType NotStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachHead"/>
         <Model value="HellionTankAttackFireAddition"/>
     </CActorModel>
     <CActorModel id="AP_HellionTankAttackFireAdditionStructure" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; !ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType IsStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; !ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType IsStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachRandomDamage"/>
         <Model value="HellionTankAttackFireAddition"/>
@@ -8988,17 +8987,17 @@
         <On Terms="ActorCreation" Send="AnimBracketStart GL_BSD GLbirth GLstand GLdeath"/>
         <On Terms="ActorCreation" Send="TimerSet 0.750000 Kill"/>
         <On Terms="TimerExpired; TimerName Kill" Send="AnimBracketStop BSD"/>
-        <On Terms="ActorCreation; ValidateUnit HasHighCapacityBarrels" Send="ModelSwap HellionTankAttackLaunchUpgraded"/>
+        <On Terms="ActorCreation; ValidateUnit AP_HasHellionInfernalPreIgniter" Send="ModelSwap HellionTankAttackLaunchUpgraded"/>
         <Model value="HellionTankAttackLaunch"/>
     </CActorModel>
     <CActorModel id="AP_HellionTankAttackUpgradedFireAddition" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType NotStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType NotStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachHead"/>
         <Model value="HellionTankAttackUpgradedFireAddition"/>
     </CActorModel>
     <CActorModel id="AP_HellionTankAttackUpgradedFireAdditionStructure" parent="ModelAnimationStyleOneShot">
-        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; ValidateEffect AP_HasHighCapacityBarrels; ValidateUnitType IsStructureTarget" Send="Create"/>
+        <On Terms="Effect.AP_HellionTankDamage.Start; At Target; ValidateEffect AP_HasHellionInfernalPreIgniter; ValidateUnitType IsStructureTarget" Send="Create"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachRandomDamage"/>
         <Model value="HellionTankAttackUpgradedFireAddition"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 28c33d5d3..fa5d59ded 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -192,10 +192,6 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeHoverHellbatCompleteOnly"/>
     </CRequirement>
-    <CRequirement id="AP_UseHighCapacityBarrels">
-        <EditorCategories value="Race:Terran,TechType:Upgrade"/>
-        <NodeArray index="Use" Link="AP_CountUpgradeHighCapacityBarrelsCompleteOnlyTechTreeCheat"/>
-    </CRequirement>
     <CRequirement id="AP_ScavengingSystemsResearched">
         <EditorCategories value="Race:Terran,TechType:Unit"/>
         <NodeArray index="Use" Link="AP_CountUpgradeScavengingSystemsCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index b2a36bcba..cad5a5317 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -165,13 +165,6 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_ClusterBomb" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
-    <CRequirementCountUpgrade id="AP_CountUpgradeHighCapacityBarrelsCompleteOnlyTechTreeCheat">
-        <Count Link="AP_HighCapacityBarrels" State="CompleteOnly"/>
-    </CRequirementCountUpgrade>
-    <CRequirementCountUpgrade id="AP_CountUpgradeHighCapacityBarrelsQueuedOrBetter">
-        <Flags index="TechTreeCheat" value="0"/>
-        <Count Link="AP_HighCapacityBarrels" State="QueuedOrBetter"/>
-    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeHellionCampaignInfernalPreIgniterCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_HellionCampaignInfernalPreIgniter" State="CompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index e76ba1919..8a241cb90 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -2121,16 +2121,6 @@
         <Flags index="UpgradeCheat" value="0"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
     </CUpgrade>
-    <CUpgrade id="AP_HighCapacityBarrels">
-        <Flags index="UpgradeCheat" value="0"/>
-        <Icon value="Assets\Textures\btn-upgrade-terran-infernalpreigniter.dds"/>
-        <Alert value="ResearchComplete"/>
-        <Race value="Terr"/>
-        <ScoreAmount value="300"/>
-        <ScoreResult value="BuildOrder"/>
-        <EffectArray Reference="Effect,AP_InfernalFlameThrower,AttributeBonus[Light]" Value="10.000000"/>
-        <EditorCategories value="Race:Terran,UpgradeType:SpellResearch"/>
-    </CUpgrade>
     <CUpgrade id="AP_TurboChargedEngines">
         <Flags index="UpgradeCheat" value="0"/>
         <Alert value="ResearchComplete_Terr"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index 4447e085c..9946c9da8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -104,11 +104,6 @@
         <Find value="1"/>
         <Value value="AP_NapalmFuelTanksResearched"/>
     </CValidatorPlayerRequirement>
-    <CValidatorPlayerRequirement id="AP_HasHighCapacityBarrels">
-        <WhichPlayer Value="Caster"/>
-        <Find value="1"/>
-        <Value value="AP_UseHighCapacityBarrels"/>
-    </CValidatorPlayerRequirement>
     <CValidatorPlayerRequirement id="AP_HasTwinLinkedFlameThrowers">
         <Find value="1"/>
         <Value value="AP_UseTwinLinkedFlameThrowers"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
index 4a419575a..ea1b7949a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -35397,10 +35397,6 @@ Alert=UpgradeComplete
 id=AP_FirebatStimpack
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
-id=AP_HighCapacityBarrels
-asset=Assets\Textures\btn-upgrade-terran-infernalpreigniter.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Alert=ResearchComplete
 id=AP_TurboChargedEngines
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=ResearchComplete_Terr
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index 258427149..188156434 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -4552,7 +4552,6 @@ Requirement/Name/AP_UseGhostCriusSuit=Use Ghost Crius Suit
 Requirement/Name/AP_UseGhostOcularImplants=Use Ghost Ocular Implants
 Requirement/Name/AP_UseHailstormMissilePods=Use Hellstorm Missile Pods
 Requirement/Name/AP_UseHellionInfernalPreIgniter=Use Hellion Infernal PreIgniter
-Requirement/Name/AP_UseHighCapacityBarrels=Use High Capacity Barrels
 Requirement/Name/AP_UseHiveMindEmulator=Use Hive Mind Emulator
 Requirement/Name/AP_UseIncineratorNozzles=Use Incinerator Nozzles
 Requirement/Name/AP_UseJackhammerConcussiveGrenade=Use Concussive Grenade
@@ -4770,8 +4769,6 @@ RequirementNode/Name/AP_CountUpgradeGhostMoebiusReactorQueuedOrBetter=CountUpgra
 RequirementNode/Name/AP_CountUpgradeGhostSkinJunkerCompleteOnly=CountUpgrade(GhostSkinJunker,CompleteOnly)
 RequirementNode/Name/AP_CountUpgradeHALORocketsCompleteOnly=CountUpgrade(HALORockets,CompleteOnly)
 RequirementNode/Name/AP_CountUpgradeHellionCampaignInfernalPreIgniterCompleteOnly=CountUpgrade(HellionCampaignInfernalPreIgniter,CompleteOnly)
-RequirementNode/Name/AP_CountUpgradeHighCapacityBarrelsCompleteOnlyTechTreeCheat=CountUpgrade(HighCapacityBarrels,CompleteOnly)[TechTreeCheat]
-RequirementNode/Name/AP_CountUpgradeHighCapacityBarrelsQueuedOrBetter=CountUpgrade(HighCapacityBarrels,QueuedOrBetter)
 RequirementNode/Name/AP_CountUpgradeHireDevilDogsPHCompleteOnly=CountUpgrade(HireDevilDogsPH,CompleteOnly)
 RequirementNode/Name/AP_CountUpgradeHireDukesRevengeCompleteOnly=CountUpgrade(HireDukesRevenge,CompleteOnly)
 RequirementNode/Name/AP_CountUpgradeHireDuskWingPHCompleteOnly=CountUpgrade(HireDuskWingPH,CompleteOnly)
@@ -6389,7 +6386,6 @@ Upgrade/EditorPrefix/AP_HALORockets=AP - Story Mode Tech - (Viking)
 Upgrade/EditorPrefix/AP_HailstormMissilePods=AP - Story Mode Tech - (Missile Turret)
 Upgrade/EditorPrefix/AP_HaveCarrier=Void - Tech Unit -
 Upgrade/EditorPrefix/AP_HellionCampaignInfernalPreIgniter=AP - Story Mode Tech - (Hellion)
-Upgrade/EditorPrefix/AP_HighCapacityBarrels=AP - Hellion -
 Upgrade/EditorPrefix/AP_HiveMindEmulator=AP - Story Mode Lab Tech - Build
 Upgrade/EditorPrefix/AP_HotSBanelingCorrosiveBile=AP - Story Mode Tech (Swarm) - Baneling -
 Upgrade/EditorPrefix/AP_HotSBanelingHeal=AP -
@@ -6760,7 +6756,6 @@ Validator/Name/AP_GhostNotHoldingFire=Ghost Not Holding Fire
 Validator/Name/AP_GhostPermanentCloakNotPurchased=Permanent Cloak Not Purchased
 Validator/Name/AP_HALORocketsResearched=HALO Rockets Researched
 Validator/Name/AP_HasHellionInfernalPreIgniter=Has Thermite Filaments
-Validator/Name/AP_HasHighCapacityBarrels=Has High Capacity Barrels
 Validator/Name/AP_HasLiberatorMorphBehavior=Has Liberator Morph Behavior
 Validator/Name/AP_HasNoLiberatorYoink=Has No Liberator Yoink
 Validator/Name/AP_HasShapedBlast=Has Shaped Blast