diff --git a/forge-gui/res/cardsfolder/n/necromantic_summons.txt b/forge-gui/res/cardsfolder/n/necromantic_summons.txt
index 05e0d500163..f2c1cf04b1e 100644
--- a/forge-gui/res/cardsfolder/n/necromantic_summons.txt
+++ b/forge-gui/res/cardsfolder/n/necromantic_summons.txt
@@ -1,8 +1,7 @@
 Name:Necromantic Summons
 ManaCost:4 B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 4 B | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | Origin$ Graveyard | Destination$ Battlefield | RememberTargets$ True | GainControl$ True | SubAbility$ DBCounter | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 2 | Static$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | SubAbility$ DBCleanup
+A:SP$ ChangeZone | Cost$ 4 B | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | WithCountersAmount$ Y | GainControl$ True | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Y:Count$Compare X GE2.2.0
 Oracle:Put target creature card from a graveyard onto the battlefield under your control.\nSpell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/n/neoform.txt b/forge-gui/res/cardsfolder/n/neoform.txt
index 776815dba8c..3bebf2a4381 100644
--- a/forge-gui/res/cardsfolder/n/neoform.txt
+++ b/forge-gui/res/cardsfolder/n/neoform.txt
@@ -1,9 +1,7 @@
 Name:Neoform
 ManaCost:G U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ G U Sac<1/Creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBCounter | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with mana value equal to 1 plus the sacrificed creature's mana value, put that card onto the battlefield with an additional +1/+1 counter on it, then shuffle.
-SVar:DBCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1 | Static$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ G U Sac<1/Creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | StackDescription$ SpellDescription | WithCounters$ P1P1_1 | SpellDescription$ Search your library for a creature card with mana value equal to 1 plus the sacrificed creature's mana value, put that card onto the battlefield with an additional +1/+1 counter on it, then shuffle.
 SVar:X:Sacrificed$CardManaCost/Plus.1
 AI:RemoveDeck:Random
 DeckHas:Ability$Counters|Sacrifice
diff --git a/forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt b/forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt
index d065bb6e0a7..78df334cb13 100644
--- a/forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_of_shadowed_boughs.txt
@@ -8,9 +8,7 @@ A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land
 SVar:DBChoice:DB$ GenericChoice | Defined$ You | Choices$ Animate,NoAnimate | StackDescription$ You may have it become a 3/3 Elemental creature with haste and menace until end of turn. It's still a land.
 SVar:Animate:DB$ Animate | Defined$ Targeted | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Keywords$ Haste & Menace | SpellDescription$ Target land becomes a 3/3 Elemental creature with haste and menace until end of turn.
 SVar:NoAnimate:DB$ Pump | SpellDescription$ Target land does not become a 3/3 Elemental creature with haste and menace until end of turn.
-A:AB$ ChangeZone | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | ChangeType$ Creature.YouOwn+cmcLEX | ChangeNum$ 1 | Origin$ Hand,Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBPutCounter | StackDescription$ SpellDescription | SpellDescription$ You may put a creature card with mana value less than or equal to the number of lands you control onto the battlefield from your hand or graveyard with two +1/+1 counters on it.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBCleanup | StackDescription$ None
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | ChangeType$ Creature.YouOwn+cmcLEX | ChangeNum$ 1 | Origin$ Hand,Graveyard | Destination$ Battlefield | WithCounters$ P1P1_2 | StackDescription$ SpellDescription | SpellDescription$ You may put a creature card with mana value less than or equal to the number of lands you control onto the battlefield from your hand or graveyard with two +1/+1 counters on it.
 SVar:X:Count$Valid Land.YouCtrl
 DeckHas:Ability$Counters|Graveyard
 SVar:BuffedBy:Land