diff --git a/forge-game/src/main/java/forge/game/PlanarDice.java b/forge-game/src/main/java/forge/game/PlanarDice.java
index f2e813d2464..a0aef3692bb 100644
--- a/forge-game/src/main/java/forge/game/PlanarDice.java
+++ b/forge-game/src/main/java/forge/game/PlanarDice.java
@@ -4,7 +4,6 @@ import forge.game.ability.AbilityKey;
 import forge.game.player.Player;
 import forge.game.trigger.TriggerType;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableList;
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
index 8e9edbb1619..8564a6e92bb 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
@@ -1,7 +1,5 @@
 package forge.game.ability;
 
-import forge.game.card.Card;
-
 import java.util.EnumMap;
 import java.util.Map;
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
index 93775b47b26..b748ce2d4a5 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
@@ -1,6 +1,5 @@
 package forge.game.ability.effects;
 
-import com.google.common.collect.Maps;
 import forge.game.Game;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.SpellAbilityEffect;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
index 3e8a614f416..e5e1c594061 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
@@ -12,7 +12,6 @@ import forge.game.trigger.TriggerType;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import java.util.List;
 import java.util.Map;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
index 65ae08c6cb2..5737a68e3e2 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
@@ -1,6 +1,5 @@
 package forge.game.ability.effects;
 
-import com.google.common.collect.Maps;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
index 27c5373d882..c636bfd9117 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
@@ -1,7 +1,6 @@
 package forge.game.ability.effects;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
 import forge.game.Game;
 import forge.game.GameActionUtil;
 import forge.game.ability.AbilityKey;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index dd42e5314f6..7debeb1d96a 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -4,7 +4,6 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import forge.GameCommand;
 import forge.card.CardStateName;
 import forge.game.Game;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
index 72b976e24bc..332d0ced088 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
@@ -13,7 +13,6 @@ import forge.game.trigger.TriggerType;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class ClashEffect extends SpellAbilityEffect {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java
index 729db2de1e6..4b4586fb1de 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java
@@ -1,7 +1,6 @@
 package forge.game.ability.effects;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import forge.game.Game;
 import forge.game.GameEntityCounterTable;
 import forge.game.ability.AbilityKey;
@@ -17,7 +16,6 @@ import forge.game.zone.ZoneType;
 import forge.util.Lang;
 
 import java.util.List;
-import java.util.Map;
 
 public class ExploreEffect extends SpellAbilityEffect {
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
index e6db4b4f643..1596cbea793 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
@@ -1,7 +1,6 @@
 package forge.game.ability.effects;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import forge.game.Game;
 import forge.game.GameEntityCounterTable;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
index a504e4e9997..be2dc1333f1 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
@@ -1,6 +1,5 @@
 package forge.game.ability.effects;
 
-import com.google.common.collect.Maps;
 import forge.game.GameObject;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java
index 04221428240..89a522c63e5 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java
@@ -4,7 +4,6 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import forge.StaticData;
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
@@ -24,7 +23,6 @@ import forge.item.PaperCard;
 import forge.util.Aggregates;
 
 import java.util.List;
-import java.util.Map;
 
 public class PlayLandVariantEffect extends SpellAbilityEffect {