diff --git a/res/cardsfolder/b/brood_birthing.txt b/res/cardsfolder/b/brood_birthing.txt
index 17fca039d3c..6d857f43d13 100644
--- a/res/cardsfolder/b/brood_birthing.txt
+++ b/res/cardsfolder/b/brood_birthing.txt
@@ -1,8 +1,12 @@
 Name:Brood Birthing
 ManaCost:1 R
 Types:Sorcery
-Text:If you control an Eldrazi Spawn, put three 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add 1 to your mana pool." Otherwise, put one of those tokens onto the battlefield.
+Text:no text
+A:SP$ Token | Cost$ 1 R | TokenAmount$ 3 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenOwner$ You | TokenAbilities$ ABMana | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBToken | SpellDescription$ If you control an Eldrazi Spawn, put three 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add 1 to your mana pool." Otherwise, put one of those tokens onto the battlefield.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenOwner$ You | TokenAbilities$ ABMana | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Amount$ 1 | Produced$ 1 | SpellDescription$ Add 1 to your mana pool
 SVar:Rarity:Common
+SVar:X:Count$Valid Card.YouCtrl+namedEldrazi Spawn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_birthing.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/138.jpg
 Oracle:If you control an Eldrazi Spawn, put three 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool." Otherwise, put one of those tokens onto the battlefield.
diff --git a/res/cardsfolder/o/oona_queen_of_the_fae.txt b/res/cardsfolder/o/oona_queen_of_the_fae.txt
index bbf504e6558..59381ba9c5d 100644
--- a/res/cardsfolder/o/oona_queen_of_the_fae.txt
+++ b/res/cardsfolder/o/oona_queen_of_the_fae.txt
@@ -1,16 +1,17 @@
-Name:Oona, Queen of the Fae
-ManaCost:3 UB UB UB
-Types:Legendary Creature Faerie Wizard
-Text:no text
-PT:5/5
-A:AB$ ChooseColor | Cost$ X UB | Defined$ You | AILogic$ MostProminentInHumanDeck | SubAbility$ DBMill | SpellDescription$ Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield.
-SVar:DBMill:DB$ Mill | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ X | Destination$ Exile | RememberMilled$ True | SubAbility$ DBToken
-SVar:DBToken:DB$Token | TokenAmount$ Y | TokenName$ Faerie Rogue | TokenTypes$ Creature,Faerie,Rogue | TokenOwner$ You | TokenColors$ Blue,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ Clear
-SVar:Clear:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$xPaid
-SVar:Y:Remembered$Valid Card.ChosenColor
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/oona_queen_of_the_fae.jpg
-SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/172.jpg
-Oracle:Flying\n{X}{U/B}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield.
+Name:Oona, Queen of the Fae
+ManaCost:3 UB UB UB
+Types:Legendary Creature Faerie Wizard
+Text:no text
+PT:5/5
+K:Flying
+A:AB$ ChooseColor | Cost$ X UB | Defined$ You | AILogic$ MostProminentInHumanDeck | SubAbility$ DBMill | SpellDescription$ Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield.
+SVar:DBMill:DB$ Mill | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ X | Destination$ Exile | RememberMilled$ True | SubAbility$ DBToken
+SVar:DBToken:DB$Token | TokenAmount$ Y | TokenName$ Faerie Rogue | TokenTypes$ Creature,Faerie,Rogue | TokenOwner$ You | TokenColors$ Blue,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ Clear
+SVar:Clear:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+SVar:Y:Remembered$Valid Card.ChosenColor
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/oona_queen_of_the_fae.jpg
+SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/172.jpg
+Oracle:Flying\n{X}{U/B}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
index 394550ecb00..6ebe3f3058c 100644
--- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
+++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java
@@ -1534,35 +1534,6 @@ public class CardFactorySorceries {
             card.setSVar("PlayMain1", "TRUE");
         } // *************** END ************ END **************************
 
-        // *************** START *********** START **************************
-        else if (cardName.equals("Brood Birthing")) {
-            final SpellAbility spell = new Spell(card) {
-                private static final long serialVersionUID = -8303724057068847270L;
-
-                @Override
-                public void resolve() {
-                    int times = 1;
-                    CardList cl;
-                    if (card.getController().getCardsIn(Zone.Battlefield, "Eldrazi Spawn").size() > 0) {
-                        times = 3;
-                    }
-                    for (int i = 0; i < times; i++) {
-                        cl = CardFactoryUtil.makeToken("Eldrazi Spawn", "C 0 1 Eldrazi Spawn", card.getController(),
-                                "", new String[] { "Creature", "Eldrazi", "Spawn" }, 0, 1, new String[] {});
-                        for (final Card crd : cl) {
-                            crd.addSpellAbility(CardFactoryUtil.getEldraziSpawnAbility(crd));
-                        }
-                    }
-                }
-            };
-            final StringBuilder sb = new StringBuilder();
-            sb.append(cardName).append(" - ").append(card.getController());
-            sb.append(" puts one or three 0/1 Eldrazi Spawn creature tokens onto the battlefield.");
-            spell.setStackDescription(sb.toString());
-
-            card.addSpellAbility(spell);
-        } // *************** END ************ END **************************
-
         // *************** START *********** START **************************
         else if (cardName.equals("Explosive Revelation")) {
             /*