diff --git a/res/cardsfolder/b/bazaar_of_wonders.txt b/res/cardsfolder/b/bazaar_of_wonders.txt
index 2fdcbfad561..67342fd81ca 100644
--- a/res/cardsfolder/b/bazaar_of_wonders.txt
+++ b/res/cardsfolder/b/bazaar_of_wonders.txt
@@ -1,7 +1,9 @@
 Name:Bazaar of Wonders
 ManaCost:3 U U
 Types:World Enchantment
-Text:When Bazaar of Wonders enters the battlefield, exile all cards from all graveyards.\r\nWhenever a player casts a spell, counter it if a card with the same name is in a graveyard or a nontoken permanent with the same name is on the battlefield.
+Text:Whenever a player casts a spell, counter it if a card with the same name is in a graveyard or a nontoken permanent with the same name is on the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ExileAll | TriggerDescription$ When CARDNAME enters the battlefield, exile all cards from all graveyards.
+SVar:ExileAll:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bazaar_of_wonders.jpg
diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
index e36c46555c8..9c70ddd9dbd 100644
--- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
@@ -1326,30 +1326,6 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
         } //*************** END ************ END **************************
 
 
-        //*************** START *********** START **************************
-        else if (cardName.equals("Bazaar of Wonders")) {
-            /*
-             * When Bazaar of Wonders enters the battlefield, exile all cards from all graveyards.
-             */
-            Command intoPlay = new Command() {
-                private static final long serialVersionUID = 9209706681167017765L;
-
-                public void execute() {
-                    CardList hGrave = AllZone.getHumanPlayer().getCardsIn(Zone.Graveyard);
-                    CardList cGrave = AllZone.getComputerPlayer().getCardsIn(Zone.Graveyard);
-
-                    for (Card c : hGrave) {
-                        AllZone.getGameAction().exile(c);
-                    }
-                    for (Card c : cGrave) {
-                        AllZone.getGameAction().exile(c);
-                    }
-                }
-            };
-                                    card.addComesIntoPlayCommand(intoPlay);
-        } //*************** END ************ END **************************
-
-
         //*************** START *********** START **************************
         else if (cardName.equals("Phyrexian Processor")) {
             Command intoPlay = new Command() {