diff --git a/src/main/java/forge/card/CardRulesReader.java b/src/main/java/forge/card/CardRulesReader.java
index 2a078d4db47..f8bbac42489 100644
--- a/src/main/java/forge/card/CardRulesReader.java
+++ b/src/main/java/forge/card/CardRulesReader.java
@@ -19,8 +19,6 @@ package forge.card;
 
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-
 import forge.card.mana.ManaCostShard;
 import forge.card.mana.IParserManaCost;
 
diff --git a/src/main/java/forge/gui/GuiDisplayUtil.java b/src/main/java/forge/gui/GuiDisplayUtil.java
index cacb81c769f..e09d5189ae1 100644
--- a/src/main/java/forge/gui/GuiDisplayUtil.java
+++ b/src/main/java/forge/gui/GuiDisplayUtil.java
@@ -41,13 +41,8 @@ import forge.CardUtil;
 import forge.Constant;
 import forge.Counters;
 import forge.Singletons;
-import forge.StaticEffects;
-import forge.card.replacement.ReplacementHandler;
 import forge.card.spellability.AbilityMana;
-import forge.card.trigger.TriggerHandler;
 import forge.card.trigger.TriggerType;
-import forge.control.input.InputControl;
-import forge.game.phase.Combat;
 import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
@@ -790,17 +785,13 @@ public final class GuiDisplayUtil {
 
     public static void devModeBreakpoint() {
         List<Player> Players = AllZone.getPlayersInGame();
-
+/*
         Combat CombatHandler = AllZone.getCombat();
-
         TriggerHandler Triggers = AllZone.getTriggerHandler();
-
         InputControl InputHandler = AllZone.getInputControl();
-
         ReplacementHandler Replacements = AllZone.getReplacementHandler();
-
         StaticEffects StaticHandler = AllZone.getStaticEffects();
-
+*/
         List<PlayerZone> Zones = new ArrayList<PlayerZone>();
         for (Player p : Players) {
 
diff --git a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
index 0a2842edf79..03a9ebc0684 100644
--- a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
+++ b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
@@ -32,7 +32,6 @@ import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.util.ArrayList;
-
 import javax.swing.AbstractButton;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -51,12 +50,11 @@ import javax.swing.event.ChangeListener;
 
 import com.esotericsoftware.minlog.Log;
 
-import forge.AllZone;
-import forge.Card;
 import forge.CardUtil;
 import forge.Singletons;
-import forge.card.EditionInfo;
 import forge.error.ErrorViewer;
+import forge.item.CardDb;
+import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.properties.NewConstants.Lang.GuiDownloadPictures;
@@ -489,61 +487,25 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
 
         final ArrayList<MCard> cList = new ArrayList<MCard>();
 
-        // File imgBase = ForgeProps.getFile(NewConstants.IMAGE_BASE);
+        File imgBase = ForgeProps.getFile(NewConstants.IMAGE_BASE);
         final String urlBase = "C:\\MTGForge\\HQPICS\\";
         String imgFN = "";
 
-        for (final Card c : AllZone.getCardFactory()) {
+        for (final CardPrinted cp : CardDb.instance().getAllCards()) 
+        {
             // String url = c.getSVar("Picture");
             // String[] URLs = url.split("\\\\");
+            String edCode = cp.getEdition();
+            final String setCode2 = Singletons.getModel().getEditions().getCode2ByCode(edCode);
+            imgFN = CardUtil.buildFilename(cp);
 
-            final ArrayList<EditionInfo> cSetInfo = c.getSets();
-            if (cSetInfo.size() > 0) {
-                for (int j = 0; j < cSetInfo.size(); j++) {
-                    c.setCurSetCode(cSetInfo.get(j).getCode());
-                    final String setCode3 = c.getCurSetCode();
-                    final String setCode2 = Singletons.getModel().getEditions().getCode2ByCode(c.getCurSetCode());
-
-                    int n = 0;
-                    if (cSetInfo.get(j).getPicCount() > 0) {
-                        n = cSetInfo.get(j).getPicCount();
-
-                        for (int k = 1; k <= n; k++) {
-                            c.setRandomPicture(k);
-
-                            imgFN = CardUtil.buildFilename(c);
-
-                            if (imgFN.equals("none") || (!imgFN.contains(setCode3) && !imgFN.contains(setCode2))) {
-                                imgFN += k + ".jpg";
-                                final String fn = GuiDisplayUtil.cleanStringMWS(c.getName()) + k + ".full.jpg";
-                                // CList.add(new mCard(SC3 + "/" + fn, URLBase +
-                                // SC2 + "/" + Base64Coder.encodeString(fn,
-                                // true), SC3));
-                                cList.add(new MCard(setCode3 + "\\" + imgFN, urlBase + setCode2 + "\\" + fn, setCode3));
-                            }
-                        }
-                    } else {
-                        c.setRandomPicture(0);
-
-                        imgFN = CardUtil.buildFilename(c);
-
-                        if (imgFN.equals("none") || (!imgFN.contains(setCode3) && !imgFN.contains(setCode2))) {
-                            // imgFN += ".jpg";
-
-                            final String newFileName = GuiDisplayUtil.cleanString(c.getName()) + ".jpg";
-
-                            final String fn = GuiDisplayUtil.cleanStringMWS(c.getName()) + ".full.jpg";
-                            // fn = fn.replace(" ", "%20%");
-                            // CList.add(new mCard(SC3 + "/" + fn, URLBase + SC2
-                            // + "/" + Base64Coder.encodeString(fn, true),
-                            // SC3));
-                            cList.add(new MCard(setCode3 + "\\" + newFileName, urlBase + setCode2 + "\\" + fn, setCode3));
-
-                        }
-
-                    }
-                }
-
+            if (imgFN.equals("none") || (!imgFN.contains(edCode) && !imgFN.contains(setCode2))) {
+                imgFN = GuiDisplayUtil.cleanStringMWS(cp.getName());
+                final int maxIndex = cp.getCard().getEditionInfo(cp.getEdition()).getCopiesCount();
+                String k = maxIndex > 1 ? Integer.valueOf(cp.getArtIndex() + 1).toString() : "";
+                final String fn = GuiDisplayUtil.cleanStringMWS(cp.getName()) + k + ".full.jpg";
+                final String destFn = imgBase + File.pathSeparator + edCode + File.pathSeparator + imgFN + k + ".jpg"; 
+                cList.add(new MCard( destFn, urlBase + setCode2 + "\\" + fn, edCode));
             }
 
             // Log.error(iName + ".jpg" + "\t" + URLs[0]);
diff --git a/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java b/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java
index 26578748a80..f81710fe543 100644
--- a/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java
+++ b/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java
@@ -23,11 +23,12 @@ import java.util.List;
 
 import javax.swing.JFrame;
 
-import forge.AllZone;
 import forge.Card;
 import forge.CardCharactersticName;
 import forge.card.CardCharacteristics;
 import forge.gui.GuiDisplayUtil;
+import forge.item.CardDb;
+import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 
@@ -68,7 +69,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloader {
         final ArrayList<DownloadObject> cList = new ArrayList<DownloadObject>();
 
         final String base = ForgeProps.getFile(NewConstants.IMAGE_BASE).getPath();
-        for (final Card c : AllZone.getCardFactory()) {
+        for (final CardPrinted c : CardDb.instance().getAllCards()) {
             cList.addAll(this.createDLObjects(c, base));
         }
 
@@ -92,11 +93,12 @@ public class GuiDownloadPicturesLQ extends GuiDownloader {
         return list.toArray(new DownloadObject[list.size()]);
     } // getNeededImages()
 
-    private List<DownloadObject> createDLObjects(final Card c, final String base) {
+    private List<DownloadObject> createDLObjects(final CardPrinted c, final String base) {
         final ArrayList<DownloadObject> ret = new ArrayList<DownloadObject>();
 
-        for (final CardCharactersticName state : c.getStates()) {
-            CardCharacteristics stateCharacteristics = c.getState(state);
+        Card fc = c.toForgeCard();
+        for (final CardCharactersticName state : fc.getStates()) {
+            CardCharacteristics stateCharacteristics = fc.getState(state);
             final String url = stateCharacteristics.getSVar("Picture");
             if (!url.isEmpty()) {
                 final String[] urls = url.split("\\\\");
diff --git a/src/main/java/forge/gui/match/controllers/CDev.java b/src/main/java/forge/gui/match/controllers/CDev.java
index a057a61e4f6..e6f9d408d9b 100644
--- a/src/main/java/forge/gui/match/controllers/CDev.java
+++ b/src/main/java/forge/gui/match/controllers/CDev.java
@@ -5,7 +5,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import forge.Command;
-import forge.Constant;
 import forge.Singletons;
 import forge.gui.GuiDisplayUtil;
 import forge.gui.framework.ICDoc;