diff --git a/res/cardsfolder/a/armored_skaab.txt b/res/cardsfolder/a/armored_skaab.txt
index e94d9e3489d..8010d966940 100644
--- a/res/cardsfolder/a/armored_skaab.txt
+++ b/res/cardsfolder/a/armored_skaab.txt
@@ -5,7 +5,6 @@ Text:no text
 PT:1/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, put the top four cards of your library into your graveyard.
 SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 4 | Defined$ You
-SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/armored_skaab.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/43.jpg
diff --git a/res/cardsfolder/b/burning_vengeance.txt b/res/cardsfolder/b/burning_vengeance.txt
index de3875fac82..54b7b16fe67 100644
--- a/res/cardsfolder/b/burning_vengeance.txt
+++ b/res/cardsfolder/b/burning_vengeance.txt
@@ -4,6 +4,7 @@ Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | ValidCard$ Card.YouOwn | Origin$ Graveyard  | Destination$ Stack | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell from your graveyard, CARDNAME deals 2 damage to target creature or player.
 SVar:TrigDamage:AB$ DealDamage | Cost$ 0| Tgt$ TgtCP | NumDmg$ 2
+SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_vengeance.jpg
 SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/133.jpg
diff --git a/res/cardsfolder/c/corpse_lunge.txt b/res/cardsfolder/c/corpse_lunge.txt
index 9218cb602a6..4d52b12a344 100644
--- a/res/cardsfolder/c/corpse_lunge.txt
+++ b/res/cardsfolder/c/corpse_lunge.txt
@@ -4,6 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ DealDamage | Cost$ 2 B ExileFromGrave<1/Creature> | NumDmg$ X | ValidTgts$ Creature | TgtPrompt$ Select target creature | CostDesc$ As an additional cost to cast CARDNAME, exile a creature card from your graveyard. | SpellDescription$ CARDNAME deals damage equal to the exiled card's power to target creature.
 SVar:X:Exiled$CardPower
+SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_lunge.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/93.jpg
diff --git a/res/cardsfolder/d/deranged_assistant.txt b/res/cardsfolder/d/deranged_assistant.txt
index 26814f68bde..f62731ccab3 100644
--- a/res/cardsfolder/d/deranged_assistant.txt
+++ b/res/cardsfolder/d/deranged_assistant.txt
@@ -4,7 +4,6 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 A:AB$ Mana | Cost$ T Mill<1> | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deranged_assistant.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/52.jpg
diff --git a/res/cardsfolder/d/devils_play.txt b/res/cardsfolder/d/devils_play.txt
index 7d699359bb4..45613b34d52 100644
--- a/res/cardsfolder/d/devils_play.txt
+++ b/res/cardsfolder/d/devils_play.txt
@@ -6,7 +6,6 @@ A:SP$ DealDamage | Cost$ X R | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNA
 A:SP$ DealDamage | Cost$ X R R R | Tgt$ TgtCP | NumDmg$ Y | Flashback$ True | CostDesc$ Flashback - X R R R | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 SVar:X:Count$xPaid
 SVar:Y:Count$xPaid
-SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/devils_play.jpg
 SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/140.jpg
diff --git a/res/cardsfolder/d/diregraf_ghoul.txt b/res/cardsfolder/d/diregraf_ghoul.txt
index fc4cdc09027..0456a0ef481 100644
--- a/res/cardsfolder/d/diregraf_ghoul.txt
+++ b/res/cardsfolder/d/diregraf_ghoul.txt
@@ -6,6 +6,6 @@ PT:2/2
 K:CARDNAME enters the battlefield tapped.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diregraf_ghoul.jpg
-Oracle:Diregraf Ghoul enters the battlefield tapped.
 SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/97.jpg
+Oracle:Diregraf Ghoul enters the battlefield tapped.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/doomed_traveler.txt b/res/cardsfolder/d/doomed_traveler.txt
index ffe7be968c2..6466168e7b5 100644
--- a/res/cardsfolder/d/doomed_traveler.txt
+++ b/res/cardsfolder/d/doomed_traveler.txt
@@ -6,7 +6,7 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:SacMe:1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/doomed_traveler.jpg
 SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/doomed_traveler.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/11.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/endless_ranks_of_the_dead.txt b/res/cardsfolder/e/endless_ranks_of_the_dead.txt
index d5ed1f42300..147dd3ce57c 100644
--- a/res/cardsfolder/e/endless_ranks_of_the_dead.txt
+++ b/res/cardsfolder/e/endless_ranks_of_the_dead.txt
@@ -5,6 +5,7 @@ Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put X 2/2 black zombie creature tokens onto the battlefield, where X is half the number of the zombies you control, rounded down.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 2 2 Zombie |  TokenAmount$ X | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenPower$ 2 | TokenToughness$ 2 | TokenColors$ Black
 SVar:X:Count$Valid Creature.zombie+YouCtrl/HalfDown
+SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/endless_ranks_of_the_dead.jpg
 SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/99.jpg