* Removed unused imports.

2024-12-24 03:00:14 +00:00 · 2020-08-22 11:51:34 +02:00 · 2020-08-22 11:51:34 +02:00 · d51acbf090
commit d51acbf090
parent 546205bba4
477 changed files with 98 additions and 905 deletions
--- a/Mage.Client/src/main/java/mage/client/cards/BigCard.java
+++ b/Mage.Client/src/main/java/mage/client/cards/BigCard.java
@ -8,7 +8,6 @@

 package mage.client.cards;

-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Image;
@ -16,10 +15,7 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.util.List;
 import java.util.UUID;
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.StyleConstants;
 import static mage.client.constants.Constants.CONTENT_MAX_XOFFSET;
 import static mage.client.constants.Constants.FRAME_MAX_HEIGHT;
 import static mage.client.constants.Constants.FRAME_MAX_WIDTH;
--- a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java
+++ b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java
@ -9,9 +9,6 @@ import javax.swing.*;
 import org.jdesktop.swingx.graphics.GraphicsUtilities;
 import org.jdesktop.swingx.graphics.ShadowRenderer;

-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;

 import mage.client.util.ImageCaches;
 import mage.client.util.SoftValuesLoadingCache;
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@ -40,7 +40,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.List;
 import java.util.*;
-import java.util.Map.Entry;

 import static mage.client.dialog.PreferencesDialog.*;

--- a/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java
+++ b/Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java
@ -8,12 +8,6 @@ package mage.client.util;
 import java.awt.*;
 import java.awt.image.BufferedImage;

-import javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.mortennobel.imagescaling.ResampleOp;

 /**
--- a/Mage.Client/src/main/java/mage/client/util/gui/TableUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/TableUtil.java
@ -5,7 +5,6 @@
 */
 package mage.client.util.gui;

-import java.util.Arrays;
 import javax.swing.JTable;
 import javax.swing.JToggleButton;
 import javax.swing.table.TableColumn;
--- a/Mage.Client/src/main/java/mage/client/util/object/SaveObjectUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/object/SaveObjectUtil.java
@ -3,9 +3,7 @@ package mage.client.util.object;
 import mage.utils.StreamUtils;

 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
--- a/Mage.Client/src/main/java/org/mage/card/arcane/TextboxBasicManaRule.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/TextboxBasicManaRule.java
@ -1,6 +1,5 @@
 package org.mage.card.arcane;

-import java.util.ArrayList;
 import java.util.List;

 /**
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallSymbolsSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallSymbolsSource.java
@ -9,13 +9,9 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import mage.MageException;
-import mage.util.StreamUtils;
-import org.jsoup.select.Elements;
 import org.mage.plugins.card.dl.DownloadJob;
 import org.mage.plugins.card.utils.CardImageUtils;

-import javax.swing.text.Document;

 import static org.mage.card.arcane.ManaSymbols.getSymbolFileNameAsSVG;
 import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
--- a/Mage.Common/src/main/java/mage/remote/interfaces/ServerState.java
+++ b/Mage.Common/src/main/java/mage/remote/interfaces/ServerState.java
@ -3,7 +3,6 @@ package mage.remote.interfaces;

 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import mage.remote.MageRemoteException;
 import mage.view.MatchView;
--- a/Mage.Common/src/main/java/mage/utils/CardColorUtil.java
+++ b/Mage.Common/src/main/java/mage/utils/CardColorUtil.java
@ -1,8 +1,6 @@
 package mage.utils;

 import mage.ObjectColor;
-import mage.cards.MagePermanent;
-import mage.constants.CardType;
 import mage.view.CardView;

 import java.util.List;
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@ -7,7 +7,6 @@ import java.util.Map.Entry;
 import mage.ApprovingObject;
 import mage.ConditionalMana;
 import mage.MageObject;
-import mage.MageObjectReference;
 import mage.Mana;
 import mage.abilities.*;
 import mage.abilities.costs.VariableCost;
--- a/Mage.Server/src/main/java/mage/server/Room.java
+++ b/Mage.Server/src/main/java/mage/server/Room.java
@ -3,7 +3,6 @@
 package mage.server;

 import java.rmi.Remote;
-import java.util.Optional;
 import java.util.UUID;

 /**
--- a/Mage.Sets/src/mage/cards/a/Aethertow.java
+++ b/Mage.Sets/src/mage/cards/a/Aethertow.java
@ -7,10 +7,8 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.keyword.ConspireAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.cards.CardsImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
-import mage.constants.Zone;
 import mage.filter.common.FilterAttackingOrBlockingCreature;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
--- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java
+++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java
@ -20,7 +20,6 @@ import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;

 /**
 * @author Loki
--- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java
+++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java
@ -17,7 +17,6 @@ import mage.constants.*;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.SoldierToken;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.Target;
--- a/Mage.Sets/src/mage/cards/a/AngelicReward.java
+++ b/Mage.Sets/src/mage/cards/a/AngelicReward.java
@ -1,17 +1,12 @@
 package mage.cards.a;

 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.TotemArmorAbility;
-import mage.abilities.mana.AnyColorManaAbility;
-import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
--- a/Mage.Sets/src/mage/cards/a/AnimateLand.java
+++ b/Mage.Sets/src/mage/cards/a/AnimateLand.java
@ -2,14 +2,11 @@
 package mage.cards.a;

 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;
 import mage.target.common.TargetLandPermanent;

--- a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java
+++ b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java
@ -13,8 +13,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;
 import mage.target.common.TargetControlledPermanent;

--- a/Mage.Sets/src/mage/cards/a/ArcaneDenial.java
+++ b/Mage.Sets/src/mage/cards/a/ArcaneDenial.java
@ -10,7 +10,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.DrawCardTargetEffect;
-import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java
+++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java
@ -3,7 +3,6 @@ package mage.cards.a;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -16,8 +15,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java
+++ b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java
@ -27,7 +27,6 @@ import mage.players.Player;
 import mage.target.TargetPermanent;

 import java.util.UUID;
-import mage.game.permanent.PermanentToken;

 /**
 * @author TheElk801
--- a/Mage.Sets/src/mage/cards/a/AutumnWillow.java
+++ b/Mage.Sets/src/mage/cards/a/AutumnWillow.java
@ -5,7 +5,6 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.AsThoughEffectImpl;
 import mage.abilities.keyword.ShroudAbility;
--- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java
+++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java
@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterLandPermanent;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetLandPermanent;

--- a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java
+++ b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java
@ -15,7 +15,6 @@ import mage.filter.common.FilterLandPermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.common.TargetLandPermanent;

 /**
--- a/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java
+++ b/Mage.Sets/src/mage/cards/a/AyeshaTanaka.java
@ -15,7 +15,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
-import mage.filter.FilterAbility;
 import mage.filter.FilterStackObject;
 import mage.filter.predicate.ability.ArtifactSourcePredicate;
 import mage.target.common.TargetActivatedAbility;
--- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java
+++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java
@ -3,7 +3,6 @@ package mage.cards.a;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -16,8 +15,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/b/BakisCurse.java
+++ b/Mage.Sets/src/mage/cards/b/BakisCurse.java
@ -13,7 +13,6 @@ import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.players.Player;

 /**
 *
--- a/Mage.Sets/src/mage/cards/b/BallistaCharger.java
+++ b/Mage.Sets/src/mage/cards/b/BallistaCharger.java
@ -5,7 +5,6 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.keyword.CrewAbility;
 import mage.cards.CardImpl;
--- a/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java
+++ b/Mage.Sets/src/mage/cards/b/BaneOfBalaGed.java
@ -1,7 +1,6 @@

 package mage.cards.b;

-import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
--- a/Mage.Sets/src/mage/cards/b/Banshee.java
+++ b/Mage.Sets/src/mage/cards/b/Banshee.java
@ -9,7 +9,6 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.dynamicvalue.common.HalfValue;
 import mage.abilities.dynamicvalue.common.ManacostVariableValue;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
--- a/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java
+++ b/Mage.Sets/src/mage/cards/b/BarrinMasterWizard.java
@ -13,7 +13,6 @@ import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
-import mage.filter.common.FilterCreaturePermanent;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;

--- a/Mage.Sets/src/mage/cards/b/BenthicExplorers.java
+++ b/Mage.Sets/src/mage/cards/b/BenthicExplorers.java
@ -12,7 +12,6 @@ import mage.abilities.mana.ActivatedManaAbilityImpl;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.choices.Choice;
-import mage.choices.ChoiceColor;
 import mage.constants.*;
 import mage.filter.common.FilterLandPermanent;
 import mage.filter.predicate.permanent.TappedPredicate;
@ -24,7 +23,6 @@ import mage.util.CardUtil;

 import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
--- a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java
+++ b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java
@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterControlledCreaturePermanent;

 /**
 *
--- a/Mage.Sets/src/mage/cards/b/BontusLastReckoning.java
+++ b/Mage.Sets/src/mage/cards/b/BontusLastReckoning.java
@ -11,7 +11,6 @@ import mage.constants.Duration;
 import mage.constants.TargetController;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.common.FilterCreaturePermanent;

 /**
 *
--- a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java
+++ b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java
@ -3,7 +3,6 @@ package mage.cards.b;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -16,8 +15,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/b/BreathOfDreams.java
+++ b/Mage.Sets/src/mage/cards/b/BreathOfDreams.java
@ -13,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;

 /**
--- a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java
+++ b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java
@ -19,7 +19,6 @@ import mage.game.Game;
 import mage.game.combat.CombatGroup;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.CatSoldierCreatureToken;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 import mage.players.Player;

--- a/Mage.Sets/src/mage/cards/b/BrownOuphe.java
+++ b/Mage.Sets/src/mage/cards/b/BrownOuphe.java
@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.FilterAbility;
 import mage.filter.FilterStackObject;
 import mage.filter.predicate.ability.ArtifactSourcePredicate;
 import mage.target.common.TargetActivatedAbility;
--- a/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java
+++ b/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java
@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
-import mage.constants.Zone;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.Predicates;
--- a/Mage.Sets/src/mage/cards/b/BurningSands.java
+++ b/Mage.Sets/src/mage/cards/b/BurningSands.java
@ -7,7 +7,6 @@ import mage.abilities.effects.common.SacrificeEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
--- a/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java
+++ b/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java
@ -44,7 +44,6 @@ import mage.constants.SuperType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;

 import java.util.UUID;

--- a/Mage.Sets/src/mage/cards/c/CabalTherapy.java
+++ b/Mage.Sets/src/mage/cards/c/CabalTherapy.java
@ -10,7 +10,6 @@ import mage.cards.*;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.TimingRule;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetPlayer;
@ -18,7 +17,6 @@ import mage.target.common.TargetControlledCreaturePermanent;
 import mage.util.CardUtil;

 import java.util.UUID;
-import mage.abilities.StaticAbility;
 import mage.filter.StaticFilters;

 /**
--- a/Mage.Sets/src/mage/cards/c/CadaverousBloom.java
+++ b/Mage.Sets/src/mage/cards/c/CadaverousBloom.java
@ -2,7 +2,6 @@ package mage.cards.c;

 import java.util.ArrayList;
 import java.util.List;
-import static java.util.Locale.filter;
 import java.util.UUID;
 import mage.Mana;
 import mage.abilities.Ability;
@ -12,7 +11,6 @@ import mage.abilities.mana.SimpleManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.ColoredManaSymbol;
 import mage.constants.Zone;
 import mage.filter.common.FilterOwnedCard;
 import mage.game.Game;
--- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java
+++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java
@ -3,7 +3,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@ -18,8 +17,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/CentaurNurturer.java
+++ b/Mage.Sets/src/mage/cards/c/CentaurNurturer.java
@ -7,7 +7,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;

-import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.mana.AnyColorManaAbility;
--- a/Mage.Sets/src/mage/cards/c/CephalidSnitch.java
+++ b/Mage.Sets/src/mage/cards/c/CephalidSnitch.java
@ -1,7 +1,6 @@

 package mage.cards.c;

-import java.awt.*;
 import java.util.*;
 import java.util.List;

--- a/Mage.Sets/src/mage/cards/c/CephalidVandal.java
+++ b/Mage.Sets/src/mage/cards/c/CephalidVandal.java
@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Outcome;
 import mage.constants.TargetController;
-import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
--- a/Mage.Sets/src/mage/cards/c/ChameleonSpirit.java
+++ b/Mage.Sets/src/mage/cards/c/ChameleonSpirit.java
@ -1,93 +1,92 @@
-package mage.cards.c;
-
-import static java.awt.SystemColor.control;
-import java.util.UUID;
-import mage.MageInt;
-import mage.ObjectColor;
-import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.ChooseColorEffect;
-import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
-import mage.constants.SubType;
-import mage.cards.CardImpl;
-import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-
-/**
- *
- * @author jeffwadsworth
- */
-public final class ChameleonSpirit extends CardImpl {
-
-    public ChameleonSpirit(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
-
-        this.subtype.add(SubType.ILLUSION);
-        this.subtype.add(SubType.SPIRIT);
-        this.power = new MageInt(0);
-        this.toughness = new MageInt(0);
-
-        // As Chameleon Spirit enters the battlefield, choose a color.
-        this.addAbility(new EntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral)));
-
-        // Chameleon Spirit's power and toughness are each equal to the number 
-        // of permanents of the chosen color your opponents control.
-        this.addAbility(new SimpleStaticAbility(
-                new SetPowerToughnessSourceEffect(
-                        PermanentsOfTheChosenColorOpponentsControlCount.instance,
-                        Duration.EndOfGame)));
-    }
-
-    private ChameleonSpirit(final ChameleonSpirit card) {
-        super(card);
-    }
-
-    @Override
-    public ChameleonSpirit copy() {
-        return new ChameleonSpirit(this);
-    }
-}
-
-enum PermanentsOfTheChosenColorOpponentsControlCount implements DynamicValue {
-    instance;
-
-    @Override
-    public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        int number = 0;
-        FilterPermanent filter = new FilterPermanent();
-        filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(sourceAbility.getSourceId() + "_color")));
-        for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
-            if (permanent != null
-                    && game.getOpponents(sourceAbility.getControllerId()).contains(permanent.getControllerId())
-                    && filter.match(permanent, game)) {
-                number++;
-            }
-        }
-        return number;
-    }
-
-    @Override
-    public PermanentsOfTheChosenColorOpponentsControlCount copy() {
-        return PermanentsOfTheChosenColorOpponentsControlCount.instance;
-    }
-
-    @Override
-    public String toString() {
-        return "X";
-    }
-
-    @Override
-    public String getMessage() {
-        return "permanents of the chosen color your opponents control";
-    }
-
-}
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.ChooseColorEffect;
+import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public final class ChameleonSpirit extends CardImpl {
+
+    public ChameleonSpirit(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
+
+        this.subtype.add(SubType.ILLUSION);
+        this.subtype.add(SubType.SPIRIT);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(0);
+
+        // As Chameleon Spirit enters the battlefield, choose a color.
+        this.addAbility(new EntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral)));
+
+        // Chameleon Spirit's power and toughness are each equal to the number 
+        // of permanents of the chosen color your opponents control.
+        this.addAbility(new SimpleStaticAbility(
+                new SetPowerToughnessSourceEffect(
+                        PermanentsOfTheChosenColorOpponentsControlCount.instance,
+                        Duration.EndOfGame)));
+    }
+
+    private ChameleonSpirit(final ChameleonSpirit card) {
+        super(card);
+    }
+
+    @Override
+    public ChameleonSpirit copy() {
+        return new ChameleonSpirit(this);
+    }
+}
+
+enum PermanentsOfTheChosenColorOpponentsControlCount implements DynamicValue {
+    instance;
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility, Effect effect) {
+        int number = 0;
+        FilterPermanent filter = new FilterPermanent();
+        filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(sourceAbility.getSourceId() + "_color")));
+        for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
+            if (permanent != null
+                    && game.getOpponents(sourceAbility.getControllerId()).contains(permanent.getControllerId())
+                    && filter.match(permanent, game)) {
+                number++;
+            }
+        }
+        return number;
+    }
+
+    @Override
+    public PermanentsOfTheChosenColorOpponentsControlCount copy() {
+        return PermanentsOfTheChosenColorOpponentsControlCount.instance;
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+
+    @Override
+    public String getMessage() {
+        return "permanents of the chosen color your opponents control";
+    }
+
+}
--- a/Mage.Sets/src/mage/cards/c/Charisma.java
+++ b/Mage.Sets/src/mage/cards/c/Charisma.java
@ -4,8 +4,6 @@ package mage.cards.c;
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.DealsDamageToACreatureAttachedTriggeredAbility;
-import mage.abilities.condition.Condition;
-import mage.abilities.condition.common.SourceOnBattlefieldCondition;
 import mage.abilities.condition.common.SourceRemainsInZoneCondition;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.common.AttachEffect;
--- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java
+++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java
@ -3,7 +3,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@ -16,8 +15,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/ChimericMass.java
+++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java
@ -3,7 +3,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@ -19,8 +18,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java
+++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java
@ -3,7 +3,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -14,7 +13,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/ChronatogTotem.java
+++ b/Mage.Sets/src/mage/cards/c/ChronatogTotem.java
@ -3,7 +3,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.LimitedTimesPerTurnActivatedAbility;
 import mage.abilities.common.SimpleActivatedAbility;
@ -25,8 +24,6 @@ import mage.constants.EffectType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/ClaimFame.java
+++ b/Mage.Sets/src/mage/cards/c/ClaimFame.java
@ -7,7 +7,6 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.AftermathAbility;
 import mage.abilities.keyword.HasteAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/c/CommitMemory.java
+++ b/Mage.Sets/src/mage/cards/c/CommitMemory.java
@ -8,7 +8,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DrawCardAllEffect;
 import mage.abilities.effects.common.ShuffleHandGraveyardAllEffect;
 import mage.abilities.keyword.AftermathAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/c/Conscription.java
+++ b/Mage.Sets/src/mage/cards/c/Conscription.java
@ -2,7 +2,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.abilities.effects.common.continuous.BecomesChosenCreatureTypeTargetEffect;
 import mage.abilities.effects.common.continuous.BecomesCreatureTypeTargetEffect;
 import mage.abilities.effects.common.continuous.GainControlTargetEffect;
 import mage.cards.CardImpl;
--- a/Mage.Sets/src/mage/cards/c/ConsignOblivion.java
+++ b/Mage.Sets/src/mage/cards/c/ConsignOblivion.java
@ -5,7 +5,6 @@ import java.util.UUID;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.abilities.effects.common.discard.DiscardTargetEffect;
 import mage.abilities.keyword.AftermathAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java
+++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java
@ -18,7 +18,6 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetLandPermanent;

--- a/Mage.Sets/src/mage/cards/c/Cowardice.java
+++ b/Mage.Sets/src/mage/cards/c/Cowardice.java
@ -12,7 +12,6 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
-import mage.game.stack.StackObject;
 import mage.target.targetpointer.FixedTarget;

 /**
--- a/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java
+++ b/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java
@ -15,7 +15,6 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetCard;
-import mage.target.targetpointer.FixedTarget;

 /**
 *
--- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java
+++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java
@ -4,7 +4,6 @@ package mage.cards.c;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@ -18,8 +17,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java
+++ b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java
@ -19,7 +19,6 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetLandPermanent;

--- a/Mage.Sets/src/mage/cards/c/CutRibbons.java
+++ b/Mage.Sets/src/mage/cards/c/CutRibbons.java
@ -5,7 +5,6 @@ import mage.abilities.dynamicvalue.common.ManacostVariableValue;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.LoseLifeOpponentsEffect;
 import mage.abilities.keyword.AftermathAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java
+++ b/Mage.Sets/src/mage/cards/c/CytoplastManipulator.java
@ -5,7 +5,6 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.condition.common.SourceOnBattlefieldCondition;
 import mage.abilities.condition.common.SourceRemainsInZoneCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
--- a/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java
+++ b/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java
@ -12,7 +12,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledCreaturePermanent;

 /**
--- a/Mage.Sets/src/mage/cards/d/DarkRevenant.java
+++ b/Mage.Sets/src/mage/cards/d/DarkRevenant.java
@ -10,7 +10,6 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.cards.CardsImpl;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Outcome;
--- a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java
+++ b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java
@ -4,7 +4,6 @@ package mage.cards.d;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -15,8 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java
+++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java
@ -17,7 +17,6 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;

--- a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java
+++ b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java
@ -3,7 +3,6 @@ package mage.cards.d;

 import java.util.UUID;
 import mage.MageInt;
-import mage.MageObject;
 import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.AsEntersBattlefieldAbility;
--- a/Mage.Sets/src/mage/cards/d/DaxossTorment.java
+++ b/Mage.Sets/src/mage/cards/d/DaxossTorment.java
@ -3,7 +3,6 @@ package mage.cards.d;

 import java.util.UUID;

-import mage.MageInt;
 import mage.abilities.abilityword.ConstellationAbility;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
@ -13,8 +12,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/d/DeadReckoning.java
+++ b/Mage.Sets/src/mage/cards/d/DeadReckoning.java
@ -7,10 +7,8 @@ import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.cards.CardsImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
-import mage.constants.Zone;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
--- a/Mage.Sets/src/mage/cards/d/DeathByDragons.java
+++ b/Mage.Sets/src/mage/cards/d/DeathByDragons.java
@ -10,7 +10,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.token.DragonToken2;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.TargetPlayer;
--- a/Mage.Sets/src/mage/cards/d/DelayTactic.java
+++ b/Mage.Sets/src/mage/cards/d/DelayTactic.java
@ -6,23 +6,19 @@ import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
 import mage.abilities.effects.common.DontUntapInPlayersNextUntapStepAllEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
-import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
 import mage.abilities.keyword.HexproofAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
-import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.Game;
 import mage.players.Player;
-import mage.target.TargetPlayer;
 import mage.target.common.TargetOpponent;
 import mage.target.targetpointer.FixedTarget;

--- a/Mage.Sets/src/mage/cards/d/Demotion.java
+++ b/Mage.Sets/src/mage/cards/d/Demotion.java
@ -3,13 +3,9 @@ package mage.cards.d;

 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.combat.CantBlockActivateAttachedEffect;
-import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
-import mage.abilities.keyword.DefenderAbility;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
--- a/Mage.Sets/src/mage/cards/d/Despair.java
+++ b/Mage.Sets/src/mage/cards/d/Despair.java
@ -2,7 +2,6 @@ package mage.cards.d;

 import java.util.UUID;

-import mage.abilities.effects.common.SacrificeControllerEffect;
 import mage.abilities.effects.common.SacrificeOpponentsEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
--- a/Mage.Sets/src/mage/cards/d/DestinedLead.java
+++ b/Mage.Sets/src/mage/cards/d/DestinedLead.java
@ -8,7 +8,6 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.AftermathAbility;
 import mage.abilities.keyword.IndestructibleAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/d/DiminishingReturns.java
+++ b/Mage.Sets/src/mage/cards/d/DiminishingReturns.java
@ -4,7 +4,6 @@ package mage.cards.d;
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.DrawCardAllEffect;
 import mage.abilities.effects.common.ShuffleHandGraveyardAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
--- a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java
+++ b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java
@ -2,7 +2,6 @@
 package mage.cards.d;

 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
@ -15,8 +14,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;

 /**
--- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java
+++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java
@ -16,7 +16,6 @@ import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.game.permanent.token.DinOfTheFireherdToken;
-import mage.game.permanent.token.TokenImpl;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.common.TargetOpponent;
--- a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java
+++ b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java
@ -20,7 +20,6 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetCard;
-import mage.target.common.TargetCardInHand;
 import mage.target.common.TargetOpponent;

 import java.util.UUID;
--- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java
+++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java
@ -15,7 +15,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;

 /**
 *
--- a/Mage.Sets/src/mage/cards/d/DrivenDespair.java
+++ b/Mage.Sets/src/mage/cards/d/DrivenDespair.java
@ -10,7 +10,6 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect;
 import mage.abilities.keyword.AftermathAbility;
 import mage.abilities.keyword.MenaceAbility;
 import mage.abilities.keyword.TrampleAbility;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java
+++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java
@ -16,7 +16,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;

 /**
 *
--- a/Mage.Sets/src/mage/cards/d/DruidsRepository.java
+++ b/Mage.Sets/src/mage/cards/d/DruidsRepository.java
@ -2,8 +2,6 @@
 package mage.cards.d;

 import java.util.UUID;
-import mage.Mana;
-import mage.abilities.Ability;
 import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.dynamicvalue.common.CountersSourceCount;
--- a/Mage.Sets/src/mage/cards/d/Duplicity.java
+++ b/Mage.Sets/src/mage/cards/d/Duplicity.java
@ -9,7 +9,6 @@ import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.StaticAbility;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility;
-import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.EntersBattlefieldEffect;
--- a/Mage.Sets/src/mage/cards/d/DuskDawn.java
+++ b/Mage.Sets/src/mage/cards/d/DuskDawn.java
@ -9,7 +9,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.abilities.keyword.AftermathAbility;
 import mage.cards.Card;
-import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.SplitCard;
 import mage.constants.CardType;
--- a/Mage.Sets/src/mage/cards/d/DwellOnThePast.java
+++ b/Mage.Sets/src/mage/cards/d/DwellOnThePast.java
@ -1,7 +1,6 @@

 package mage.cards.d;

-import java.util.List;
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
--- a/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java
+++ b/Mage.Sets/src/mage/cards/e/EdgeOfAutumn.java
@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.ComparisonType;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterBasicLandCard;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetCardInLibrary;
--- a/Mage.Sets/src/mage/cards/e/ElementalUprising.java
+++ b/Mage.Sets/src/mage/cards/e/ElementalUprising.java
@ -14,7 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.target.TargetPermanent;

 /**
--- a/Mage.Sets/src/mage/cards/e/ElfhameDruid.java
+++ b/Mage.Sets/src/mage/cards/e/ElfhameDruid.java
@ -2,22 +2,16 @@ package mage.cards.e;

 import mage.ConditionalMana;
 import mage.MageInt;
-import mage.MageObject;
 import mage.Mana;
-import mage.abilities.Ability;
 import mage.abilities.condition.common.KickedCondition;
-import mage.abilities.costs.Cost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.keyword.KickerAbility;
 import mage.abilities.mana.ConditionalColoredManaAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.abilities.mana.builder.ConditionalManaBuilder;
-import mage.abilities.mana.conditional.ManaCondition;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.Game;

 import java.util.UUID;

--- a/Mage.Sets/src/mage/cards/e/EmberwildeCaliph.java
+++ b/Mage.Sets/src/mage/cards/e/EmberwildeCaliph.java
@ -7,7 +7,6 @@ import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.AttacksEachCombatStaticAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
 import mage.constants.SubType;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.TrampleAbility;
--- a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java
+++ b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java
@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.filter.FilterSpell;
 import mage.filter.FilterStackObject;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorlessPredicate;
--- a/Mage.Sets/src/mage/cards/e/EndbringersRevel.java
+++ b/Mage.Sets/src/mage/cards/e/EndbringersRevel.java
@ -2,7 +2,6 @@
 package mage.cards.e;

 import java.util.UUID;
-import mage.abilities.Ability;
 import mage.abilities.common.ActivateAsSorceryActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.InfoEffect;
--- a/Mage.Sets/src/mage/cards/e/EnergyArc.java
+++ b/Mage.Sets/src/mage/cards/e/EnergyArc.java
@ -2,8 +2,6 @@
 package mage.cards.e;

 import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.PreventDamageByTargetEffect;
 import mage.abilities.effects.common.PreventDamageToTargetEffect;
 import mage.abilities.effects.common.UntapTargetEffect;
@ -11,7 +9,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.constants.Zone;
 import mage.target.common.TargetCreaturePermanent;

 /**
--- a/Mage.Sets/src/mage/cards/e/EnfysNest.java
+++ b/Mage.Sets/src/mage/cards/e/EnfysNest.java
@ -4,9 +4,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
-import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.abilities.keyword.VigilanceAbility;
--- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java
+++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java
@ -2,7 +2,6 @@
 package mage.cards.e;

 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
@ -15,8 +14,6 @@ import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.custom.CreatureToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetArtifactPermanent;
--- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java
+++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java
@ -18,7 +18,6 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.permanent.token.TokenImpl;
-import mage.game.permanent.token.Token;

 /**
 *
--- a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java
+++ b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java
@ -6,16 +6,12 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.PutOnLibraryTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.game.Game;
-import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;

 /**
--- a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java
+++ b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java
@ -5,7 +5,6 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AttacksTriggeredAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
--- a/Mage.Sets/src/mage/cards/e/EssenceFilter.java
+++ b/Mage.Sets/src/mage/cards/e/EssenceFilter.java
@ -9,7 +9,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
-import mage.filter.StaticFilters;
 import mage.filter.common.FilterEnchantmentPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
--- a/Show more
+++ b/Show more