diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java
index d585b83e0ff..c32ec34166a 100644
--- a/src/main/java/forge/CardUtil.java
+++ b/src/main/java/forge/CardUtil.java
@@ -20,21 +20,15 @@ package forge;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Set;
-
-
-
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 import forge.card.CardCharacteristics;
-import forge.card.CardManaCost;
 import forge.card.EditionInfo;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.mana.ManaCost;
diff --git a/src/main/java/forge/card/abilityfactory/effects/CloneEffect.java b/src/main/java/forge/card/abilityfactory/effects/CloneEffect.java
index 89f719b77ce..8d575344dae 100644
--- a/src/main/java/forge/card/abilityfactory/effects/CloneEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/CloneEffect.java
@@ -13,10 +13,8 @@ import forge.Singletons;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.abilityfactory.SpellEffect;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
-import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 
diff --git a/src/main/java/forge/card/abilityfactory/effects/DamageDealEffect.java b/src/main/java/forge/card/abilityfactory/effects/DamageDealEffect.java
index 91ab2bca261..edf1993de0a 100644
--- a/src/main/java/forge/card/abilityfactory/effects/DamageDealEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/DamageDealEffect.java
@@ -8,7 +8,6 @@ import forge.Card;
 import forge.CardUtil;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.abilityfactory.SpellEffect;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
 
diff --git a/src/main/java/forge/card/abilityfactory/effects/DrawEffect.java b/src/main/java/forge/card/abilityfactory/effects/DrawEffect.java
index c89fe25a478..e7627775ba5 100644
--- a/src/main/java/forge/card/abilityfactory/effects/DrawEffect.java
+++ b/src/main/java/forge/card/abilityfactory/effects/DrawEffect.java
@@ -1,6 +1,5 @@
 package forge.card.abilityfactory.effects;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -9,7 +8,6 @@ import forge.Card;
 import forge.GameActionUtil;
 import forge.card.abilityfactory.AbilityFactory;
 import forge.card.abilityfactory.SpellEffect;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.player.Player;
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
index e1255054c18..02947e85b77 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
@@ -32,7 +32,6 @@ import forge.control.input.InputSelectManyCards;
 import forge.game.player.Player;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
-import forge.view.ButtonUtil;
 
 /**
  * <p>