diff --git a/forge-gui/res/cardsfolder/a/aether_charge.txt b/forge-gui/res/cardsfolder/a/aether_charge.txt
index e71039521ab..ae695a1ad88 100644
--- a/forge-gui/res/cardsfolder/a/aether_charge.txt
+++ b/forge-gui/res/cardsfolder/a/aether_charge.txt
@@ -2,6 +2,6 @@ Name:Aether Charge
 ManaCost:4 R
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Beast.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent or planeswalker.
-SVar:TrigDealDamage:DB$ DealDamage | DamageSource$ TriggeredCard | ValidTgts$ Opponent,Planeswalker | NumDmg$ 4
+SVar:TrigDealDamage:DB$ DealDamage | DamageSource$ TriggeredCardLKICopy | ValidTgts$ Opponent,Planeswalker | NumDmg$ 4
 AI:RemoveDeck:Random
 Oracle:Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent or planeswalker.
diff --git a/forge-gui/res/cardsfolder/a/afterlife.txt b/forge-gui/res/cardsfolder/a/afterlife.txt
index 88967e57f82..54475162e11 100644
--- a/forge-gui/res/cardsfolder/a/afterlife.txt
+++ b/forge-gui/res/cardsfolder/a/afterlife.txt
@@ -1,8 +1,7 @@
 Name:Afterlife
 ManaCost:2 W
 Types:Instant
-A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. It can't be regenerated.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ RememberedController | SubAbility$ DBCleanup | SpellDescription$ Its controller creates a 1/1 white Spirit creature token with flying.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. It can't be regenerated.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ TargetedController | SpellDescription$ Its controller creates a 1/1 white Spirit creature token with flying.
 DeckHas:Ability$Token
 Oracle:Destroy target creature. It can't be regenerated. Its controller creates a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt b/forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt
index 2a7b656727c..ce5cae1a597 100644
--- a/forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt
@@ -4,9 +4,8 @@ Types:Legendary Planeswalker Ajani
 Loyalty:5
 A:AB$ GainLife | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | LifeAmount$ 2 | SubAbility$ DBPutCounter | SpellDescription$ You gain 2 life. Put two +1/+1 counters on up to one target creature.
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target creature | ValidTgts$ Creature
-A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target creature. Its controller gains 2 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target creature. Its controller gains 2 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ 2
 A:AB$ PumpAll | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | KW$ Flying & Double Strike | SpellDescription$ Creatures you control gain flying and double strike until end of turn.
 DeckHas:Ability$Counters|LifeGain
 Oracle:[+2]: You gain 2 life. Put two +1/+1 counters on up to one target creature.\n[-3]: Exile target creature. Its controller gains 2 life.\n[-10]: Creatures you control gain flying and double strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/angelic_ascension.txt b/forge-gui/res/cardsfolder/a/angelic_ascension.txt
index a68efb4d436..565ccdab87f 100644
--- a/forge-gui/res/cardsfolder/a/angelic_ascension.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_ascension.txt
@@ -1,8 +1,7 @@
 Name:Angelic Ascension
 ManaCost:1 W
 Types:Instant
-A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature or planeswalker. Its controller creates a 4/4 white Angel creature token with flying.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_4_4_angel_flying | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature or planeswalker. Its controller creates a 4/4 white Angel creature token with flying.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_4_4_angel_flying | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 Oracle:Exile target creature or planeswalker. Its controller creates a 4/4 white Angel creature token with flying.
diff --git a/forge-gui/res/cardsfolder/a/assassins_strike.txt b/forge-gui/res/cardsfolder/a/assassins_strike.txt
index 77dcd00be89..afddb94e1d2 100644
--- a/forge-gui/res/cardsfolder/a/assassins_strike.txt
+++ b/forge-gui/res/cardsfolder/a/assassins_strike.txt
@@ -1,7 +1,6 @@
 Name:Assassin's Strike
 ManaCost:4 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDiscard | SpellDescription$ Destroy target creature. Its controller discards a card.
-SVar:DBDiscard:DB$ Discard | Defined$ RememberedController | Mode$ TgtChoose | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDiscard | SpellDescription$ Destroy target creature. Its controller discards a card.
+SVar:DBDiscard:DB$ Discard | Defined$ TargetedController | Mode$ TgtChoose
 Oracle:Destroy target creature. Its controller discards a card.
diff --git a/forge-gui/res/cardsfolder/a/assassins_trophy.txt b/forge-gui/res/cardsfolder/a/assassins_trophy.txt
index 6c8eb4b394b..167e0963edf 100644
--- a/forge-gui/res/cardsfolder/a/assassins_trophy.txt
+++ b/forge-gui/res/cardsfolder/a/assassins_trophy.txt
@@ -1,7 +1,6 @@
 Name:Assassin's Trophy
 ManaCost:B G
 Types:Instant
-A:SP$ Destroy | Cost$ B G | ValidTgts$ Permanent.OppCtrl | AITgts$ Permanent.nonLand,Land.nonBasic | TgtPrompt$ Select target permanent an opponent controls | SubAbility$ DBChange | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target permanent an opponent controls. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ RememberedController | ShuffleNonMandatory$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ B G | ValidTgts$ Permanent.OppCtrl | AITgts$ Permanent.nonLand,Land.nonBasic | TgtPrompt$ Select target permanent an opponent controls | SubAbility$ DBChange | SpellDescription$ Destroy target permanent an opponent controls. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 Oracle:Destroy target permanent an opponent controls. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/a/avenger_en_dal.txt b/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
index 09d9d5e940b..d72a4c2a322 100644
--- a/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
+++ b/forge-gui/res/cardsfolder/a/avenger_en_dal.txt
@@ -2,10 +2,9 @@ Name:Avenger en-Dal
 ManaCost:1 W
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target attacking creature.
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup | SpellDescription$ Its controller gains life equal to its toughness.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardToughness
+A:AB$ ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target attacking creature.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X | SpellDescription$ Its controller gains life equal to its toughness.
+SVar:X:Targeted$CardToughness
 SVar:AIPreference:DiscardCost$Card
 AI:RemoveDeck:Random
 DeckHas:Ability$Discard
diff --git a/forge-gui/res/cardsfolder/b/barbed_foliage.txt b/forge-gui/res/cardsfolder/b/barbed_foliage.txt
index 6ba2a78a9c8..a08f2c33ac1 100644
--- a/forge-gui/res/cardsfolder/b/barbed_foliage.txt
+++ b/forge-gui/res/cardsfolder/b/barbed_foliage.txt
@@ -4,5 +4,5 @@ Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | Execute$ TrigDebuff | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature attacks you, it loses flanking until end of turn.
 SVar:TrigDebuff:DB$ Debuff | Defined$ TriggeredAttackerLKICopy | Keywords$ Flanking
 T:Mode$ Attacks | ValidCard$ Creature.withoutFlying | Attacked$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature without flying attacks you, CARDNAME deals 1 damage to it.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredAttacker
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredAttackerLKICopy
 Oracle:Whenever a creature attacks you, it loses flanking until end of turn.\nWhenever a creature without flying attacks you, Barbed Foliage deals 1 damage to it.
diff --git a/forge-gui/res/cardsfolder/b/beast_within.txt b/forge-gui/res/cardsfolder/b/beast_within.txt
index e9b9aded0f1..e5a5b0df4a5 100644
--- a/forge-gui/res/cardsfolder/b/beast_within.txt
+++ b/forge-gui/res/cardsfolder/b/beast_within.txt
@@ -1,9 +1,8 @@
 Name:Beast Within
 ManaCost:2 G
 Types:Instant
-A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Beast creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Beast creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 AI:RemoveDeck:All
 Oracle:Destroy target permanent. Its controller creates a 3/3 green Beast creature token.
diff --git a/forge-gui/res/cardsfolder/b/buy_your_silence.txt b/forge-gui/res/cardsfolder/b/buy_your_silence.txt
index 50bb8b81596..68e3f371cbb 100644
--- a/forge-gui/res/cardsfolder/b/buy_your_silence.txt
+++ b/forge-gui/res/cardsfolder/b/buy_your_silence.txt
@@ -1,8 +1,7 @@
 Name:Buy Your Silence
 ManaCost:4 W
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 4 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TgtPromt$ Select target nonland permanent | RememberLKI$ True | SubAbility$ DBTreasure | StackDescription$ SpellDescription | SpellDescription$ Exile target nonland permanent. Its controller creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
-SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TgtPromt$ Select target nonland permanent | SubAbility$ DBTreasure | StackDescription$ SpellDescription | SpellDescription$ Exile target nonland permanent. Its controller creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ TargetedController
 DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact
 Oracle:Exile target nonland permanent. Its controller creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt b/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
index 4c237ab4fa4..73e6febe247 100644
--- a/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
+++ b/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
@@ -4,9 +4,8 @@ Types:Creature Elemental Knight
 PT:4/6
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.
-SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand | AlwaysRemember$ True | RememberLKI$ True | TgtPrompt$ Select target nonland permanent | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_3_3_a_golem | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_3_3_a_golem | TokenOwner$ TargetedController
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, return target artifact or enchantment card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.YouCtrl,Enchantment.YouCtrl
 Oracle:Vigilance\nWhen Cavalier of Dawn enters the battlefield, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.\nWhen Cavalier of Dawn dies, return target artifact or enchantment card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/certain_death.txt b/forge-gui/res/cardsfolder/c/certain_death.txt
index dd49dd7fbdf..80de5e61bc4 100644
--- a/forge-gui/res/cardsfolder/c/certain_death.txt
+++ b/forge-gui/res/cardsfolder/c/certain_death.txt
@@ -1,8 +1,7 @@
 Name:Certain Death
 ManaCost:5 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 5 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses 2 life and you gain 2 life.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 5 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses 2 life and you gain 2 life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 Oracle:Destroy target creature. Its controller loses 2 life and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/c/choking_sands.txt b/forge-gui/res/cardsfolder/c/choking_sands.txt
index 938ab07512b..fd02a9002c9 100644
--- a/forge-gui/res/cardsfolder/c/choking_sands.txt
+++ b/forge-gui/res/cardsfolder/c/choking_sands.txt
@@ -1,7 +1,6 @@
 Name:Choking Sands
 ManaCost:1 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 1 B B | ValidTgts$ Land.nonSwamp | TgtPrompt$ Select target non-Swamp land | RememberLKI$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target non-Swamp land. If that land was nonbasic, CARDNAME deals 2 damage to the land's controller.
-SVar:DBDamage:DB$ DealDamage | Defined$ RememberedController | NumDmg$ 2 | ConditionDefined$ RememberedLKI | ConditionPresent$ Land.Basic | ConditionCompare$ EQ0 | ConditionDescription$ If that land is nonbasic, | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 B B | ValidTgts$ Land.nonSwamp | TgtPrompt$ Select target non-Swamp land | SubAbility$ DBDamage | SpellDescription$ Destroy target non-Swamp land. If that land was nonbasic, CARDNAME deals 2 damage to the land's controller.
+SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionDefined$ Targeted | ConditionPresent$ Land.Basic | ConditionCompare$ EQ0 | ConditionDescription$ If that land is nonbasic,
 Oracle:Destroy target non-Swamp land. If that land was nonbasic, Choking Sands deals 2 damage to the land's controller.
diff --git a/forge-gui/res/cardsfolder/c/cityscape_leveler.txt b/forge-gui/res/cardsfolder/c/cityscape_leveler.txt
index 04bbd8ccd7f..aa0d914f078 100644
--- a/forge-gui/res/cardsfolder/c/cityscape_leveler.txt
+++ b/forge-gui/res/cardsfolder/c/cityscape_leveler.txt
@@ -5,9 +5,8 @@ PT:8/8
 K:Trample
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When you cast this spell and whenever CARDNAME attacks, destroy up to one target nonland permanent. Its controller creates a tapped Powerstone token.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | Secondary$ True | TriggerDescription$ When you cast this spell and whenever CARDNAME attacks, destroy up to one target nonland permanent. Its controller creates a tapped Powerstone token.
-SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonland | TgtPrompt$ Select up to one target nonland permanent | RememberLKI$ True | AlwaysRemember$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonland | TgtPrompt$ Select up to one target nonland permanent | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone | TokenOwner$ TargetedController
 K:Unearth:8
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Graveyard|Token
diff --git a/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt b/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
index da9b00b78f0..c5d42aecea4 100644
--- a/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
+++ b/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
@@ -1,8 +1,7 @@
 Name:Cleansing Wildfire
 ManaCost:1 R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 1 R | ValidTgts$ Land | TgtPrompt$ Select target land | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ RememberedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw | StackDescription$ Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library.
-SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBCleanup | SpellDescription$ Draw a card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw | StackDescription$ Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library.
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/c/condemn.txt b/forge-gui/res/cardsfolder/c/condemn.txt
index 153b2b66ad7..3b2ee2987ce 100644
--- a/forge-gui/res/cardsfolder/c/condemn.txt
+++ b/forge-gui/res/cardsfolder/c/condemn.txt
@@ -1,8 +1,7 @@
 Name:Condemn
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | RememberLKI$ True | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBGainLife | SpellDescription$ Put target attacking creature on the bottom of its owner's library.
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup | SpellDescription$ Its controller gains life equal to its toughness.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardToughness
+A:SP$ ChangeZone | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBGainLife | SpellDescription$ Put target attacking creature on the bottom of its owner's library.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X | SpellDescription$ Its controller gains life equal to its toughness.
+SVar:X:Targeted$CardToughness
 Oracle:Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness.
diff --git a/forge-gui/res/cardsfolder/c/contraband_livestock.txt b/forge-gui/res/cardsfolder/c/contraband_livestock.txt
index dd0c164a4a4..21b4fec0748 100644
--- a/forge-gui/res/cardsfolder/c/contraband_livestock.txt
+++ b/forge-gui/res/cardsfolder/c/contraband_livestock.txt
@@ -1,12 +1,11 @@
 Name:Contraband Livestock
 ManaCost:1 W
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select a target creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBRollDice | AILogic$ Pongify | StackDescription$ SpellDescription | SpellDescription$ Exile target creature,
-SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:GreenOx,10-19:GreenBoar,20:WhiteGoat | SubAbility$ DBCleanup | SpellDescription$ then roll a d20.
-SVar:GreenOx:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_ox | TokenOwner$ RememberedController | SpellDescription$ 1-9 VERT Its controller creates a 4/4 green Ox creature token.
-SVar:GreenBoar:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_boar | TokenOwner$ RememberedController | SpellDescription$ 10-19 VERT Its controller creates a 2/2 green Boar creature token.
-SVar:WhiteGoat:DB$ Token | TokenAmount$ 1 | TokenScript$ w_0_1_goat | TokenOwner$ RememberedController | SpellDescription$ 20 VERT Its controller creates a 0/1 white Goat creature token.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select a target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBRollDice | AILogic$ Pongify | StackDescription$ SpellDescription | SpellDescription$ Exile target creature,
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:GreenOx,10-19:GreenBoar,20:WhiteGoat | SpellDescription$ then roll a d20.
+SVar:GreenOx:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_ox | TokenOwner$ TargetedController | SpellDescription$ 1-9 VERT Its controller creates a 4/4 green Ox creature token.
+SVar:GreenBoar:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_boar | TokenOwner$ TargetedController | SpellDescription$ 10-19 VERT Its controller creates a 2/2 green Boar creature token.
+SVar:WhiteGoat:DB$ Token | TokenAmount$ 1 | TokenScript$ w_0_1_goat | TokenOwner$ TargetedController | SpellDescription$ 20 VERT Its controller creates a 0/1 white Goat creature token.
 DeckHas:Ability$Token
 AI:RemoveDeck:All
 Oracle:Exile target creature, then roll a d20.\n1-9 | Its controller creates a 4/4 green Ox creature token.\n10-19 | Its controller creates a 2/2 green Boar creature token.\n20 | Its controller creates a 0/1 white Goat creature token.
diff --git a/forge-gui/res/cardsfolder/c/crib_swap.txt b/forge-gui/res/cardsfolder/c/crib_swap.txt
index 55914fe5f5b..a57963a0226 100644
--- a/forge-gui/res/cardsfolder/c/crib_swap.txt
+++ b/forge-gui/res/cardsfolder/c/crib_swap.txt
@@ -2,7 +2,6 @@ Name:Crib Swap
 ManaCost:2 W
 Types:Tribal Instant Shapeshifter
 K:Changeling
-A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | IsCurse$ True | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_shapeshifter_changeling | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | IsCurse$ True | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_shapeshifter_changeling | TokenOwner$ TargetedController
 Oracle:Changeling (This card is every creature type.)\nExile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
diff --git a/forge-gui/res/cardsfolder/c/crumble.txt b/forge-gui/res/cardsfolder/c/crumble.txt
index 37c673b2209..6480c7bdc26 100644
--- a/forge-gui/res/cardsfolder/c/crumble.txt
+++ b/forge-gui/res/cardsfolder/c/crumble.txt
@@ -1,9 +1,8 @@
 Name:Crumble
 ManaCost:G
 Types:Instant
-A:SP$ Destroy | ValidTgts$ Artifact | NoRegen$ True | SubAbility$ DBGainLife | RememberLKI$ True | SpellDescription$ Destroy target artifact. It can't be regenerated.
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup | SpellDescription$ That artifact's controller gains life equal to its mana value.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardManaCost
+A:SP$ Destroy | ValidTgts$ Artifact | NoRegen$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact. It can't be regenerated.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X | SpellDescription$ That artifact's controller gains life equal to its mana value.
+SVar:X:Targeted$CardManaCost
 AI:RemoveDeck:Random
 Oracle:Destroy target artifact. It can't be regenerated. That artifact's controller gains life equal to its mana value.
diff --git a/forge-gui/res/cardsfolder/d/death_bomb.txt b/forge-gui/res/cardsfolder/d/death_bomb.txt
index 57c56aea066..ecbe22abdef 100644
--- a/forge-gui/res/cardsfolder/d/death_bomb.txt
+++ b/forge-gui/res/cardsfolder/d/death_bomb.txt
@@ -1,8 +1,7 @@
 Name:Death Bomb
 ManaCost:3 B
 Types:Instant
-A:SP$ Destroy | Cost$ 3 B Sac<1/Creature/creature> | ValidTgts$ Creature.nonBlack | NoRegen$ True | AlwaysRemember$ True | RememberLKI$ True | TgtPrompt$ Select target nonblack creature | SubAbility$ DBDrain | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 3 B Sac<1/Creature/creature> | ValidTgts$ Creature.nonBlack | NoRegen$ True | TgtPrompt$ Select target nonblack creature | SubAbility$ DBDrain | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2
 AI:RemoveDeck:All
 Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDestroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/d/desecrated_earth.txt b/forge-gui/res/cardsfolder/d/desecrated_earth.txt
index 77eb191f8be..ab104c057bd 100644
--- a/forge-gui/res/cardsfolder/d/desecrated_earth.txt
+++ b/forge-gui/res/cardsfolder/d/desecrated_earth.txt
@@ -1,7 +1,6 @@
 Name:Desecrated Earth
 ManaCost:4 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDiscard | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target land. Its controller discards a card.
-SVar:DBDiscard:DB$ Discard | Defined$ RememberedController | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDiscard | SpellDescription$ Destroy target land. Its controller discards a card.
+SVar:DBDiscard:DB$ Discard | Defined$ TargetedController | NumCards$ 1 | Mode$ TgtChoose
 Oracle:Destroy target land. Its controller discards a card.
diff --git a/forge-gui/res/cardsfolder/d/despoil.txt b/forge-gui/res/cardsfolder/d/despoil.txt
index 74bf9c8dce4..9847890ef60 100644
--- a/forge-gui/res/cardsfolder/d/despoil.txt
+++ b/forge-gui/res/cardsfolder/d/despoil.txt
@@ -1,7 +1,6 @@
 Name:Despoil
 ManaCost:3 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 3 B | ValidTgts$ Land | TgtPrompt$ Select target land | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDrain | SpellDescription$ Destroy target land. Its controller loses 2 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 3 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDrain | SpellDescription$ Destroy target land. Its controller loses 2 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2
 Oracle:Destroy target land. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/d/destroy_the_evidence.txt b/forge-gui/res/cardsfolder/d/destroy_the_evidence.txt
index 8544bfbc300..a9ce1f8037f 100644
--- a/forge-gui/res/cardsfolder/d/destroy_the_evidence.txt
+++ b/forge-gui/res/cardsfolder/d/destroy_the_evidence.txt
@@ -1,7 +1,6 @@
 Name:Destroy the Evidence
 ManaCost:4 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDigUntil | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target land. Its controller reveals cards from the top of their library until they reveal a land card, then puts those cards into their graveyard.
-SVar:DBDigUntil:DB$ DigUntil | Defined$ RememberedController | Valid$ Land | ValidDescription$ land | RevealedDestination$ Graveyard | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDigUntil | SpellDescription$ Destroy target land. Its controller reveals cards from the top of their library until they reveal a land card, then puts those cards into their graveyard.
+SVar:DBDigUntil:DB$ DigUntil | Defined$ TargetedController | Valid$ Land | ValidDescription$ land | RevealedDestination$ Graveyard
 Oracle:Destroy target land. Its controller reveals cards from the top of their library until they reveal a land card, then puts those cards into their graveyard.
diff --git a/forge-gui/res/cardsfolder/d/dire_tactics.txt b/forge-gui/res/cardsfolder/d/dire_tactics.txt
index fb847a4ba3d..4642e570447 100644
--- a/forge-gui/res/cardsfolder/d/dire_tactics.txt
+++ b/forge-gui/res/cardsfolder/d/dire_tactics.txt
@@ -1,8 +1,7 @@
 Name:Dire Tactics
 ManaCost:W B
 Types:Instant
-A:SP$ ChangeZone | Cost$ W B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBLoseLife | StackDescription$ SpellDescription | SpellDescription$ Exile target creature. If you don't control a Human, you lose life equal to that creature's toughness.
-SVar:DBLoseLife:DB$ LoseLife | ConditionPresent$ Human.YouCtrl | ConditionCompare$ EQ0 | Defined$ You | LifeAmount$ X | StackDescription$ None | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardToughness
+A:SP$ ChangeZone | Cost$ W B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBLoseLife | StackDescription$ SpellDescription | SpellDescription$ Exile target creature. If you don't control a Human, you lose life equal to that creature's toughness.
+SVar:DBLoseLife:DB$ LoseLife | ConditionPresent$ Human.YouCtrl | ConditionCompare$ EQ0 | Defined$ You | LifeAmount$ X | StackDescription$ None
+SVar:X:Targeted$CardToughness
 Oracle:Exile target creature. If you don't control a Human, you lose life equal to that creature's toughness.
diff --git a/forge-gui/res/cardsfolder/d/dismantle.txt b/forge-gui/res/cardsfolder/d/dismantle.txt
index 7f0ab22e326..7de042250a0 100644
--- a/forge-gui/res/cardsfolder/d/dismantle.txt
+++ b/forge-gui/res/cardsfolder/d/dismantle.txt
@@ -1,7 +1,7 @@
 Name:Dismantle
 ManaCost:2 R
 Types:Sorcery
-A:SP$ Destroy | ValidTgts$ Artifact | SubAbility$ DBPutCounter | RememberLKI$ True | SpellDescription$ Destroy target artifact.
-SVar:DBPutCounter:DB$ PutCounter | Choices$ Artifact.YouCtrl | CounterType$ P1P1,CHARGE | CounterNum$ X | CounterTypePerDefined$ True | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.HasCounters | SpellDescription$ If that artifact had counters on it, put that many +1/+1 counters or charge counters on an artifact you control.
-SVar:X:RememberedLKI$CardCounters.ALL
+A:SP$ Destroy | ValidTgts$ Artifact | SubAbility$ DBPutCounter | SpellDescription$ Destroy target artifact.
+SVar:DBPutCounter:DB$ PutCounter | Choices$ Artifact.YouCtrl | CounterType$ P1P1,CHARGE | CounterNum$ X | ConditionDefined$ Targeted | ConditionPresent$ Card.HasCounters | SpellDescription$ If that artifact had counters on it, put that many +1/+1 counters or charge counters on an artifact you control.
+SVar:X:Targeted$CardCounters.ALL
 Oracle:Destroy target artifact. If that artifact had counters on it, put that many +1/+1 counters or charge counters on an artifact you control.
diff --git a/forge-gui/res/cardsfolder/e/electropotence.txt b/forge-gui/res/cardsfolder/e/electropotence.txt
index dff7af11bfb..ad6831b354b 100644
--- a/forge-gui/res/cardsfolder/e/electropotence.txt
+++ b/forge-gui/res/cardsfolder/e/electropotence.txt
@@ -2,6 +2,6 @@ Name:Electropotence
 ManaCost:2 R
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to any target.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 2 R | ValidTgts$ Any | DamageSource$ TriggeredCard | NumDmg$ Damage
+SVar:TrigDamage:AB$ DealDamage | Cost$ 2 R | ValidTgts$ Any | DamageSource$ TriggeredCardLKICopy | NumDmg$ Damage
 SVar:Damage:TriggeredCard$CardPower
 Oracle:Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to any target.
diff --git a/forge-gui/res/cardsfolder/e/excavation_technique.txt b/forge-gui/res/cardsfolder/e/excavation_technique.txt
index 0c686cff105..8e9e5507aae 100644
--- a/forge-gui/res/cardsfolder/e/excavation_technique.txt
+++ b/forge-gui/res/cardsfolder/e/excavation_technique.txt
@@ -2,8 +2,7 @@ Name:Excavation Technique
 ManaCost:3 W
 Types:Sorcery
 K:Demonstrate
-A:SP$ Destroy | Cost$ 3 W | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target nonland permanent.
-SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ RememberedController | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ Its controller creates two Treasure tokens.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 3 W | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBToken | SpellDescription$ Destroy target nonland permanent.
+SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ TargetedController | StackDescription$ SpellDescription | SpellDescription$ Its controller creates two Treasure tokens.
 DeckHas:Ability$Token
 Oracle:Demonstrate (When you cast this spell, you may copy it. If you do, choose an opponent to also copy it. Players may choose new targets for their copies.)\nDestroy target nonland permanent. Its controller creates two Treasure tokens.
diff --git a/forge-gui/res/cardsfolder/e/excise_the_imperfect.txt b/forge-gui/res/cardsfolder/e/excise_the_imperfect.txt
index 6898fa62068..27f961cfff6 100644
--- a/forge-gui/res/cardsfolder/e/excise_the_imperfect.txt
+++ b/forge-gui/res/cardsfolder/e/excise_the_imperfect.txt
@@ -1,9 +1,8 @@
 Name:Excise the Imperfect
 ManaCost:1 W W
 Types:Instant
-A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | RememberLKI$ True | SubAbility$ DBIncubate | SpellDescription$ Exile target nonland permanent.
-SVar:DBIncubate:DB$ Incubate | Defined$ RememberedLKIController | Amount$ X | SubAbility$ DBCleanup | SpellDescription$ Its controller incubates X, where X is its mana value. (They create an Incubator token with X +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardManaCost
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBIncubate | SpellDescription$ Exile target nonland permanent.
+SVar:DBIncubate:DB$ Incubate | Defined$ TargetedController | Amount$ X | SpellDescription$ Its controller incubates X, where X is its mana value. (They create an Incubator token with X +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+SVar:X:Targeted$CardManaCost
 DeckHas:Ability$Counters|Token & Type$Incubator|Artifact|Phyrexian
 Oracle:Exile target nonland permanent. Its controller incubates X, where X is its mana value. (They create an Incubator token with X +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
diff --git a/forge-gui/res/cardsfolder/e/extra_arms.txt b/forge-gui/res/cardsfolder/e/extra_arms.txt
index c1070f6d246..f9f2d86027c 100644
--- a/forge-gui/res/cardsfolder/e/extra_arms.txt
+++ b/forge-gui/res/cardsfolder/e/extra_arms.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 4 R | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature attacks, it deals 2 damage to any target.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | DamageSource$ TriggeredAttacker | NumDmg$ 2
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | DamageSource$ TriggeredAttackerLKICopy | NumDmg$ 2
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
 Oracle:Enchant creature\nWhenever enchanted creature attacks, it deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/f/fateful_absence.txt b/forge-gui/res/cardsfolder/f/fateful_absence.txt
index 205c500fb67..7c33430b74c 100644
--- a/forge-gui/res/cardsfolder/f/fateful_absence.txt
+++ b/forge-gui/res/cardsfolder/f/fateful_absence.txt
@@ -1,8 +1,7 @@
 Name:Fateful Absence
 ManaCost:1 W
 Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SubAbility$ DBInvestigate | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target creature or planeswalker. Its controller investigates. (They create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
-SVar:DBInvestigate:DB$ Investigate | Num$ 1 | Defined$ RememberedController | SubAbility$ DBCleanup | StackDescription$ {p:TargetedController} investigates.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SubAbility$ DBInvestigate | SpellDescription$ Destroy target creature or planeswalker. Its controller investigates. (They create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+SVar:DBInvestigate:DB$ Investigate | Num$ 1 | Defined$ TargetedController | StackDescription$ {p:TargetedController} investigates.
 DeckHas:Ability$Token|Sacrifice
 Oracle:Destroy target creature or planeswalker. Its controller investigates. (They create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/f/flay_essence.txt b/forge-gui/res/cardsfolder/f/flay_essence.txt
index 7699e170589..a69d8b13437 100644
--- a/forge-gui/res/cardsfolder/f/flay_essence.txt
+++ b/forge-gui/res/cardsfolder/f/flay_essence.txt
@@ -1,8 +1,7 @@
 Name:Flay Essence
 ManaCost:1 B B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 1 B B | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target creature or planeswalker. You gain life equal to the number of counters on it.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardCounters.ALL
+A:SP$ ChangeZone | Cost$ 1 B B | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target creature or planeswalker. You gain life equal to the number of counters on it.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
+SVar:X:Targeted$CardCounters.ALL
 Oracle:Exile target creature or planeswalker. You gain life equal to the number of counters on it.
diff --git a/forge-gui/res/cardsfolder/f/flayer_of_the_hatebound.txt b/forge-gui/res/cardsfolder/f/flayer_of_the_hatebound.txt
index 3e0323912f1..afdff5cfd06 100644
--- a/forge-gui/res/cardsfolder/f/flayer_of_the_hatebound.txt
+++ b/forge-gui/res/cardsfolder/f/flayer_of_the_hatebound.txt
@@ -4,6 +4,6 @@ Types:Creature Devil
 PT:4/2
 K:Undying
 T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self+YouOwn,Creature.YouOwn+Other | Execute$ ReanimateDmg | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to any target.
-SVar:ReanimateDmg:DB$ DealDamage | ValidTgts$ Any | DamageSource$ TriggeredCard | NumDmg$ Damage
+SVar:ReanimateDmg:DB$ DealDamage | ValidTgts$ Any | DamageSource$ TriggeredCardLKICopy | NumDmg$ Damage
 SVar:Damage:TriggeredCard$CardPower
 Oracle:Undying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)\nWhenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to any target.
diff --git a/forge-gui/res/cardsfolder/f/flesh_allergy.txt b/forge-gui/res/cardsfolder/f/flesh_allergy.txt
index 2a33587f5c1..b8e0655d9bd 100644
--- a/forge-gui/res/cardsfolder/f/flesh_allergy.txt
+++ b/forge-gui/res/cardsfolder/f/flesh_allergy.txt
@@ -1,8 +1,7 @@
 Name:Flesh Allergy
 ManaCost:2 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 2 B B Sac<1/Creature> | ValidTgts$ Creature | SubAbility$ DBLoseLife | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target creature. Its controller loses life equal to the number of creatures that died this turn.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 2 B B Sac<1/Creature> | ValidTgts$ Creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses life equal to the number of creatures that died this turn.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ X
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
 Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDestroy target creature. Its controller loses life equal to the number of creatures that died this turn.
diff --git a/forge-gui/res/cardsfolder/g/gallows_at_willow_hill.txt b/forge-gui/res/cardsfolder/g/gallows_at_willow_hill.txt
index 765477ced5b..20d2f6e1428 100644
--- a/forge-gui/res/cardsfolder/g/gallows_at_willow_hill.txt
+++ b/forge-gui/res/cardsfolder/g/gallows_at_willow_hill.txt
@@ -1,9 +1,8 @@
 Name:Gallows at Willow Hill
 ManaCost:3
 Types:Artifact
-A:AB$ Destroy | Cost$ 3 T tapXType<3/Human> | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ GhostToken | SpellDescription$ Destroy target creature.
-SVar:GhostToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ RememberedController | SubAbility$ DBCleanup | SpellDescription$ Its controller creates a 1/1 white Spirit creature token with flying.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Destroy | Cost$ 3 T tapXType<3/Human> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ GhostToken | SpellDescription$ Destroy target creature.
+SVar:GhostToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ TargetedController | SpellDescription$ Its controller creates a 1/1 white Spirit creature token with flying.
 DeckNeeds:Type$Human
 DeckHas:Ability$Token
 Oracle:{3}, {T}, Tap three untapped Humans you control: Destroy target creature. Its controller creates a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/g/generous_gift.txt b/forge-gui/res/cardsfolder/g/generous_gift.txt
index 76a76839072..70d52b61f3c 100644
--- a/forge-gui/res/cardsfolder/g/generous_gift.txt
+++ b/forge-gui/res/cardsfolder/g/generous_gift.txt
@@ -1,7 +1,6 @@
 Name:Generous Gift
 ManaCost:2 W
 Types:Instant
-A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Elephant creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_elephant | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target permanent. Its controller creates a 3/3 green Elephant creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_elephant | TokenOwner$ TargetedController
 Oracle:Destroy target permanent. Its controller creates a 3/3 green Elephant creature token.
diff --git a/forge-gui/res/cardsfolder/g/geomancers_gambit.txt b/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
index e925adee65f..1b65523567e 100644
--- a/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
+++ b/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
@@ -1,8 +1,7 @@
 Name:Geomancer's Gambit
 ManaCost:2 R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ RememberedController | ShuffleNonMandatory$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBDraw
+A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/g/get_lost.txt b/forge-gui/res/cardsfolder/g/get_lost.txt
index 0142a84d201..beeee5d551d 100644
--- a/forge-gui/res/cardsfolder/g/get_lost.txt
+++ b/forge-gui/res/cardsfolder/g/get_lost.txt
@@ -1,8 +1,7 @@
 Name:Get Lost
 ManaCost:1 W
 Types:Instant
-A:SP$ Destroy | ValidTgts$ Creature,Enchantment,Planeswalker | TgtPrompt$ Select target creature, enchantment, or planeswalker | SubAbility$ DBToken | AlwaysRemember$ True | RememberLKI$ True | SpellDescription$ Destroy target creature, enchantment, or planeswalker. Its controller creates two Map tokens. (They're artifacts with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
-SVar:DBToken:DB$ Token | TokenScript$ c_a_map_sac_explore | TokenOwner$ RememberedController | TokenAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | ValidTgts$ Creature,Enchantment,Planeswalker | TgtPrompt$ Select target creature, enchantment, or planeswalker | SubAbility$ DBToken | SpellDescription$ Destroy target creature, enchantment, or planeswalker. Its controller creates two Map tokens. (They're artifacts with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
+SVar:DBToken:DB$ Token | TokenScript$ c_a_map_sac_explore | TokenOwner$ TargetedController | TokenAmount$ 2
 DeckHas:Ability$Token|Sacrifice & Type$Artifact|Map
 Oracle:Destroy target creature, enchantment, or planeswalker. Its controller creates two Map tokens. (They're artifacts with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
diff --git a/forge-gui/res/cardsfolder/g/ghost_quarter.txt b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
index c81c96b2dc0..f239fef961c 100644
--- a/forge-gui/res/cardsfolder/g/ghost_quarter.txt
+++ b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
@@ -2,8 +2,7 @@ Name:Ghost Quarter
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBChange | AlwaysRemember$ True | RememberLKI$ True | AILogic$ GhostQuarter | AITgts$ Land.nonBasic | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ RememberedController | ShuffleNonMandatory$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBChange | AILogic$ GhostQuarter | AITgts$ Land.nonBasic | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 AI:RemoveDeck:Random
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/g/glissas_scorn.txt b/forge-gui/res/cardsfolder/g/glissas_scorn.txt
index de8db14458a..0f99cbb29a3 100644
--- a/forge-gui/res/cardsfolder/g/glissas_scorn.txt
+++ b/forge-gui/res/cardsfolder/g/glissas_scorn.txt
@@ -1,7 +1,6 @@
 Name:Glissa's Scorn
 ManaCost:1 G
 Types:Instant
-A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDrain | SpellDescription$ Destroy target artifact. Its controller loses 1 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBDrain | SpellDescription$ Destroy target artifact. Its controller loses 1 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 1
 Oracle:Destroy target artifact. Its controller loses 1 life.
diff --git a/forge-gui/res/cardsfolder/g/goblin_javelineer.txt b/forge-gui/res/cardsfolder/g/goblin_javelineer.txt
index a56edb7582b..0d88acf4beb 100644
--- a/forge-gui/res/cardsfolder/g/goblin_javelineer.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_javelineer.txt
@@ -4,5 +4,5 @@ Types:Creature Goblin Warrior
 PT:1/1
 K:Haste
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes blocked, it deals 1 damage to target creature blocking it.
-SVar:TrigDealDamage:DB$ DealDamage | DamageSource$ TriggeredAttacker | NumDmg$ 1 | Defined$ TriggeredBlockers
+SVar:TrigDealDamage:DB$ DealDamage | NumDmg$ 1 | ValidTgts$ Creature.blockingSelf
 Oracle:Haste\nWhenever Goblin Javelineer becomes blocked, it deals 1 damage to target creature blocking it.
diff --git a/forge-gui/res/cardsfolder/g/grisly_spectacle.txt b/forge-gui/res/cardsfolder/g/grisly_spectacle.txt
index a748135c538..7b8faa88ebd 100644
--- a/forge-gui/res/cardsfolder/g/grisly_spectacle.txt
+++ b/forge-gui/res/cardsfolder/g/grisly_spectacle.txt
@@ -1,8 +1,7 @@
 Name:Grisly Spectacle
 ManaCost:2 B B
 Types:Instant
-A:SP$ Destroy | Cost$ 2 B B | ValidTgts$ Creature.nonArtifact | TgtPrompt$ Select target nonartifact creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBMill | SpellDescription$ Destroy target nonartifact creature. Its controller mills cards equal to that creature's power.
-SVar:DBMill:DB$ Mill | NumCards$ X | Defined$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 2 B B | ValidTgts$ Creature.nonArtifact | TgtPrompt$ Select target nonartifact creature | SubAbility$ DBMill | SpellDescription$ Destroy target nonartifact creature. Its controller mills cards equal to that creature's power.
+SVar:DBMill:DB$ Mill | NumCards$ X | Defined$ TargetedController
 SVar:X:Targeted$CardPower
 Oracle:Destroy target nonartifact creature. Its controller mills cards equal to that creature's power.
diff --git a/forge-gui/res/cardsfolder/h/hideous_end.txt b/forge-gui/res/cardsfolder/h/hideous_end.txt
index 9aa691aee60..f633781255e 100644
--- a/forge-gui/res/cardsfolder/h/hideous_end.txt
+++ b/forge-gui/res/cardsfolder/h/hideous_end.txt
@@ -1,7 +1,6 @@
 Name:Hideous End
 ManaCost:1 B B
 Types:Instant
-A:SP$ Destroy | Cost$ 1 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDrain | SpellDescription$ Destroy target nonblack creature. Its controller loses 2 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ DBDrain | SpellDescription$ Destroy target nonblack creature. Its controller loses 2 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2
 Oracle:Destroy target nonblack creature. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/i/immersturm.txt b/forge-gui/res/cardsfolder/i/immersturm.txt
index 52038fe830c..82de751eeb9 100644
--- a/forge-gui/res/cardsfolder/i/immersturm.txt
+++ b/forge-gui/res/cardsfolder/i/immersturm.txt
@@ -2,7 +2,7 @@ Name:Immersturm
 ManaCost:no cost
 Types:Plane Valla
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Command | Execute$ TrigDamage | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ Y | DamageSource$ TriggeredCard | TargetingPlayer$ TriggeredCardController
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ Y | DamageSource$ TriggeredCardLKICopy | TargetingPlayer$ TriggeredCardController
 SVar:Y:TriggeredCard$CardPower
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, exile target creature, then return it to the battlefield under its owner's control.
 SVar:RolledChaos:DB$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ RestorationReturn
diff --git a/forge-gui/res/cardsfolder/i/infernal_reckoning.txt b/forge-gui/res/cardsfolder/i/infernal_reckoning.txt
index 9b8b712d5c1..9663c692e28 100644
--- a/forge-gui/res/cardsfolder/i/infernal_reckoning.txt
+++ b/forge-gui/res/cardsfolder/i/infernal_reckoning.txt
@@ -1,8 +1,7 @@
 Name:Infernal Reckoning
 ManaCost:B
 Types:Instant
-A:SP$ ChangeZone | Cost$ B | ValidTgts$ Creature.Colorless | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SpellDescription$ Exile target colorless creature. You gain life equal to its power. | StackDescription$ SpellDescription | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardPower
+A:SP$ ChangeZone | Cost$ B | ValidTgts$ Creature.Colorless | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target colorless creature. You gain life equal to its power. | StackDescription$ SpellDescription | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
+SVar:X:Targeted$CardPower
 Oracle:Exile target colorless creature. You gain life equal to its power.
diff --git a/forge-gui/res/cardsfolder/l/last_breath.txt b/forge-gui/res/cardsfolder/l/last_breath.txt
index f10b21a290f..7d2fe8a1bee 100644
--- a/forge-gui/res/cardsfolder/l/last_breath.txt
+++ b/forge-gui/res/cardsfolder/l/last_breath.txt
@@ -1,7 +1,6 @@
 Name:Last Breath
 ManaCost:1 W
 Types:Instant
-A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power 2 or less. Its controller gains 4 life. | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ 4 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power 2 or less. Its controller gains 4 life. | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ 4
 Oracle:Exile target creature with power 2 or less. Its controller gains 4 life.
diff --git a/forge-gui/res/cardsfolder/l/launch_party.txt b/forge-gui/res/cardsfolder/l/launch_party.txt
index d22e2c95ba5..0f2c6ad904e 100644
--- a/forge-gui/res/cardsfolder/l/launch_party.txt
+++ b/forge-gui/res/cardsfolder/l/launch_party.txt
@@ -1,8 +1,7 @@
 Name:Launch Party
 ManaCost:3 B
 Types:Instant
-A:SP$ Destroy | Cost$ 3 B Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDrain | SpellDescription$ Destroy target creature. Its controller loses 2 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 3 B Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDrain | SpellDescription$ Destroy target creature. Its controller loses 2 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2
 AI:RemoveDeck:All
 Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDestroy target creature. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/l/lay_down_arms.txt b/forge-gui/res/cardsfolder/l/lay_down_arms.txt
index 618799b39c4..7a42cbe747b 100644
--- a/forge-gui/res/cardsfolder/l/lay_down_arms.txt
+++ b/forge-gui/res/cardsfolder/l/lay_down_arms.txt
@@ -1,9 +1,8 @@
 Name:Lay Down Arms
 ManaCost:W
 Types:Sorcery
-A:SP$ ChangeZone | ValidTgts$ Creature.cmcLEX | TgtPrompt$ Select target creature with mana value less or equal to the number of Plains you control | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBGainLife | SpellDescription$ Exile target creature with mana value less than or equal to the number of Plains you control. Its controller gains 3 life.
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 | Defined$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | ValidTgts$ Creature.cmcLEX | TgtPrompt$ Select target creature with mana value less or equal to the number of Plains you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBGainLife | SpellDescription$ Exile target creature with mana value less than or equal to the number of Plains you control. Its controller gains 3 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 | Defined$ TargetedController
 SVar:X:Count$Valid Plains.YouCtrl
 SVar:BuffedBy:Plains
 Oracle:Exile target creature with mana value less than or equal to the number of Plains you control. Its controller gains 3 life.
diff --git a/forge-gui/res/cardsfolder/m/molten_rain.txt b/forge-gui/res/cardsfolder/m/molten_rain.txt
index 99fa9cb1f5d..9f77fa5d668 100644
--- a/forge-gui/res/cardsfolder/m/molten_rain.txt
+++ b/forge-gui/res/cardsfolder/m/molten_rain.txt
@@ -1,7 +1,6 @@
 Name:Molten Rain
 ManaCost:1 R R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 1 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDamage | RememberLKI$ True | AlwaysRemember$ True | SpellDescription$ Destroy target land. If that land is nonbasic, Molten Rain deals 2 damage to the land's controller.
-SVar:DBDamage:DB$ DealDamage | Defined$ RememberedController | NumDmg$ 2 | ConditionDefined$ RememberedLKI | ConditionPresent$ Land.Basic | ConditionCompare$ EQ0 | ConditionDescription$ If that land is nonbasic, | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDamage | SpellDescription$ Destroy target land. If that land was nonbasic, CARDNAME deals 2 damage to the land's controller.
+SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionDefined$ Targeted | ConditionPresent$ Land.Basic | ConditionCompare$ EQ0 | ConditionDescription$ If that land is nonbasic,
 Oracle:Destroy target land. If that land was nonbasic, Molten Rain deals 2 damage to the land's controller.
diff --git a/forge-gui/res/cardsfolder/n/natures_claim.txt b/forge-gui/res/cardsfolder/n/natures_claim.txt
index db5be522e75..ae93486f0d3 100644
--- a/forge-gui/res/cardsfolder/n/natures_claim.txt
+++ b/forge-gui/res/cardsfolder/n/natures_claim.txt
@@ -1,7 +1,6 @@
 Name:Nature's Claim
 ManaCost:G
 Types:Instant
-A:SP$ Destroy | Cost$ G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact or enchantment. Its controller gains 4 life.
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ 4 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact or enchantment. Its controller gains 4 life.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ 4
 Oracle:Destroy target artifact or enchantment. Its controller gains 4 life.
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_the_hate_twisted.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_the_hate_twisted.txt
index 2a74699374f..0bc24e38632 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_the_hate_twisted.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_the_hate_twisted.txt
@@ -4,7 +4,6 @@ Types:Legendary Planeswalker Nixilis
 Loyalty:5
 T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever an opponent draws a card, CARDNAME deals 1 damage to that player.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 1
-A:AB$ Destroy | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDraw | SpellDescription$ Destroy target creature. Its controller draws two cards.
-SVar:DBDraw:DB$ Draw | Defined$ RememberedController | NumCards$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Destroy | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDraw | SpellDescription$ Destroy target creature. Its controller draws two cards.
+SVar:DBDraw:DB$ Draw | Defined$ TargetedController | NumCards$ 2
 Oracle:Whenever an opponent draws a card, Ob Nixilis, the Hate-Twisted deals 1 damage to that player.\n[-2]: Destroy target creature. Its controller draws two cards.
diff --git a/forge-gui/res/cardsfolder/o/oust.txt b/forge-gui/res/cardsfolder/o/oust.txt
index 0566fbc3dfb..31da06d28ee 100644
--- a/forge-gui/res/cardsfolder/o/oust.txt
+++ b/forge-gui/res/cardsfolder/o/oust.txt
@@ -1,8 +1,7 @@
 Name:Oust
 ManaCost:W
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | RememberLKI$ True | SubAbility$ DBGainLife | SpellDescription$ Put target creature into its owner's library second from the top. Its controller gains 3 life.
+A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SubAbility$ DBGainLife | SpellDescription$ Put target creature into its owner's library second from the top. Its controller gains 3 life.
 # Library Position is zero indexed. So 1 is second from the top
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ 3 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ 3
 Oracle:Put target creature into its owner's library second from the top. Its controller gains 3 life.
diff --git a/forge-gui/res/cardsfolder/p/path_to_exile.txt b/forge-gui/res/cardsfolder/p/path_to_exile.txt
index df7c119470b..93c565c7045 100644
--- a/forge-gui/res/cardsfolder/p/path_to_exile.txt
+++ b/forge-gui/res/cardsfolder/p/path_to_exile.txt
@@ -1,7 +1,6 @@
 Name:Path to Exile
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBChange | RememberLKI$ True | StackDescription$ Exile {c:Targeted}. {p:TargetedController} may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle their library. | SpellDescription$ Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ RememberedController | ShuffleNonMandatory$ True | SubAbility$ DBCleanup | StackDescription$ None
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBChange | StackDescription$ Exile {c:Targeted}. {p:TargetedController} may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle their library. | SpellDescription$ Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | StackDescription$ None
 Oracle:Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/phthisis.txt b/forge-gui/res/cardsfolder/p/phthisis.txt
index 177b5613299..9d75091bc00 100644
--- a/forge-gui/res/cardsfolder/p/phthisis.txt
+++ b/forge-gui/res/cardsfolder/p/phthisis.txt
@@ -2,8 +2,7 @@ Name:Phthisis
 ManaCost:3 B B B B
 Types:Sorcery
 K:Suspend:5:1 B
-A:SP$ Destroy | Cost$ 3 B B B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses life equal to its power plus its toughness.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardSumPT
+A:SP$ Destroy | Cost$ 3 B B B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses life equal to its power plus its toughness.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ X
+SVar:X:Targeted$CardSumPT
 Oracle:Destroy target creature. Its controller loses life equal to its power plus its toughness.\nSuspend 5—{1}{B} (Rather than cast this card from your hand, you may pay {1}{B} and exile it with five time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/p/polymorph.txt b/forge-gui/res/cardsfolder/p/polymorph.txt
index 59f4b9b79ee..b9a4de29375 100644
--- a/forge-gui/res/cardsfolder/p/polymorph.txt
+++ b/forge-gui/res/cardsfolder/p/polymorph.txt
@@ -1,8 +1,7 @@
 Name:Polymorph
 ManaCost:3 U
 Types:Sorcery
-A:SP$ Destroy | Cost$ 3 U | NoRegen$ True | ValidTgts$ Creature | AILogic$ Polymorph | RememberLKI$ True | TgtPrompt$ Select target creature | SubAbility$ DBDig | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library.
-SVar:DBDig:DB$ DigUntil | Defined$ RememberedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | Shuffle$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 3 U | NoRegen$ True | ValidTgts$ Creature | AILogic$ Polymorph | TgtPrompt$ Select target creature | SubAbility$ DBDig | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library.
+SVar:DBDig:DB$ DigUntil | Defined$ TargetedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | Shuffle$ True
 AI:RemoveDeck:All
 Oracle:Destroy target creature. It can't be regenerated. Its controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library.
diff --git a/forge-gui/res/cardsfolder/p/pongify.txt b/forge-gui/res/cardsfolder/p/pongify.txt
index 271c64506e9..af9742aeeea 100644
--- a/forge-gui/res/cardsfolder/p/pongify.txt
+++ b/forge-gui/res/cardsfolder/p/pongify.txt
@@ -1,7 +1,6 @@
 Name:Pongify
 ManaCost:U
 Types:Instant
-A:SP$ Destroy | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select a creature | AILogic$ Pongify | RememberLKI$ True | AlwaysRemember$ True | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_ape | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select a creature | AILogic$ Pongify | SubAbility$ DBToken | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_ape | TokenOwner$ TargetedController
 Oracle:Destroy target creature. It can't be regenerated. Its controller creates a 3/3 green Ape creature token.
diff --git a/forge-gui/res/cardsfolder/p/proteus_staff.txt b/forge-gui/res/cardsfolder/p/proteus_staff.txt
index 56dc37aeb60..ed347c22595 100644
--- a/forge-gui/res/cardsfolder/p/proteus_staff.txt
+++ b/forge-gui/res/cardsfolder/p/proteus_staff.txt
@@ -1,9 +1,8 @@
 Name:Proteus Staff
 ManaCost:3
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 U T | SorcerySpeed$ True | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | ValidTgts$ Creature | AILogic$ Polymorph | RememberLKI$ True | TgtPrompt$ Select target creature | SubAbility$ DBDigUntil | SpellDescription$ Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order. Activate only as a sorcery.
-SVar:DBDigUntil:DB$ DigUntil | Defined$ RememberedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ 2 U T | SorcerySpeed$ True | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | ValidTgts$ Creature | AILogic$ Polymorph | TgtPrompt$ Select target creature | SubAbility$ DBDigUntil | SpellDescription$ Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order. Activate only as a sorcery.
+SVar:DBDigUntil:DB$ DigUntil | Defined$ TargetedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 DeckNeeds:Color$Blue
diff --git a/forge-gui/res/cardsfolder/r/ravenform.txt b/forge-gui/res/cardsfolder/r/ravenform.txt
index fb992a3372c..72cc85bfdfb 100644
--- a/forge-gui/res/cardsfolder/r/ravenform.txt
+++ b/forge-gui/res/cardsfolder/r/ravenform.txt
@@ -1,9 +1,8 @@
 Name:Ravenform
 ManaCost:2 U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target artifact or creature. Its controller creates a 1/1 blue Bird creature token with flying.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target artifact or creature. Its controller creates a 1/1 blue Bird creature token with flying.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying | TokenOwner$ TargetedController
 K:Foretell:U
 DeckHas:Ability$Token
 Oracle:Exile target artifact or creature. Its controller creates a 1/1 blue Bird creature token with flying.\nForetell {U} (During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)
diff --git a/forge-gui/res/cardsfolder/r/raze_to_the_ground.txt b/forge-gui/res/cardsfolder/r/raze_to_the_ground.txt
index c42d01bbeae..f35c4236b56 100644
--- a/forge-gui/res/cardsfolder/r/raze_to_the_ground.txt
+++ b/forge-gui/res/cardsfolder/r/raze_to_the_ground.txt
@@ -2,8 +2,7 @@ Name:Raze to the Ground
 ManaCost:2 R
 Types:Sorcery
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
-A:SP$ Destroy | ValidTgts$ Artifact | SubAbility$ DBDraw | RememberLKI$ True | AlwaysRemember$ True | SpellDescription$ Destroy target artifact. If its mana value was 1 or less, draw a card.
-SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ LE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardManaCost
+A:SP$ Destroy | ValidTgts$ Artifact | SubAbility$ DBDraw | SpellDescription$ Destroy target artifact. If its mana value was 1 or less, draw a card.
+SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ LE1
+SVar:X:Targeted$CardManaCost
 Oracle:This spell can't be countered.\nDestroy target artifact. If its mana value was 1 or less, draw a card.
diff --git a/forge-gui/res/cardsfolder/r/reality_shift.txt b/forge-gui/res/cardsfolder/r/reality_shift.txt
index 1c029d4ab37..a1f11970dcc 100644
--- a/forge-gui/res/cardsfolder/r/reality_shift.txt
+++ b/forge-gui/res/cardsfolder/r/reality_shift.txt
@@ -1,7 +1,6 @@
 Name:Reality Shift
 ManaCost:1 U
 Types:Instant
-A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBManifest | RememberLKI$ True | AITgts$ Card.cmcGE3,Card.powerGE3 | SpellDescription$ Exile target creature. Its controller manifests the top card of their library. (That player puts the top card of their library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)
-SVar:DBManifest:DB$ Manifest | DefinedPlayer$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBManifest | AITgts$ Card.cmcGE3,Card.powerGE3 | SpellDescription$ Exile target creature. Its controller manifests the top card of their library. (That player puts the top card of their library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)
+SVar:DBManifest:DB$ Manifest | DefinedPlayer$ TargetedController
 Oracle:Exile target creature. Its controller manifests the top card of their library. (That player puts the top card of their library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)
diff --git a/forge-gui/res/cardsfolder/r/reduce_to_memory.txt b/forge-gui/res/cardsfolder/r/reduce_to_memory.txt
index 25f931e7edd..cab8f6f2751 100644
--- a/forge-gui/res/cardsfolder/r/reduce_to_memory.txt
+++ b/forge-gui/res/cardsfolder/r/reduce_to_memory.txt
@@ -1,8 +1,7 @@
 Name:Reduce to Memory
 ManaCost:1 W W
 Types:Sorcery Lesson
-A:SP$ ChangeZone | Cost$ 1 W W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Exile target nonland permanent. Its controller creates a 3/2 red and white Spirit creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_3_2_spirit | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 1 W W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | SubAbility$ DBToken | SpellDescription$ Exile target nonland permanent. Its controller creates a 3/2 red and white Spirit creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_3_2_spirit | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 Oracle:Exile target nonland permanent. Its controller creates a 3/2 red and white Spirit creature token.
diff --git a/forge-gui/res/cardsfolder/r/resculpt.txt b/forge-gui/res/cardsfolder/r/resculpt.txt
index 9b70f281f32..ee5392ae7f9 100644
--- a/forge-gui/res/cardsfolder/r/resculpt.txt
+++ b/forge-gui/res/cardsfolder/r/resculpt.txt
@@ -1,8 +1,7 @@
 Name:Resculpt
 ManaCost:1 U
 Types:Instant
-A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | RememberLKI$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target artifact or creature. Its controller creates a 4/4 blue and red Elemental creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ur_4_4_elemental | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target artifact or creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target artifact or creature. Its controller creates a 4/4 blue and red Elemental creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ur_4_4_elemental | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 Oracle:Exile target artifact or creature. Its controller creates a 4/4 blue and red Elemental creature token.
diff --git a/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt b/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
index ec35926cfd1..45a01222485 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
@@ -1,8 +1,7 @@
 Name:Rite of the Serpent
 ManaCost:4 B B
 Types:Sorcery
-A:SP$ Destroy | ValidTgts$ Creature | SubAbility$ DBToken | RememberLKI$ True | SpellDescription$ Destroy target creature.
-SVar:DBToken:DB$ Token | TokenScript$ g_1_1_snake | ConditionDefined$ RememberedLKI | ConditionPresent$ Creature.counters_GE1_P1P1 | SubAbility$ DBCleanup | SpellDescription$ If that creature had a +1/+1 counter on it, create a 1/1 green Snake creature token.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | ValidTgts$ Creature | SubAbility$ DBToken | SpellDescription$ Destroy target creature.
+SVar:DBToken:DB$ Token | TokenScript$ g_1_1_snake | ConditionDefined$ Targeted | ConditionPresent$ Creature.counters_GE1_P1P1 | SpellDescription$ If that creature had a +1/+1 counter on it, create a 1/1 green Snake creature token.
 DeckHas:Ability$Token & Type$Snake
 Oracle:Destroy target creature. If that creature had a +1/+1 counter on it, create a 1/1 green Snake creature token.
diff --git a/forge-gui/res/cardsfolder/s/sawtusk_demolisher.txt b/forge-gui/res/cardsfolder/s/sawtusk_demolisher.txt
index bb2ba6c9ade..c9ba959430a 100644
--- a/forge-gui/res/cardsfolder/s/sawtusk_demolisher.txt
+++ b/forge-gui/res/cardsfolder/s/sawtusk_demolisher.txt
@@ -5,8 +5,7 @@ PT:6/6
 K:Mutate:3 G
 K:Trample
 T:Mode$ Mutates | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever this creature mutates, destroy target noncreature permanent. Its controller creates a 3/3 green Beast creature token.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | AITgts$ Card.cmcGE4 | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 Oracle:Mutate {3}{G} (If you cast this spell for its mutate cost, put it over or under target non-Human creature you own. They mutate into the creature on top plus all abilities from under it.)\nTrample\nWhenever this creature mutates, destroy target noncreature permanent. Its controller creates a 3/3 green Beast creature token.
diff --git a/forge-gui/res/cardsfolder/s/secure_the_scene.txt b/forge-gui/res/cardsfolder/s/secure_the_scene.txt
index c4587af46fe..ee480abb83e 100644
--- a/forge-gui/res/cardsfolder/s/secure_the_scene.txt
+++ b/forge-gui/res/cardsfolder/s/secure_the_scene.txt
@@ -1,8 +1,7 @@
 Name:Secure the Scene
 ManaCost:4 W
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 4 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Exile target nonland permanent. Its controller creates a 1/1 white Soldier creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 4 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | SubAbility$ DBToken | SpellDescription$ Exile target nonland permanent. Its controller creates a 1/1 white Soldier creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier | TokenOwner$ TargetedController
 DeckHas:Ability$Token
 Oracle:Exile target nonland permanent. Its controller creates a 1/1 white Soldier creature token.
diff --git a/forge-gui/res/cardsfolder/s/serum_snare.txt b/forge-gui/res/cardsfolder/s/serum_snare.txt
index fe01c91c0f6..1a361c38728 100644
--- a/forge-gui/res/cardsfolder/s/serum_snare.txt
+++ b/forge-gui/res/cardsfolder/s/serum_snare.txt
@@ -1,9 +1,8 @@
 Name:Serum Snare
 ManaCost:1 U
 Types:Instant
-A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | RememberLKI$ True | SubAbility$ DBProliferate | SpellDescription$ Return target nonland permanent to its owner's hand. If that permanent had mana value 3 or less, proliferate.
-SVar:DBProliferate:DB$ Proliferate | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.cmcLE3 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBProliferate | SpellDescription$ Return target nonland permanent to its owner's hand. If that permanent had mana value 3 or less, proliferate.
+SVar:DBProliferate:DB$ Proliferate | ConditionDefined$ Targeted | ConditionPresent$ Card.cmcLE3
 DeckHas:Ability$Proliferate
 DeckNeeds:Ability$Counters
 Oracle:Return target nonland permanent to its owner's hand. If that permanent had mana value 3 or less, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/s/sip_of_hemlock.txt b/forge-gui/res/cardsfolder/s/sip_of_hemlock.txt
index 0dac6e3a31c..4e6c4e9ca8f 100644
--- a/forge-gui/res/cardsfolder/s/sip_of_hemlock.txt
+++ b/forge-gui/res/cardsfolder/s/sip_of_hemlock.txt
@@ -1,7 +1,6 @@
 Name:Sip of Hemlock
 ManaCost:4 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses 2 life.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses 2 life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 2
 Oracle:Destroy target creature. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/s/solitude.txt b/forge-gui/res/cardsfolder/s/solitude.txt
index a6250d46f39..f514a95b7f6 100644
--- a/forge-gui/res/cardsfolder/s/solitude.txt
+++ b/forge-gui/res/cardsfolder/s/solitude.txt
@@ -6,9 +6,8 @@ K:Flash
 K:Lifelink
 K:Evoke:ExileFromHand<1/Card.White+Other/white card>
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one other target creature. That creature's controller gains life equal to its power.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.Other | RememberLKI$ True | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardPower
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X
+SVar:X:Targeted$CardPower
 DeckHas:Ability$LifeGain
 Oracle:Flash\nLifelink\nWhen Solitude enters the battlefield, exile up to one other target creature. That creature's controller gains life equal to its power.\nEvoke—Exile a white card from your hand.
diff --git a/forge-gui/res/cardsfolder/s/soul_reap.txt b/forge-gui/res/cardsfolder/s/soul_reap.txt
index e7ef18358d9..efa9259c4de 100644
--- a/forge-gui/res/cardsfolder/s/soul_reap.txt
+++ b/forge-gui/res/cardsfolder/s/soul_reap.txt
@@ -1,8 +1,7 @@
 Name:Soul Reap
 ManaCost:1 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature.nonGreen | TgtPrompt$ Select target nongreen creature. | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 3 | ConditionCheckSVar$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature.nonGreen | TgtPrompt$ Select target nongreen creature | SubAbility$ DBLoseLife | SpellDescription$ Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 3 | ConditionCheckSVar$ X
 SVar:X:Count$ThisTurnCast_Card.Black+Other+YouCtrl
 Oracle:Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
diff --git a/forge-gui/res/cardsfolder/s/stroke_of_midnight.txt b/forge-gui/res/cardsfolder/s/stroke_of_midnight.txt
index bcf00998d39..711d86a145c 100644
--- a/forge-gui/res/cardsfolder/s/stroke_of_midnight.txt
+++ b/forge-gui/res/cardsfolder/s/stroke_of_midnight.txt
@@ -1,8 +1,7 @@
 Name:Stroke of Midnight
 ManaCost:2 W
 Types:Instant
-A:SP$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AITgts$ Card.cmcGE4 | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target nonland permanent. Its controller creates a 1/1 white Human creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ RememberedController | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AITgts$ Card.cmcGE4 | SubAbility$ DBToken | SpellDescription$ Destroy target nonland permanent. Its controller creates a 1/1 white Human creature token.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ TargetedController
 DeckHas:Ability$Token & Type$Human
 Oracle:Destroy target nonland permanent. Its controller creates a 1/1 white Human creature token.
diff --git a/forge-gui/res/cardsfolder/t/transmogrify.txt b/forge-gui/res/cardsfolder/t/transmogrify.txt
index cba988e9563..4460c2aaccd 100644
--- a/forge-gui/res/cardsfolder/t/transmogrify.txt
+++ b/forge-gui/res/cardsfolder/t/transmogrify.txt
@@ -1,6 +1,6 @@
 Name:Transmogrify
 ManaCost:3 R
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 3 R | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | NoRegen$ True | ValidTgts$ Creature | RememberLKI$ True | TgtPrompt$ Select target creature | SubAbility$ DBDig | SpellDescription$ Exile target creature. That creature's controller reveals cards from the top of their library until they reveal a creature card. That player puts that card onto the battlefield, then shuffles the rest into their library.
-SVar:DBDig:DB$ DigUntil | Defined$ RememberedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | Shuffle$ True
+A:SP$ ChangeZone | Cost$ 3 R | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | NoRegen$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDig | SpellDescription$ Exile target creature. That creature's controller reveals cards from the top of their library until they reveal a creature card. That player puts that card onto the battlefield, then shuffles the rest into their library.
+SVar:DBDig:DB$ DigUntil | Defined$ TargetedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | Shuffle$ True
 Oracle:Exile target creature. That creature's controller reveals cards from the top of their library until they reveal a creature card. That player puts that card onto the battlefield, then shuffles the rest into their library.
diff --git a/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt b/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
index c3ec5073bf6..a80f1a39dae 100644
--- a/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
+++ b/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
@@ -2,7 +2,6 @@ Name:Transmogrifying Wand
 ManaCost:3
 Types:Artifact
 K:etbCounter:CHARGE:3
-A:AB$ Destroy | Cost$ 1 T SubCounter<1/CHARGE> | ValidTgts$ Creature | AlwaysRemember$ True | RememberLKI$ True | AITgts$ BetterThanEvalRating.130 | TgtPrompt$ Select target creature | SorcerySpeed$ True | SubAbility$ OxToken | SpellDescription$ Destroy target creature.
-SVar:OxToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_4_ox | TokenOwner$ RememberedController | SubAbility$ DBCleanup | SpellDescription$ Its controller creates a 2/4 white Ox creature token. Activate only any time you could cast a sorcery.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Destroy | Cost$ 1 T SubCounter<1/CHARGE> | ValidTgts$ Creature | AITgts$ BetterThanEvalRating.130 | TgtPrompt$ Select target creature | SorcerySpeed$ True | SubAbility$ OxToken | SpellDescription$ Destroy target creature.
+SVar:OxToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_4_ox | TokenOwner$ TargetedController | SpellDescription$ Its controller creates a 2/4 white Ox creature token. Activate only any time you could cast a sorcery.
 Oracle:Transmogrifying Wand enters the battlefield with three charge counters on it.\n{1}, {T}, Remove a charge counter from Transmogrifying Wand: Destroy target creature. Its controller creates a 2/4 white Ox creature token. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/triad_of_fates.txt b/forge-gui/res/cardsfolder/t/triad_of_fates.txt
index 8b0748fc203..23d527194d2 100644
--- a/forge-gui/res/cardsfolder/t/triad_of_fates.txt
+++ b/forge-gui/res/cardsfolder/t/triad_of_fates.txt
@@ -6,7 +6,7 @@ A:AB$ PutCounter | Cost$ 1 T | ValidTgts$ Creature.Other | TgtPrompt$ Select ano
 A:AB$ ChangeZone | Cost$ W T | ValidTgts$ Creature.counters_GE1_FATE | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature that has a fate counter | RememberTargets$ True | SubAbility$ DBReturn | SpellDescription$ Exile target creature that has a fate counter on it, then return it to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ ChangeZone | Cost$ B T | ValidTgts$ Creature.counters_GE1_FATE | TgtPrompt$ Select target creature that has a fate counter | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SpellDescription$ Exile target creature that has a fate counter on it. Its controller draws two cards. | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ RememberedController | NumCards$ 2 | SubAbility$ DBCleanup
+A:AB$ ChangeZone | Cost$ B T | ValidTgts$ Creature.counters_GE1_FATE | TgtPrompt$ Select target creature that has a fate counter | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature that has a fate counter on it. Its controller draws two cards. | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ TargetedController | NumCards$ 2
 AI:RemoveDeck:All
 Oracle:{1}, {T}: Put a fate counter on another target creature.\n{W}, {T}: Exile target creature that has a fate counter on it, then return it to the battlefield under its owner's control.\n{B}, {T}: Exile target creature that has a fate counter on it. Its controller draws two cards.
diff --git a/forge-gui/res/cardsfolder/v/victorious_destruction.txt b/forge-gui/res/cardsfolder/v/victorious_destruction.txt
index 0cef6c025ab..6b206bfe805 100644
--- a/forge-gui/res/cardsfolder/v/victorious_destruction.txt
+++ b/forge-gui/res/cardsfolder/v/victorious_destruction.txt
@@ -1,7 +1,6 @@
 Name:Victorious Destruction
 ManaCost:4 R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 R | ValidTgts$ Artifact,Land | TgtPrompt$ Select target artifact or land | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBDrain | SpellDescription$ Destroy target artifact or land. Its controller loses 1 life.
-SVar:DBDrain:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ Destroy | Cost$ 4 R | ValidTgts$ Artifact,Land | TgtPrompt$ Select target artifact or land | SubAbility$ DBDrain | SpellDescription$ Destroy target artifact or land. Its controller loses 1 life.
+SVar:DBDrain:DB$ LoseLife | Defined$ TargetedController | LifeAmount$ 1
 Oracle:Destroy target artifact or land. Its controller loses 1 life.
diff --git a/forge-gui/res/cardsfolder/z/zoyowas_justice.txt b/forge-gui/res/cardsfolder/z/zoyowas_justice.txt
index 25419693274..613c53fd0ba 100644
--- a/forge-gui/res/cardsfolder/z/zoyowas_justice.txt
+++ b/forge-gui/res/cardsfolder/z/zoyowas_justice.txt
@@ -1,8 +1,7 @@
 Name:Zoyowa's Justice
 ManaCost:1 R
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Artifact.cmcGE1,Creature.cmcGE1 | TgtPrompt$ Select target artifact or creature with mana value 1 or greater | Origin$ Battlefield | Destination$ Library | Shuffle$ True | RememberLKI$ True | SubAbility$ DBDiscover | StackDescription$ {p:TargetedOwner} shuffles {c:Targeted} into their library. | SpellDescription$ The owner of target artifact or creature with mana value 1 or greater shuffles it into their library.
-SVar:DBDiscover:DB$ Discover | Defined$ TargetedOwner | Num$ X | SubAbility$ DBCleanup | StackDescription$ REP that player_{p:TargetedOwner} | SpellDescription$ Then that player discovers X, where X is its mana value. (They exile cards from the top of their library until they exile a nonland card with that mana value or less. They cast it without paying its mana cost or put it into their hand. They put the rest on the bottom in a random order.)
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardManaCost
+A:SP$ ChangeZone | ValidTgts$ Artifact.cmcGE1,Creature.cmcGE1 | TgtPrompt$ Select target artifact or creature with mana value 1 or greater | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBDiscover | StackDescription$ {p:TargetedOwner} shuffles {c:Targeted} into their library. | SpellDescription$ The owner of target artifact or creature with mana value 1 or greater shuffles it into their library.
+SVar:DBDiscover:DB$ Discover | Defined$ TargetedOwner | Num$ X | StackDescription$ REP that player_{p:TargetedOwner} | SpellDescription$ Then that player discovers X, where X is its mana value. (They exile cards from the top of their library until they exile a nonland card with that mana value or less. They cast it without paying its mana cost or put it into their hand. They put the rest on the bottom in a random order.)
+SVar:X:Targeted$CardManaCost
 Oracle:The owner of target artifact or creature with mana value 1 or greater shuffles it into their library. Then that player discovers X, where X is its mana value. (They exile cards from the top of their library until they exile a nonland card with that mana value or less. They cast it without paying its mana cost or put it into their hand. They put the rest on the bottom in a random order.)