diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index dac2b2ac3c9..7b15839e751 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -7,8 +7,6 @@ import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
 import forge.game.player.Player;
-import forge.game.spellability.SpellAbility;
-import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.util.Expressions;
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
index 16f96056124..e630764550b 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
@@ -1,7 +1,6 @@
 package forge.game.ability.effects;
 
 import forge.Command;
-import forge.game.CardTraitBase;
 import forge.game.Game;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
index 411b7b8fd04..0b7c5ed3e5f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
@@ -1,7 +1,6 @@
 package forge.game.ability.effects;
 
 import forge.Command;
-import forge.game.CardTraitBase;
 import forge.game.Game;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
index efa02349219..20dac254949 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -17,7 +17,6 @@
  */
 package forge.game.replacement;
 
-import forge.game.CardTraitBase;
 import forge.game.Game;
 import forge.game.TriggerReplacementBase;
 import forge.game.ability.AbilityUtils;
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
index 786a8fa38c9..9fc3577f5a1 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
@@ -22,7 +22,6 @@ import forge.game.card.Card;
 import forge.game.card.CardFactoryUtil;
 import forge.game.cost.Cost;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
index 2adbece5c1e..72323663c55 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
@@ -22,7 +22,6 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
index 95f3c6c3d95..b1b28320224 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
@@ -19,7 +19,6 @@ package forge.game.staticability;
 
 import forge.game.card.Card;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
index 017cf1dc023..1c610bd29b3 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
@@ -21,7 +21,6 @@ import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
index 687ab1dad18..1a26dd7ac02 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
@@ -21,7 +21,6 @@ import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.card.CardFactoryUtil;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index 7c10c22896d..6aa2d799933 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -17,7 +17,6 @@
  */
 package forge.game.trigger;
 
-import forge.game.CardTraitBase;
 import forge.game.Game;
 import forge.game.TriggerReplacementBase;
 import forge.game.card.Card;