diff --git a/forge-gui/res/cardsfolder/l/lightning_runner.txt b/forge-gui/res/cardsfolder/l/lightning_runner.txt
index 06c5f9739a1..0ccb8a22aba 100644
--- a/forge-gui/res/cardsfolder/l/lightning_runner.txt
+++ b/forge-gui/res/cardsfolder/l/lightning_runner.txt
@@ -5,12 +5,9 @@ PT:2/2
 K:Double Strike
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ Whenever CARDNAME attacks, you get {E}{E} (two energy counters), then you may pay {E}{E}{E}{E}{E}{E}{E}{E}. If you pay, untap all creatures you control, and after this phase, there is an additional combat phase.
-SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 | SubAbility$ ResetSVar
-SVar:ResetSVar:DB$ StoreSVar | SVar$ Relentless | Type$ Number | Expression$ 0 | SubAbility$ PayEnergy
-SVar:PayEnergy:DB$ StoreSVar | SVar$ Relentless | Type$ Number | Expression$ 1 | UnlessCost$ PayEnergy<8> | UnlessPayer$ You | UnlessSwitched$ True | SubAbility$ DBUntapAll
-SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat | ConditionCheckSVar$ Relentless | ConditionSVarCompare$ EQ1
-SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat | ConditionCheckSVar$ Relentless | ConditionSVarCompare$ EQ1
-SVar:Relentless:Number$0
+SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 | SubAbility$ DBUntapAll
+SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat | UnlessCost$ PayEnergy<8> | UnlessPayer$ You | UnlessSwitched$ True | UnlessResolveSubs$ WhenPaid | SubAbility$ DBAddCombat
+SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
 SVar:PlayMain1:TRUE 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_runner.jpg
 Oracle:Double strike, haste\nWhenever Lightning Runner attacks, you get {E}{E} (two energy counters), then you may pay {E}{E}{E}{E}{E}{E}{E}{E}. If you pay, untap all creatures you control, and after this phase, there is an additional combat phase.
diff --git a/forge-gui/res/cardsfolder/m/mind_whip.txt b/forge-gui/res/cardsfolder/m/mind_whip.txt
index cf5baf89007..4647353f40b 100644
--- a/forge-gui/res/cardsfolder/m/mind_whip.txt
+++ b/forge-gui/res/cardsfolder/m/mind_whip.txt
@@ -3,11 +3,8 @@ ManaCost:2 B B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ DBPay | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may pay {3}. If they don't, CARDNAME deals 2 damage to that player and you tap that creature.
-SVar:DBPay:DB$ StoreSVar | SVar$ Paid | Type$ Number | Expression$ 0 | UnlessCost$ 3 | UnlessPayer$ TriggeredPlayer | SubAbility$ DBTap
-SVar:DBTap:DB$ Tap | Defined$ Enchanted | ConditionCheckSVar$ Paid | ConditionSVarCompare$ EQ0 | References$ Paid | SubAbility$ DBDmg
-SVar:DBDmg:DB$DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2 | ConditionCheckSVar$ Paid | ConditionSVarCompare$ EQ0 | References$ Paid | SubAbility$ DBReset
-SVar:DBReset:DB$ StoreSVar | SVar$ Paid | Type$ Number | Expression$ 1 | References$ Paid
-SVar:Paid:Number$1
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may pay {3}. If they don't, CARDNAME deals 2 damage to that player and you tap that creature.
+SVar:TrigDmg:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2 | UnlessCost$ 3 | UnlessPayer$ TriggeredPlayer | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBTap
+SVar:DBTap:DB$ Tap | Defined$ Enchanted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_whip.jpg
 Oracle:Enchant creature\nAt the beginning of the upkeep of enchanted creature's controller, that player may pay {3}. If they don't, Mind Whip deals 2 damage to that player and you tap that creature.
diff --git a/forge-gui/res/cardsfolder/p/primordial_ooze.txt b/forge-gui/res/cardsfolder/p/primordial_ooze.txt
index 0fc931b6052..91957fa1e03 100644
--- a/forge-gui/res/cardsfolder/p/primordial_ooze.txt
+++ b/forge-gui/res/cardsfolder/p/primordial_ooze.txt
@@ -4,13 +4,10 @@ Types:Creature Ooze
 PT:1/1
 K:CARDNAME attacks each combat if able.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a +1/+1 counter on CARDNAME. Then you may pay {X}, where X is the number of +1/+1 counters on it. If you don't, tap CARDNAME and it deals X damage to you.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPay
-SVar:DBPay:DB$ StoreSVar | SVar$ PrimordialPaid | Type$ CountSVar | Expression$ PrimordialPaid/Plus.1 | UnlessCost$ X | UnlessPayer$ You | SubAbility$ DBTap | References$ X
-SVar:DBTap:DB$ Tap | Defined$ Self | ConditionCheckSVar$ PrimordialPaid | ConditionSVarCompare$ EQ1 | SubAbility$ DBDmg
-SVar:DBDmg:DB$ DealDamage | NumDmg$ X | Defined$ You | References$ X | ConditionCheckSVar$ PrimordialPaid | ConditionSVarCompare$ EQ1 | SubAbility$ DBReset
-SVar:DBReset:DB$ StoreSVar | SVar$ PrimordialPaid | Type$ Number | Expression$ 0
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBTap
+SVar:DBTap:DB$ Tap | Defined$ Self | UnlessCost$ X | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBDmg | References$ X
+SVar:DBDmg:DB$ DealDamage | NumDmg$ X | Defined$ You | References$ X
 SVar:X:Count$CardCounters.P1P1
-SVar:PrimordialPaid:Number$0
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/primordial_ooze.jpg
 Oracle:Primordial Ooze attacks each combat if able.\nAt the beginning of your upkeep, put a +1/+1 counter on Primordial Ooze. Then you may pay {X}, where X is the number of +1/+1 counters on it. If you don't, tap Primordial Ooze and it deals X damage to you.
diff --git a/forge-gui/res/cardsfolder/r/rhystic_syphon.txt b/forge-gui/res/cardsfolder/r/rhystic_syphon.txt
index 3aea19dec6f..1b949177cba 100644
--- a/forge-gui/res/cardsfolder/r/rhystic_syphon.txt
+++ b/forge-gui/res/cardsfolder/r/rhystic_syphon.txt
@@ -1,10 +1,6 @@
 Name:Rhystic Syphon
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ StoreSVar | Cost$ 3 B B | ValidTgts$ Player | TgtPrompt$ Target a player to lose life | SVar$ SyphonPaid | Type$ CountSVar | Expression$ SyphonPaid/Plus.1 | UnlessCost$ 3 | UnlessPayer$ Targeted | SubAbility$ DBLoseLife | SpellDescription$ Unless target player pays {3}, they lose 5 life and you gain 5 life.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 5 | Defined$ Targeted | SubAbility$ DBGainLife | ConditionCheckSVar$ SyphonPaid | ConditionSVarCompare$ EQ1
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 5 | ConditionCheckSVar$ SyphonPaid | ConditionSVarCompare$ EQ1 | SubAbility$ DBReset
-SVar:DBReset:DB$ StoreSVar | SVar$ SyphonPaid | Type$ Number | Expression$ 0
-SVar:SyphonPaid:Number$0
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rhystic_syphon.jpg
+A:SP$ LoseLife | Cost$ 3 B B | LifeAmount$ 5 | ValidTgts$ Player | TgtPrompt$ Target a player to lose life | SubAbility$ DBGainLife | UnlessCost$ 3 | UnlessPayer$ Targeted | UnlessResolveSubs$ WhenNotPaid | SpellDescription$ Unless target player pays {3}, they lose 5 life and you gain 5 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 5
 Oracle:Unless target player pays {3}, they lose 5 life and you gain 5 life.
diff --git a/forge-gui/res/cardsfolder/r/rogue_skycaptain.txt b/forge-gui/res/cardsfolder/r/rogue_skycaptain.txt
index 6dcceda0b27..58d3a2f3d4b 100644
--- a/forge-gui/res/cardsfolder/r/rogue_skycaptain.txt
+++ b/forge-gui/res/cardsfolder/r/rogue_skycaptain.txt
@@ -4,13 +4,11 @@ Types:Creature Human Rogue Mercenary
 PT:3/4
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a wage counter on CARDNAME. You may pay {2} for each wage counter on it. If you don't, remove all wage counters from CARDNAME and an opponent gains control of it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ WAGE | CounterNum$ 1 | SubAbility$ DBStoreSVar
-SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckPaid | Type$ Number | Expression$ 1 | UnlessCost$ X | UnlessPayer$ You | References$ X,CheckPaid | StackDescription$ remove all wage counters from this card and an opponent gains control of it. | SubAbility$ DBRemoveCounter
-SVar:DBRemoveCounter:DB$ RemoveCounter | CounterNum$ All | CounterType$ WAGE | Defined$ Self | SubAbility$ DBChooseOpp | ConditionCheckSVar$ CheckPaid | ConditionSVarCompare$ EQ1 | References$ CheckPaid
-SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ DBDonate | ConditionCheckSVar$ CheckPaid | ConditionSVarCompare$ EQ1 | References$ CheckPaid
-SVar:DBDonate:DB$ GainControl | Defined$ Self | NewController$ Player.Chosen | ConditionCheckSVar$ CheckPaid | ConditionSVarCompare$ EQ1 | References$ CheckPaid | SubAbility$ DBReset
-SVar:DBReset:DB$ StoreSVar | SVar$ CheckPaid | Type$ Number | Expression$ 0
-SVar:CheckPaid:Number$0
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ WAGE | CounterNum$ 1 | SubAbility$ DBRemoveCounter
+SVar:DBRemoveCounter:DB$ RemoveCounter | CounterNum$ All | CounterType$ WAGE | Defined$ Self | UnlessCost$ X | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | References$ X | SubAbility$ DBChooseOpp
+SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ DBDonate
+SVar:DBDonate:DB$ GainControl | Defined$ Self | NewController$ Player.Chosen | SubAbility$ DBReset
+SVar:DBReset:DB$ Cleanup | ClearChosenPlayer$ True
 SVar:X:Count$CardCounters.WAGE/Twice
 AI:RemoveDeck:All
 AI:RemoveDeck:Random