diff --git a/res/cardsfolder/deathspore_thallid.txt b/res/cardsfolder/deathspore_thallid.txt
index e8b95b288c1..499283d8cd9 100644
--- a/res/cardsfolder/deathspore_thallid.txt
+++ b/res/cardsfolder/deathspore_thallid.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Fungus
 Text:At the beginning of your upkeep, put a spore counter on Deathspore Thallid.
 PT:1/1
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Pump | Cost$ Sac<1/Saproling> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathspore_thallid.jpg
diff --git a/res/cardsfolder/nemata_grove_guardian.txt b/res/cardsfolder/nemata_grove_guardian.txt
index 0c5bbe351e5..ae48c038b24 100644
--- a/res/cardsfolder/nemata_grove_guardian.txt
+++ b/res/cardsfolder/nemata_grove_guardian.txt
@@ -3,7 +3,6 @@ ManaCost:4 G G
 Types:Legendary Creature Treefolk
 Text:no text
 PT:4/5
-#K:abMakeToken 2 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling |TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemata_grove_guardian.jpg
diff --git a/res/cardsfolder/pallid_mycoderm.txt b/res/cardsfolder/pallid_mycoderm.txt
index 057f5d1223f..ff320a96474 100644
--- a/res/cardsfolder/pallid_mycoderm.txt
+++ b/res/cardsfolder/pallid_mycoderm.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Pallid Mycoderm.
 PT:2/4
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pallid_mycoderm.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/10.jpg
diff --git a/res/cardsfolder/selesnya_evangel.txt b/res/cardsfolder/selesnya_evangel.txt
index 23eb9b05371..81ff11d7403 100644
--- a/res/cardsfolder/selesnya_evangel.txt
+++ b/res/cardsfolder/selesnya_evangel.txt
@@ -3,7 +3,6 @@ ManaCost:G W
 Types:Creature Elf Shaman
 Text:no text
 PT:1/2
-#K:abMakeToken 1 T tapXType<1/Creature><>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Token | Cost$ 1 T tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_evangel.jpg
diff --git a/res/cardsfolder/selesnya_guildmage.txt b/res/cardsfolder/selesnya_guildmage.txt
index 1c791d7ceef..14aad9da5a0 100644
--- a/res/cardsfolder/selesnya_guildmage.txt
+++ b/res/cardsfolder/selesnya_guildmage.txt
@@ -3,7 +3,6 @@ ManaCost:GW GW
 Types:Creature Elf Wizard
 Text:no text
 PT:2/2
-#K:abMakeToken 3 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>Put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Token | Cost$ 3 G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 K:abAllPump 3 W:YouCtrl:+1/+1:Creatures you control get +1/+1 until end of turn.:Selesnya Guildmage - creatures get +1/+1 until EOT.
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/spontaneous_generation.txt b/res/cardsfolder/spontaneous_generation.txt
index 7cbf70c1576..0e5a40b136e 100644
--- a/res/cardsfolder/spontaneous_generation.txt
+++ b/res/cardsfolder/spontaneous_generation.txt
@@ -2,7 +2,6 @@ Name:Spontaneous Generation
 ManaCost:3 G
 Types:Sorcery
 Text:Put a 1/1 green Saproling creature token onto the battlefield for each card in your hand.
-#K:spMakeToken<>X<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
 A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$InYourHand
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/sporesower_thallid.txt b/res/cardsfolder/sporesower_thallid.txt
index 6c0a5a179db..d9ea341f637 100644
--- a/res/cardsfolder/sporesower_thallid.txt
+++ b/res/cardsfolder/sporesower_thallid.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on each Fungus you control.
 PT:4/4
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sporesower_thallid.jpg
 SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/220.jpg
diff --git a/res/cardsfolder/sprout.txt b/res/cardsfolder/sprout.txt
index 369291606fe..321f910500b 100644
--- a/res/cardsfolder/sprout.txt
+++ b/res/cardsfolder/sprout.txt
@@ -2,7 +2,6 @@ Name:Sprout
 ManaCost:G
 Types:Instant
 Text:Put a 1/1 green Saproling creature token onto the battlefield.
-#K:spMakeToken<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
 A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sprout.jpg
diff --git a/res/cardsfolder/thallid.txt b/res/cardsfolder/thallid.txt
index 682dc2fd803..fb0d5a464bf 100644
--- a/res/cardsfolder/thallid.txt
+++ b/res/cardsfolder/thallid.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Thallid.
 PT:1/1
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thallid.jpg
 SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/87.jpg
diff --git a/res/cardsfolder/thallid_devourer.txt b/res/cardsfolder/thallid_devourer.txt
index 23a4bf90945..97344947aeb 100644
--- a/res/cardsfolder/thallid_devourer.txt
+++ b/res/cardsfolder/thallid_devourer.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Thallid Devourer.
 PT:2/2
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Pump | Cost$ Sac<1/Saproling> | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ Thallid Devourer gets +1/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thallid_devourer.jpg
diff --git a/res/cardsfolder/thallid_germinator.txt b/res/cardsfolder/thallid_germinator.txt
index f54506f8cdc..570041e3b51 100644
--- a/res/cardsfolder/thallid_germinator.txt
+++ b/res/cardsfolder/thallid_germinator.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Thallid Germinator.
 PT:2/2
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Pump | Cost$ Sac<1/Saproling> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thallid_germinator.jpg
diff --git a/res/cardsfolder/thallid_shell_dweller.txt b/res/cardsfolder/thallid_shell_dweller.txt
index 2a2414f1ec0..dfa095bc1de 100644
--- a/res/cardsfolder/thallid_shell_dweller.txt
+++ b/res/cardsfolder/thallid_shell_dweller.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Thallid Shell-Dweller.
 PT:0/5
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 K:Defender
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thallid_shell_dweller.jpg
diff --git a/res/cardsfolder/thorn_thallid.txt b/res/cardsfolder/thorn_thallid.txt
index e0d072da41d..04f3dbfee23 100644
--- a/res/cardsfolder/thorn_thallid.txt
+++ b/res/cardsfolder/thorn_thallid.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Thorn Thallid.
 PT:2/2
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thorn_thallid.jpg
 SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/96.jpg
diff --git a/res/cardsfolder/vitaspore_thallid.txt b/res/cardsfolder/vitaspore_thallid.txt
index 20d5b6eaeb0..659e3375f23 100644
--- a/res/cardsfolder/vitaspore_thallid.txt
+++ b/res/cardsfolder/vitaspore_thallid.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Fungus
 Text:At the beginning of your upkeep, put a spore counter on Vitaspore Thallid.
 PT:1/1
-K:Remove three spore counters from CARDNAME: Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Pump | Cost$ Sac<1/Saproling> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vitaspore_thallid.jpg
diff --git a/res/cardsfolder/vitu_ghazi_the_city_tree.txt b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
index d49291e285c..08680f93b0d 100644
--- a/res/cardsfolder/vitu_ghazi_the_city_tree.txt
+++ b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:tap: add 1
-#K:abMakeToken 2 G W T<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
 A:AB$Token | Cost$ 2 G W T | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vitu_ghazi_the_city_tree.jpg