diff --git a/forge-ai/.settings/org.eclipse.core.resources.prefs b/forge-ai/.settings/org.eclipse.core.resources.prefs
index ebf9f8ffb65..f7ef3e0d839 100644
--- a/forge-ai/.settings/org.eclipse.core.resources.prefs
+++ b/forge-ai/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=ISO-8859-1
-encoding//src/test/java=ISO-8859-1
 encoding/<project>=UTF-8
diff --git a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
index f5dc2c0282e..88d585a3a25 100644
--- a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
@@ -1,7 +1,5 @@
 package forge.ai.ability;
 
-import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilMana;
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
diff --git a/forge-core/src/main/java/forge/card/CardFace.java b/forge-core/src/main/java/forge/card/CardFace.java
index e8f4c13e1c6..041e9251378 100644
--- a/forge-core/src/main/java/forge/card/CardFace.java
+++ b/forge-core/src/main/java/forge/card/CardFace.java
@@ -1,7 +1,6 @@
 package forge.card;
 
 import forge.card.mana.ManaCost;
-import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index c2fc49012e1..6f0be2bbd95 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -21,7 +21,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import forge.StaticData;
-import forge.card.CardDb.SetPreference;
 import forge.card.CardDb;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
diff --git a/forge-core/src/main/java/forge/token/TokenDb.java b/forge-core/src/main/java/forge/token/TokenDb.java
index 17cc073d7d6..d3fe2aac9ce 100644
--- a/forge-core/src/main/java/forge/token/TokenDb.java
+++ b/forge-core/src/main/java/forge/token/TokenDb.java
@@ -3,7 +3,6 @@ package forge.token;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
 import forge.card.*;
-import forge.item.PaperCard;
 import forge.item.PaperToken;
 
 import java.util.*;
diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 8dbbe9c6186..cd5668bb20c 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -7,8 +7,6 @@ import forge.card.CardRules;
 import forge.card.CardSplitType;
 import forge.item.PaperCard;
 
-import java.io.File;
-
 import org.apache.commons.lang3.StringUtils;
 
 public class ImageUtil {
diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index 1554ecf1c9e..c624abb49c5 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -34,7 +34,6 @@ import forge.item.PaperCard;
 import forge.util.FileSection;
 import forge.util.FileUtil;
 import forge.util.storage.StorageBase;
-import forge.util.storage.StorageReaderFileSections;
 import forge.util.storage.StorageReaderFolder;
 
 import java.io.File;
diff --git a/forge-game/src/main/java/forge/game/cost/CostPartMana.java b/forge-game/src/main/java/forge/game/cost/CostPartMana.java
index 46c9212287e..908be0a5aee 100644
--- a/forge-game/src/main/java/forge/game/cost/CostPartMana.java
+++ b/forge-game/src/main/java/forge/game/cost/CostPartMana.java
@@ -22,8 +22,6 @@ import forge.card.mana.ManaCostShard;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
-import java.io.Serializable;
-
 /**
  * The mana component of any spell or ability cost
  */
diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
index 1124ac2562e..f1f43259799 100644
--- a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
+++ b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
@@ -20,8 +20,6 @@ package forge.game.mana;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.mana.IParserManaCost;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
index 76431e51b00..164b9d97b73 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 import forge.model.FModel;
-import forge.quest.data.QuestPreferences.QPref;
 
 /** 
  * Handles editor preferences saving and loading.
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
index a59bd7eba72..c83a5eff4ef 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
@@ -500,7 +500,6 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
          * @param qty           a negative quantity will prompt the user for a number
          */
         private void addMakeFoil(final int qty) {
-            final int shortcutModifiers = 0;
             String label = "Foil " + SItemManagerUtil.getItemDisplayString(getItemManager().getSelectedItems(), qty, false);
 
             GuiUtils.addMenuItem(menu, label, null, new Runnable() {
@@ -526,7 +525,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
                             cardManager.addItem(foiledCard, quantity);
                             cardManager.setSelectedItem(foiledCard);
                         }
-                    }, true, shortcutModifiers == 0);
+                    }, true, true);
         }
 
         private void addItem(final String verb, final String dest, final boolean toAlternate, final int qty, final int shortcutModifiers) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
index a3c0c092e26..ccc540ea363 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
@@ -8,7 +8,6 @@ import javax.swing.SwingUtilities;
 
 import com.google.common.collect.Iterables;
 
-import forge.deck.CommanderDeckGenerator;
 import forge.deck.DeckProxy;
 import forge.deck.DeckType;
 import forge.deckchooser.DecksComboBoxEvent;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
index e5ad4e68e82..296c6bac159 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
@@ -19,7 +19,6 @@ import javax.swing.SwingConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import forge.deckchooser.DecksComboBoxEvent;
 import net.miginfocom.swing.MigLayout;
 
 import com.google.common.collect.ImmutableList;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
index ec6aaa2879c..8c14d6d7acd 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
@@ -7,7 +7,6 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.StartButton;
diff --git a/forge-gui-desktop/src/main/java/forge/view/Main.java b/forge-gui-desktop/src/main/java/forge/view/Main.java
index 4c58ce7286a..a51f3fe6461 100644
--- a/forge-gui-desktop/src/main/java/forge/view/Main.java
+++ b/forge-gui-desktop/src/main/java/forge/view/Main.java
@@ -28,7 +28,7 @@ import forge.error.ExceptionHandler;
  */
 public final class Main {
     /**
-     * Main entrypoint for Forge
+     * Main entry point for Forge
      */
     public static void main(final String[] args) {
         // HACK - temporary solution to "Comparison method violates it's general contract!" crash
diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
index bdd8171ddb8..d48c69d4253 100644
--- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
+++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
@@ -17,7 +17,6 @@
  */
 package forge.card;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import forge.Graphics;
 import forge.assets.FSkinImage;
 import forge.card.mana.ManaCost;
diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java
index eeac3ec4dea..49ec9b990b1 100644
--- a/forge-gui-mobile/src/forge/card/CardZoom.java
+++ b/forge-gui-mobile/src/forge/card/CardZoom.java
@@ -13,7 +13,6 @@ import forge.assets.FSkinImage;
 import forge.deck.CardThemedDeckGenerator;
 import forge.deck.CommanderDeckGenerator;
 import forge.deck.DeckProxy;
-import forge.deck.FDeckViewer;
 import forge.game.GameView;
 import forge.game.card.CardView;
 import forge.item.IPaperCard;
diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index 4e5bfc66180..e85f01b0f8a 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -13,7 +13,6 @@ import forge.Graphics;
 import forge.assets.*;
 import forge.card.*;
 import forge.deck.io.DeckPreferences;
-import forge.item.IPaperCard;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
 import forge.itemmanager.ColumnDef;
@@ -29,7 +28,6 @@ import forge.menu.FPopupMenu;
 import forge.model.FModel;
 import forge.planarconquest.ConquestUtil;
 import forge.properties.ForgePreferences.FPref;
-import forge.quest.data.QuestPreferences.QPref;
 import forge.screens.FScreen;
 import forge.screens.TabPageScreen;
 import forge.toolbox.*;
diff --git a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java
index 05c941c1b9c..658c844acef 100644
--- a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java
@@ -22,8 +22,6 @@ import forge.assets.FSkinColor;
 import forge.assets.FSkinColor.Colors;
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
-import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.screens.match.views.VCardDisplayArea.CardAreaPanel;
 import forge.toolbox.FDisplayObject;
 import forge.util.Utils;
diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
index 13c933958da..6e94eb844e2 100644
--- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java
+++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
@@ -4,7 +4,6 @@ import com.google.common.collect.Sets;
 import forge.card.mana.ManaCostShard;
 import forge.game.GameView;
 import forge.game.card.Card;
-import forge.game.card.CardUtil;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.card.CounterType;
diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
index c59e554d563..ed0c54b276f 100644
--- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
@@ -6,7 +6,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
-import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.io.CardThemedMatrixIO;
 import forge.deck.io.DeckStorage;
 import forge.game.GameFormat;
diff --git a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
index 45b287eebce..c4b8b398e24 100644
--- a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
@@ -1,7 +1,5 @@
 package forge.deck;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import forge.card.CardEdition;
 import forge.game.GameFormat;
 import forge.item.PaperCard;
diff --git a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
index e0ceeb1935e..851fe4c0164 100644
--- a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
@@ -7,16 +7,12 @@ import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.deck.generation.DeckGeneratorBase;
-import forge.deck.generation.IDeckGenPool;
-import forge.game.GameFormat;
-import forge.game.GameType;
 import forge.item.PaperCard;
 import forge.model.FModel;
 import forge.util.ItemPool;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by maustin on 09/05/2017.
diff --git a/forge-gui/src/main/java/forge/deck/DeckType.java b/forge-gui/src/main/java/forge/deck/DeckType.java
index 8fea8c7b7da..072fbbb88d6 100644
--- a/forge-gui/src/main/java/forge/deck/DeckType.java
+++ b/forge-gui/src/main/java/forge/deck/DeckType.java
@@ -1,7 +1,6 @@
 package forge.deck;
 
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 
 public enum DeckType {
     CUSTOM_DECK ("Custom User Decks"),
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index e1c1ca0b53d..78b0ba61fd1 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -27,8 +27,6 @@ import forge.ai.AiProfileUtil;
 import forge.card.CardPreferences;
 import forge.card.CardType;
 import forge.deck.CardRelationMatrixGenerator;
-import forge.deck.DeckFormat;
-import forge.deck.io.CardThemedMatrixIO;
 import forge.deck.io.DeckPreferences;
 import forge.game.GameFormat;
 import forge.game.GameType;
diff --git a/forge-gui/src/main/java/forge/net/NetConnectUtil.java b/forge-gui/src/main/java/forge/net/NetConnectUtil.java
index 3e3cdf8e28b..9de56210721 100644
--- a/forge-gui/src/main/java/forge/net/NetConnectUtil.java
+++ b/forge-gui/src/main/java/forge/net/NetConnectUtil.java
@@ -1,7 +1,6 @@
 package forge.net;
 
 import forge.match.LobbySlotType;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.GuiBase;
diff --git a/forge-gui/src/main/java/forge/quest/QuestUtil.java b/forge-gui/src/main/java/forge/quest/QuestUtil.java
index 14621c8d277..c2fe796ef7b 100644
--- a/forge-gui/src/main/java/forge/quest/QuestUtil.java
+++ b/forge-gui/src/main/java/forge/quest/QuestUtil.java
@@ -43,7 +43,6 @@ import forge.quest.bazaar.QuestItemType;
 import forge.quest.bazaar.QuestPetController;
 import forge.quest.data.QuestAchievements;
 import forge.quest.data.QuestAssets;
-import forge.quest.data.QuestPreferences.QPref;
 import forge.util.gui.SGuiChoose;
 import forge.util.gui.SOptionPane;