diff --git a/res/cardsfolder/call_of_the_herd.txt b/res/cardsfolder/call_of_the_herd.txt
index 97fff02a3cb..a43dc44428e 100644
--- a/res/cardsfolder/call_of_the_herd.txt
+++ b/res/cardsfolder/call_of_the_herd.txt
@@ -2,7 +2,6 @@ Name:Call of the Herd
 ManaCost:2 G
 Types:Sorcery
 Text:Put a 3/3 green Elephant creature token onto the battlefield.
-#K:spMakeToken<>1<>Elephant<>G 3 3 Elephant<>Controller<>G<>Creature;Elephant<>3<>3<>None
 A:SP$Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ Controller
 K:Flashback:3 G
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/carrion_call.txt b/res/cardsfolder/carrion_call.txt
index 8d467f389d6..4168f2af141 100644
--- a/res/cardsfolder/carrion_call.txt
+++ b/res/cardsfolder/carrion_call.txt
@@ -1,9 +1,8 @@
 Name:Carrion Call
 ManaCost:3 G
 Types:Instant
-Text:Put two 1/1 green Insect creature tokens with infect onto the battlefield.
-#K:spMakeToken<>2<>Insect<>G 1 1 Insect<>Controller<>G<>Creature;Insect<>1<>1<>Infect
-A:SP$Token | Cost$ 3 G | TokenImage$ G 1 1 Insect Infect | TokenAmount$ 2 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Infect
+Text:no text
+A:SP$Token | Cost$ 3 G | TokenImage$ G 1 1 Insect Infect | TokenAmount$ 2 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Infect|SpellDescription$Put two 1/1 green Insect creature tokens with infect onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carrion_call.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/115.jpg
diff --git a/res/cardsfolder/chatter_of_the_squirrel.txt b/res/cardsfolder/chatter_of_the_squirrel.txt
index 1ad44eb8e8b..48242ca7d92 100644
--- a/res/cardsfolder/chatter_of_the_squirrel.txt
+++ b/res/cardsfolder/chatter_of_the_squirrel.txt
@@ -1,9 +1,8 @@
 Name:Chatter of the Squirrel
 ManaCost:G
 Types:Sorcery
-Text:Put a 1/1 green Squirrel creature token onto the battlefield.
-#K:spMakeToken<>1<>Squirrel<>G 1 1 Squirrel<>Controller<>G<>Creature;Squirrel<>1<>1<>None
-A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Squirrel | TokenColors$ Green | TokenTypes$ Creature,Squirrel | TokenOwner$ Controller | TokenPower$ 1 | TokenToughness$ 1
+Text:no text
+A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Squirrel | TokenColors$ Green | TokenTypes$ Creature,Squirrel | TokenOwner$ Controller | TokenPower$ 1 | TokenToughness$ 1|SpellDescription$Put a 1/1 green Squirrel creature token onto the battlefield.
 K:Flashback:1 G
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chatter_of_the_squirrel.jpg
diff --git a/res/cardsfolder/crush_of_wurms.txt b/res/cardsfolder/crush_of_wurms.txt
index c5646053571..928cdf210f5 100644
--- a/res/cardsfolder/crush_of_wurms.txt
+++ b/res/cardsfolder/crush_of_wurms.txt
@@ -1,9 +1,8 @@
 Name:Crush of Wurms
 ManaCost:6 G G G
 Types:Sorcery
-Text:Put three 6/6 green Wurm creature tokens onto the battlefield.
-#K:spMakeToken<>3<>Wurm<>G 6 6 Wurm<>Controller<>G<>Creature;Wurm<>6<>6<>None
-A:SP$Token | Cost$ 6 G G G | TokenAmount$ 3 | TokenName$ Wurm | TokenColors$ Green | TokenTypes$ Creature,Wurm | TokenOwner$ Controller | TokenPower$ 6 | TokenToughness$ 6
+Text:no text
+A:SP$Token | Cost$ 6 G G G | TokenAmount$ 3 | TokenName$ Wurm | TokenColors$ Green | TokenTypes$ Creature,Wurm | TokenOwner$ Controller | TokenPower$ 6 | TokenToughness$ 6|SpellDescription$Put three 6/6 green Wurm creature tokens onto the battlefield.
 K:Flashback:9 G G G
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crush_of_wurms.jpg
diff --git a/res/cardsfolder/the_hive.txt b/res/cardsfolder/the_hive.txt
index 951117aed39..ad1ba45ffc8 100644
--- a/res/cardsfolder/the_hive.txt
+++ b/res/cardsfolder/the_hive.txt
@@ -2,7 +2,6 @@ Name:The Hive
 ManaCost:5
 Types:Artifact
 Text:no text
-#K:abMakeToken 5 T<>1<>Wasp<>C 1 1 Wasp<>Controller<>1<>Artifact;Creature;Insect<>1<>1<>Flying<>Put a 1/1 colorless Insect artifact creature token with flying named Wasp onto the battlefield.
 A:AB$Token | Cost$ 5 T | TokenAmount$ 1 | TokenName$ Wasp | TokenTypes$ Artifact,Creature,Insect | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 colorless Insect artifact creature token with flying named Wasp onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/the_hive.jpg
diff --git a/res/cardsfolder/tidal_wave.txt b/res/cardsfolder/tidal_wave.txt
index 21d169b2ba4..fe7300734ed 100644
--- a/res/cardsfolder/tidal_wave.txt
+++ b/res/cardsfolder/tidal_wave.txt
@@ -1,9 +1,8 @@
 Name:Tidal Wave
 ManaCost:2 U
 Types:Instant
-Text:Put a 5/5 blue Wall creature token with defender onto the battlefield. Sacrifice it at the beginning of the next end step.
-#K:spMakeToken<>1<>Wall<>U 5 5 Wall<>Controller<>U<>Creature;Wall<>3<>1<>Defender;At the beginning of the end step, sacrifice CARDNAME.
-A:SP$Token | Cost$ 2 U | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Creature,Wall | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Defender<>At the beginning of the end step, sacrifice CARDNAME.
+Text:no text
+A:SP$Token | Cost$ 2 U | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Creature,Wall | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Defender<>At the beginning of the end step, sacrifice CARDNAME.|SpellDescription$Put a 5/5 blue Wall creature token with defender onto the battlefield. Sacrifice it at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_wave.jpg
diff --git a/res/cardsfolder/urzas_factory.txt b/res/cardsfolder/urzas_factory.txt
index 0bfd5738bc6..396031a5294 100644
--- a/res/cardsfolder/urzas_factory.txt
+++ b/res/cardsfolder/urzas_factory.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land Urza's
 Text:no text
 K:tap: add 1
-#K:abMakeToken 7<>1<>Assembly-Worker<>C 2 2 Assembly-Worker<>Controller<>1<>Artifact;Creature;Assembly-Worker<>2<>2<>None<>Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield.
 A:AB$Token | Cost$ 7 | TokenAmount$ 1 | TokenName$ Assembly-Worker | TokenTypes$ Artifact,Creature,Assembly-Worker | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_factory.jpg
diff --git a/res/cardsfolder/wall_of_kelp.txt b/res/cardsfolder/wall_of_kelp.txt
index d0fca3a7cf6..f0c3d3b1042 100644
--- a/res/cardsfolder/wall_of_kelp.txt
+++ b/res/cardsfolder/wall_of_kelp.txt
@@ -4,8 +4,7 @@ Types:Creature Wall
 Text:no text
 PT:0/3
 K:Defender
-#K:abMakeToken U U T<>1<>Plant Wall<>U 0 1 Plant Wall<>Controller<>U<>Creature;Plant;Wall<>0<>1<>Defender<>put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
-A:AB$Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant Wall | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
+A:AB$Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant,Wall | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/hm/en-us/card2959.jpg
diff --git a/res/cardsfolder/waylay.txt b/res/cardsfolder/waylay.txt
index 2dab9430669..97f77edf0b1 100644
--- a/res/cardsfolder/waylay.txt
+++ b/res/cardsfolder/waylay.txt
@@ -1,9 +1,8 @@
 Name:Waylay
 ManaCost:2 W
 Types:Instant
-Text:Put three 2/2 white Knight creature tokens onto the battlefield. Exile them at the beginning of the next cleanup step.
-#K:spMakeToken<>3<>Knight<>W 2 2 Knight<>Controller<>W<>Creature;Knight<>2<>2<>At the beginning of the end step, exile CARDNAME.
-A:SP$Token | Cost$ 2 W | TokenAmount$ 3 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ At the beginning of the end step, exile CARDNAME.
+Text:no text
+A:SP$Token | Cost$ 2 W | TokenAmount$ 3 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ At the beginning of the end step, exile CARDNAME.|SpellDescription$Put three 2/2 white Knight creature tokens onto the battlefield. Exile them at the beginning of the next cleanup step.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waylay.jpg