diff --git a/release/Magarena/scripts/Ball_Lightning.txt b/release/Magarena/scripts/Ball_Lightning.txt
index a3d40114f7..90bd4f3c76 100644
--- a/release/Magarena/scripts/Ball_Lightning.txt
+++ b/release/Magarena/scripts/Ball_Lightning.txt
@@ -9,4 +9,4 @@ cost={R}{R}{R}
 pt=6/1
 ability=trample,haste
 timing=fmain
-requires_card_code
+requires_card_code=Arc Runner
diff --git a/release/Magarena/scripts/Jace_s_Ingenuity.txt b/release/Magarena/scripts/Jace_s_Ingenuity.txt
index 20c31a88ea..1a34679f1b 100644
--- a/release/Magarena/scripts/Jace_s_Ingenuity.txt
+++ b/release/Magarena/scripts/Jace_s_Ingenuity.txt
@@ -6,4 +6,4 @@ rarity=U
 type=Instant
 cost={3}{U}{U}
 timing=draw
-requires_card_code
+requires_card_code=Harmonize
diff --git a/release/Magarena/scripts/Keldon_Vandals.txt b/release/Magarena/scripts/Keldon_Vandals.txt
index 27118cdcf4..bfb41439d0 100644
--- a/release/Magarena/scripts/Keldon_Vandals.txt
+++ b/release/Magarena/scripts/Keldon_Vandals.txt
@@ -10,4 +10,4 @@ cost={2}{R}
 pt=4/1
 timing=main
 ability=echo
-requires_card_code
+requires_card_code=Manic Vandal
diff --git a/release/Magarena/scripts/Mind_Control.txt b/release/Magarena/scripts/Mind_Control.txt
index dfaffadba8..12c03104b7 100644
--- a/release/Magarena/scripts/Mind_Control.txt
+++ b/release/Magarena/scripts/Mind_Control.txt
@@ -8,4 +8,4 @@ subtype=Aura
 cost={3}{U}{U}
 timing=aura
 enchant=gain control,neg creature
-requires_card_code
+requires_card_code=Control Magic
diff --git a/release/Magarena/scripts/Seal_of_Fire.txt b/release/Magarena/scripts/Seal_of_Fire.txt
index d74403b261..b0a23c9ce2 100644
--- a/release/Magarena/scripts/Seal_of_Fire.txt
+++ b/release/Magarena/scripts/Seal_of_Fire.txt
@@ -7,4 +7,4 @@ rarity=C
 type=Enchantment
 cost={R}
 timing=enchantment
-requires_card_code
+requires_card_code=Moonglove Extract
diff --git a/release/Magarena/scripts/Suq_Ata_Assassin.txt b/release/Magarena/scripts/Suq_Ata_Assassin.txt
index 1e64f79743..2b3aeaad18 100644
--- a/release/Magarena/scripts/Suq_Ata_Assassin.txt
+++ b/release/Magarena/scripts/Suq_Ata_Assassin.txt
@@ -9,4 +9,4 @@ cost={1}{B}{B}
 pt=1/1
 ability=fear
 timing=main
-requires_card_code
+requires_card_code=Crypt Cobra
diff --git a/release/Magarena/scripts/Swamp_Mosquito.txt b/release/Magarena/scripts/Swamp_Mosquito.txt
index c85e522701..80d813f5cb 100644
--- a/release/Magarena/scripts/Swamp_Mosquito.txt
+++ b/release/Magarena/scripts/Swamp_Mosquito.txt
@@ -9,4 +9,4 @@ cost={1}{B}
 pt=0/1
 ability=flying
 timing=main
-requires_card_code
+requires_card_code=Crypt Cobra
diff --git a/release/Magarena/scripts/Ticking_Gnomes.txt b/release/Magarena/scripts/Ticking_Gnomes.txt
index 085b6b05c3..f6f0f60385 100644
--- a/release/Magarena/scripts/Ticking_Gnomes.txt
+++ b/release/Magarena/scripts/Ticking_Gnomes.txt
@@ -10,4 +10,4 @@ cost={3}
 pt=3/3
 timing=main
 ability=echo
-requires_card_code
+requires_card_code=Mogg Fanatic
diff --git a/release/Magarena/scripts/Viridian_Shaman.txt b/release/Magarena/scripts/Viridian_Shaman.txt
index f5815ff0c3..6ee4f67584 100644
--- a/release/Magarena/scripts/Viridian_Shaman.txt
+++ b/release/Magarena/scripts/Viridian_Shaman.txt
@@ -8,4 +8,4 @@ subtype=Elf,Shaman
 cost={2}{G}
 pt=2/2
 timing=main
-requires_card_code
+requires_card_code=Manic Vandal
diff --git a/src/magic/card/Ball_Lightning.java b/src/magic/card/Ball_Lightning.java
deleted file mode 100644
index 094b8bc667..0000000000
--- a/src/magic/card/Ball_Lightning.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Ball_Lightning {
-    public static final Object T = Arc_Runner.T;
-}
diff --git a/src/magic/card/Jace_s_Ingenuity.java b/src/magic/card/Jace_s_Ingenuity.java
deleted file mode 100644
index 42e0f4d9fb..0000000000
--- a/src/magic/card/Jace_s_Ingenuity.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Jace_s_Ingenuity {
-    public static final Object S = Harmonize.S;
-}
diff --git a/src/magic/card/Keldon_Vandals.java b/src/magic/card/Keldon_Vandals.java
deleted file mode 100644
index 51f68603a6..0000000000
--- a/src/magic/card/Keldon_Vandals.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Keldon_Vandals {
-    public static final Object T = Manic_Vandal.T;
-}
diff --git a/src/magic/card/Mind_Control.java b/src/magic/card/Mind_Control.java
deleted file mode 100644
index 65033194a0..0000000000
--- a/src/magic/card/Mind_Control.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Mind_Control {
-    public static final Object S = Control_Magic.S;
-}
diff --git a/src/magic/card/Seal_of_Fire.java b/src/magic/card/Seal_of_Fire.java
deleted file mode 100644
index 2ff6f0892f..0000000000
--- a/src/magic/card/Seal_of_Fire.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Seal_of_Fire {
-    public static final Object A = Moonglove_Extract.A;
-}
diff --git a/src/magic/card/Suq_Ata_Assassin.java b/src/magic/card/Suq_Ata_Assassin.java
deleted file mode 100644
index ac62707aa0..0000000000
--- a/src/magic/card/Suq_Ata_Assassin.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Suq_Ata_Assassin {
-    public static final Object T = Crypt_Cobra.T;
-}
diff --git a/src/magic/card/Swamp_Mosquito.java b/src/magic/card/Swamp_Mosquito.java
deleted file mode 100644
index 965b8974ce..0000000000
--- a/src/magic/card/Swamp_Mosquito.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Swamp_Mosquito {
-    public static final Object T = Crypt_Cobra.T;
-}
diff --git a/src/magic/card/Ticking_Gnomes.java b/src/magic/card/Ticking_Gnomes.java
deleted file mode 100644
index c56fd15388..0000000000
--- a/src/magic/card/Ticking_Gnomes.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Ticking_Gnomes {
-    public static final Object A = Mogg_Fanatic.A;
-}
diff --git a/src/magic/card/Viridian_Shaman.java b/src/magic/card/Viridian_Shaman.java
deleted file mode 100644
index 65bcd9e058..0000000000
--- a/src/magic/card/Viridian_Shaman.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package magic.card;
-
-public class Viridian_Shaman {
-    public static final Object T = Manic_Vandal.T;
-}