diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index 60dafd47cbd..94423ed4a61 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -28,6 +28,7 @@
 package mage.client.deckeditor;
 
 import mage.cards.Card;
+import mage.cards.CardImpl;
 import mage.cards.decks.Deck;
 import mage.cards.decks.importer.DeckImporter;
 import mage.cards.decks.importer.DeckImporterUtil;
@@ -190,7 +191,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
                             CardInfo cardInfo = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber());
                             Card card = cardInfo != null ? cardInfo.getCard() : null;
                             if (card != null) {
-                                deck.getSideboard().add(Sets.createCard(card.getClass()));
+                                deck.getSideboard().add(CardImpl.createCard(card.getClass()));
                             }
                             if (cardInfoPane instanceof  CardInfoPane)  {
                                 ((CardInfoPane)cardInfoPane).setCard(new CardView(card));
diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java
index c2319d2fac2..88800cdeda8 100644
--- a/Mage.Sets/src/mage/sets/Sets.java
+++ b/Mage.Sets/src/mage/sets/Sets.java
@@ -35,13 +35,11 @@ import mage.cache.CacheService;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.ExpansionSet;
-import mage.cards.decks.Deck;
 import mage.cards.decks.DeckCardLists;
 import org.apache.log4j.Logger;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
 import java.util.*;
 
 /**
@@ -262,48 +260,6 @@ public class Sets extends HashMap<String, ExpansionSet> {
         return symbol.equals("W") || symbol.equals("G") || symbol.equals("U") || symbol.equals("B") || symbol.equals("R");
     }
 
-    public static Card findCard(String name) {
-        for (ExpansionSet set: fINSTANCE.values()) {
-            Card card = set.findCard(name);
-            if (card != null)
-                return card;
-        }
-        return null;
-    }
-
-    public static Card findCard(String name, boolean random) {
-        if (!random) {
-            return findCard(name);
-        } else {
-            List<Card> cardsFound = new ArrayList<Card>();
-            for (ExpansionSet set: fINSTANCE.values()) {
-                Card card = set.findCard(name, true);
-                if (card != null) {
-                    cardsFound.add(card);
-                }
-            }
-            if (cardsFound.size() > 0) {
-                Card card = cardsFound.get(rnd.nextInt(cardsFound.size()));
-                String cardClassName = card.getClass().getName();
-                return CardImpl.createCard(cardClassName);
-            }
-        }
-        return null;
-    }
-
-    public static Card createCard(Class clazz) {
-        try {
-            Constructor<?> con = clazz.getConstructor(new Class[]{UUID.class});
-            Card card = (Card) con.newInstance(new Object[] {null});
-            card.build();
-            return card;
-        } catch (Exception ex) {
-            logger.fatal("Error creating card:" + clazz.getName(), ex);
-            return null;
-        }
-    }
-
-
     public static ExpansionSet findSet(String code) {
         if (fINSTANCE.containsKey(code))
             return fINSTANCE.get(code);
diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java
index 20dc13314aa..da4f6dcccca 100644
--- a/Mage/src/mage/cards/ExpansionSet.java
+++ b/Mage/src/mage/cards/ExpansionSet.java
@@ -125,51 +125,6 @@ public abstract class ExpansionSet implements Serializable {
         return name;
     }
 
-    public Card findCard(String name) {
-        for (Card card : getCards()) {
-            if (name.equalsIgnoreCase(card.getName())) {
-                Card newCard = card.copy();
-                newCard.assignNewId();
-                return newCard;
-            }
-        }
-        return null;
-    }
-
-    public Card findCard(int cardNum) {
-        for (Card card : getCards()) {
-            if (cardNum == card.getCardNumber()) {
-                Card newCard = card.copy();
-                newCard.assignNewId();
-                return newCard;
-            }
-        }
-        return null;
-    }
-
-    public Card findCard(String name, boolean random) {
-        List<Card> foundCards = new ArrayList<Card>();
-        for (Card card : getCards()) {
-            if (name.equalsIgnoreCase(card.getName())) {
-                foundCards.add(card);
-            }
-        }
-        if (foundCards.size() > 0) {
-            Card newCard = foundCards.get(rnd.nextInt(foundCards.size())).copy();
-            newCard.assignNewId();
-            return newCard;
-        }
-        return null;
-    }
-
-    public String findCardName(int cardNum) {
-        for (Card card : getCards()) {
-            if (card.getCardNumber() == cardNum)
-                return card.getClass().getCanonicalName();
-        }
-        return null;
-    }
-
     private List<Card> getCardClassesForPackage(String packageName) {
         ClassLoader classLoader = this.getClass().getClassLoader();
         assert classLoader != null;