diff --git a/forge-gui/res/cardsfolder/c/chainbreaker.txt b/forge-gui/res/cardsfolder/c/chainbreaker.txt
index 2c343346c7a..e1a537b9068 100644
--- a/forge-gui/res/cardsfolder/c/chainbreaker.txt
+++ b/forge-gui/res/cardsfolder/c/chainbreaker.txt
@@ -3,8 +3,8 @@ ManaCost:2
 Types:Artifact Creature Scarecrow
 PT:3/3
 K:etbCounter:M1M1:2
-A:AB$ RemoveCounter | Cost$ 3 T | ValidTgts$ Creature.counters_GE1_M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Remove a -1/-1 counter from target creature.
-#AI cannot handle target RemoveCounter AFs.
-SVar:RemAIDeck:True
+A:AB$ RemoveCounter | Cost$ 3 T | ValidTgts$ Creature | AITgts$ Creature.counters_GE1_M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Remove a -1/-1 counter from target creature.
+DeckHas:Ability$LifeGain
+DeckHints:Keyword$Persist
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chainbreaker.jpg
 Oracle:Chainbreaker enters the battlefield with two -1/-1 counters on it.\n{3}, {T}: Remove a -1/-1 counter from target creature.
diff --git a/forge-gui/res/cardsfolder/w/woeleecher.txt b/forge-gui/res/cardsfolder/w/woeleecher.txt
index 05b4a657d21..f54a90cde7a 100644
--- a/forge-gui/res/cardsfolder/w/woeleecher.txt
+++ b/forge-gui/res/cardsfolder/w/woeleecher.txt
@@ -2,11 +2,10 @@ Name:Woeleecher
 ManaCost:5 W
 Types:Creature Elemental
 PT:3/5
-A:AB$ RemoveCounter | Cost$ W T | ValidTgts$ Creature.counters_GE1_M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | RememberRemoved$ True | SubAbility$ DBGainLife | SpellDescription$ Remove a -1/-1 counter from target creature. If you do, you gain 2 life.
+A:AB$ RemoveCounter | Cost$ W T | ValidTgts$ Creature | AITgts$ Creature.counters_GE1_M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | RememberRemoved$ True | SubAbility$ DBGainLife | SpellDescription$ Remove a -1/-1 counter from target creature. If you do, you gain 2 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | ConditionCheckSVar$ X | ConditonSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
+DeckHints:Keyword$Persist
 SVar:Picture:http://www.wizards.com/global/images/magic/general/woeleecher.jpg
 Oracle:{W}, {T}: Remove a -1/-1 counter from target creature. If you do, you gain 2 life.