diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
index 2a9a314f415..65f0d220e12 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
@@ -26,7 +26,6 @@ import forge.game.spellability.TargetChoices;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.staticability.StaticAbilityMustTarget;
 import forge.game.zone.ZoneType;
-import forge.util.Aggregates;
 import forge.util.MyRandom;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
diff --git a/forge-core/src/main/java/forge/card/ICardDatabase.java b/forge-core/src/main/java/forge/card/ICardDatabase.java
index 1144234f325..c1e72b4f6a7 100644
--- a/forge-core/src/main/java/forge/card/ICardDatabase.java
+++ b/forge-core/src/main/java/forge/card/ICardDatabase.java
@@ -5,7 +5,6 @@ import forge.item.PaperCard;
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
diff --git a/forge-core/src/main/java/forge/item/SealedProduct.java b/forge-core/src/main/java/forge/item/SealedProduct.java
index 50ec4d5295e..19b58de9ddb 100644
--- a/forge-core/src/main/java/forge/item/SealedProduct.java
+++ b/forge-core/src/main/java/forge/item/SealedProduct.java
@@ -19,7 +19,6 @@
 package forge.item;
 
 import forge.StaticData;
-import forge.card.CardRulesPredicates;
 import forge.item.generation.BoosterGenerator;
 import forge.util.StreamUtils;
 
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 c6acb5fde0c..88f3928de51 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
@@ -7,7 +7,6 @@ import java.util.stream.Stream;
 import com.google.common.collect.Lists;
 
 import forge.StaticData;
-import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.game.Game;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java
index dfa70acd957..c71c37596f9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java
@@ -2,7 +2,6 @@ package forge.screens.deckeditor.controllers;
 
 import forge.Singletons;
 import forge.card.CardDb;
-import forge.card.CardRulesPredicates;
 import forge.card.MagicColor;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
@@ -25,7 +24,6 @@ import forge.screens.deckeditor.views.VDeckgen;
 import forge.util.StreamUtils;
 
 import java.util.List;
-import java.util.function.Predicate;
 
 
 /**
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
index ded7c53ea45..c1d79674fbb 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
@@ -29,7 +29,6 @@ import java.util.function.Supplier;
 import javax.swing.KeyStroke;
 
 import forge.card.CardRules;
-import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
 import forge.deck.CardPool;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
index 872daa9655c..9b7d8ccd5e0 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
@@ -33,7 +33,6 @@ import forge.screens.deckeditor.views.VAllDecks;
 import forge.screens.deckeditor.views.VDeckgen;
 import forge.screens.match.controllers.CDetailPicture;
 import forge.util.ItemPool;
-import forge.util.Iterables;
 import forge.util.Localizer;
 import forge.util.storage.IStorage;
 
diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
index c82f09c6cd9..e4fdf6dac9d 100644
--- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
@@ -14,7 +14,6 @@ import java.util.stream.Collectors;
 import forge.item.PaperCardPredicates;
 import org.apache.commons.lang3.ArrayUtils;
 
-import forge.card.CardRulesPredicates;
 import forge.deck.io.CardThemedMatrixIO;
 import forge.deck.io.DeckStorage;
 import forge.game.GameFormat;
diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
index ccdbf587d82..55b8755a87a 100644
--- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
+++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import forge.item.PaperCardPredicates;
 import forge.util.*;
diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java
index 5c6cd38a81b..50d0b688af2 100644
--- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java
+++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java
@@ -2,7 +2,6 @@ package forge.lda;
 
 import forge.GuiDesktop;
 import forge.StaticData;
-import forge.card.CardRulesPredicates;
 import forge.deck.Deck;
 import forge.deck.DeckFormat;
 import forge.deck.io.Archetype;