diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index bc12359ba90..4b4d0084734 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -25,19 +25,13 @@
 * authors and should not be interpreted as representing official policies, either expressed
 * or implied, of BetaSteward_at_googlemail.com.
 */
-
-/*
- * MageFrame.java
- *
- * Created on 15-Dec-2009, 9:11:37 PM
- */
-
 package mage.client;
 
 import de.schlichtherle.truezip.file.TArchiveDetector;
 import de.schlichtherle.truezip.file.TConfig;
 import de.schlichtherle.truezip.fs.FsOutputOption;
 import mage.cards.decks.Deck;
+import mage.cards.repository.CardCriteria;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
 import mage.client.cards.BigCard;
@@ -91,8 +85,10 @@ import java.awt.image.BufferedImage;
 import java.beans.PropertyVetoException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -471,7 +467,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
     private void checkForNewImages() {
         long beforeCall = System.currentTimeMillis();
-        List<CardInfo> cards = CardRepository.instance.getAllCards();
+        List<CardInfo> cards = CardRepository.instance.findCards(new CardCriteria());
         logger.info("Card pool load time: " + ((System.currentTimeMillis() - beforeCall) / 1000 + " seconds"));
 
         beforeCall = System.currentTimeMillis();
@@ -484,7 +480,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     }
 
     public void btnImagesActionPerformed(java.awt.event.ActionEvent evt) {
-        List<CardInfo> cards = CardRepository.instance.getAllCards();
+        List<CardInfo> cards = CardRepository.instance.findCards(new CardCriteria());
 
         DownloadPictures.startDownload(null, cards);
     }
diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java
index 63b224f1acf..0db957d0b24 100644
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@@ -244,15 +244,4 @@ public enum CardRepository {
         }
         return new ArrayList<CardInfo>();
     }
-
-    public List<CardInfo> getAllCards() {
-        try {
-            QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder();
-            queryBuilder.where().eq("nightCard", false).and().eq("splitCardHalf", false);
-
-            return cardDao.query(queryBuilder.prepare());
-        } catch (SQLException ex) {
-        }
-        return new ArrayList<CardInfo>();
-    }
 }