diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
index 86e56f233a..d13a791dbf 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -48,7 +48,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.Map.Entry;
-import mage.ObjectColor;
 
 import mage.cards.MageCard;
 import mage.client.constants.Constants.SortBy;
diff --git a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
index f64067b6bf..57c6522a98 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
@@ -34,14 +34,12 @@
 
 package mage.client.dialog;
 
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 import javax.swing.JLayeredPane;
 import mage.Constants;
 import mage.cards.Card;
-import mage.cards.ExpansionSet;
 import mage.cards.Sets;
 import mage.cards.decks.Deck;
 import mage.cards.repository.CardCriteria;
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
index 699b36a33b..d6d10656f7 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
@@ -34,7 +34,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import mage.Constants;
-import mage.Mana;
 import mage.cards.Card;
 import mage.cards.decks.Deck;
 import mage.cards.decks.DeckValidatorImpl;
diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java
index 15da98ca5c..944f954e5e 100644
--- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java
+++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java
@@ -49,7 +49,6 @@ import org.apache.log4j.Logger;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.log4j.Level;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java b/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java
index 78bce62a19..0d3d6acb48 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/SeraphSanctuary.java
@@ -30,8 +30,6 @@ package mage.sets.avacynrestored;
 import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.Constants.Zone;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.GainLifeEffect;
@@ -40,11 +38,6 @@ import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
-import mage.game.permanent.Permanent;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java
index 2107b74459..10e2a1a58f 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java
@@ -35,7 +35,6 @@ import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.ControlsPermanentCondition;
@@ -46,8 +45,6 @@ import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
diff --git a/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java b/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java
index 77c3834c93..3eafcda5e8 100644
--- a/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java
+++ b/Mage.Sets/src/mage/sets/conflux/ExoticOrchard.java
@@ -36,7 +36,6 @@ import mage.Constants.Zone;
 import mage.Mana;
 import mage.abilities.Abilities;
 import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.ManaEffect;
 import mage.abilities.mana.ManaAbility;
diff --git a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java
index 1cceed5d8a..beb60d343f 100644
--- a/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java
+++ b/Mage.Sets/src/mage/sets/conflux/HellkiteHatchling.java
@@ -32,7 +32,6 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.DevouredCreaturesCondition;
diff --git a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
index 84f83ccb4d..e86b9feb0b 100644
--- a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
+++ b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
@@ -39,7 +39,6 @@ import mage.abilities.keyword.UndyingAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetCreatureOrPlayer;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
index 4e16787d4d..e2229fdb1f 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
@@ -47,7 +47,6 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.Permanent;
 import mage.game.turn.TurnMod;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java
index 8e9b083f98..c8faac289f 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Bioshift.java
@@ -33,7 +33,6 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java
index 47312a1da1..b95835bce3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DeathpactAngel.java
@@ -33,7 +33,6 @@ import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java
index 1565c24c13..295483371b 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DiluvianPrimordial.java
@@ -42,7 +42,6 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.other.OwnerIdPredicate;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java
index aa364220a8..813bbaa3f7 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java
@@ -40,7 +40,6 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.FightTargetsEffect;
 import mage.abilities.effects.common.GetEmblemEffect;
-import mage.abilities.effects.common.PreventAllDamageSourceEffect;
 import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java
index 91f02ce7fe..3ef6d81e2d 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GhorClanRampager.java
@@ -38,7 +38,6 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.BloodrushAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
-import mage.target.common.TargetAttackingCreature;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
index 24aa23b2a0..c16b0f094e 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
@@ -43,7 +43,6 @@ import mage.filter.predicate.mageobject.CardIdPredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.targetpointer.FixedTarget;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java
index a256694c4e..b2a6a4644e 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GyreSage.java
@@ -29,15 +29,11 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.Mana;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.dynamicvalue.common.CountersCount;
-import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.keyword.EvolveAbility;
 import mage.abilities.mana.DynamicManaAbility;
 import mage.cards.CardImpl;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
index b6f4a434b0..d74e1a1c64 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
@@ -34,7 +34,6 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
index 1330f29afb..9579624231 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
@@ -39,7 +39,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.DamagedEvent;
 import mage.game.events.GameEvent;
-import mage.target.common.TargetNonlandPermanent;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java
index ab9e260b26..1dc5977d7e 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java
@@ -38,8 +38,6 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continious.BoostEnchantedEffect;
 import mage.abilities.effects.common.continious.CantBeBlockedByOneAttachedEffect;
-import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
-import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java
index 03b7448b45..92ed67aa35 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java
@@ -44,7 +44,6 @@ import mage.game.permanent.Permanent;
 import mage.game.permanent.token.SoldierToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
-import mage.target.common.TargetCreaturePermanent;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
index d01a779b31..43475f0589 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
@@ -43,7 +43,6 @@ import mage.abilities.effects.common.ExileSourceEffect;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlSourceEffect;
-import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlSourceEffect;
 import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
index 5e2317df7e..cc3f081fb3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
@@ -33,7 +33,6 @@ import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
index 2abc1409a8..7870fb6002 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
@@ -42,9 +42,7 @@ import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.Game;
-import mage.game.combat.CombatGroup;
 import mage.game.events.GameEvent;
-import mage.game.permanent.Permanent;
 import mage.target.Target;
 import mage.target.TargetPermanent;
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java
index 454c6513f9..3e4a2354f8 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ScabClanCharger.java
@@ -32,11 +32,9 @@ import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.abilities.keyword.BloodrushAbility;
 import mage.cards.CardImpl;
-import mage.target.common.TargetAttackingCreature;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java
index a71a1cf32d..cedf51ee64 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ScatterArc.java
@@ -34,7 +34,6 @@ import mage.abilities.effects.common.CounterTargetEffect;
 import mage.abilities.effects.common.DrawCardControllerEffect;
 import mage.cards.CardImpl;
 import mage.filter.FilterSpell;
-import mage.filter.predicate.Predicate;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetSpell;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java
index 69b48f2d81..5873ebacec 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SepulchralPrimordial.java
@@ -42,7 +42,6 @@ import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.other.OwnerIdPredicate;
-import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.Target;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java
index 621cc96ad9..3999c52644 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SkarrgGoliath.java
@@ -28,24 +28,16 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
-import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
 import mage.abilities.keyword.BloodrushAbility;
-import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
-import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.common.FilterControlledPermanent;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java
index 6b2bfdc9a1..64d6153c69 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SlateStreetRuffian.java
@@ -35,7 +35,6 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.DiscardTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
diff --git a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
index 58e5ac957a..b021b33790 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
@@ -38,7 +38,6 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.BloodrushAbility;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.cards.CardImpl;
-import mage.target.common.TargetAttackingCreature;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java
index d63a094080..bfd4fa9e9d 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ZhurTaaSwine.java
@@ -32,7 +32,6 @@ import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.abilities.keyword.BloodrushAbility;
 import mage.cards.CardImpl;
diff --git a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java
index 3d960203b8..abf2810b1f 100644
--- a/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java
+++ b/Mage.Sets/src/mage/sets/innistrad/DearlyDeparted.java
@@ -43,8 +43,6 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
index fdfa36931e..3dc5153e9c 100644
--- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
@@ -42,7 +42,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.TargetPermanent;
 import mage.target.TargetStackObject;
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
index 8f16a78905..2cbea517be 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
@@ -40,7 +40,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.token.ZombieToken;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
index 47b20ce598..fd9373acf1 100644
--- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
@@ -43,7 +43,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.common.TargetCreatureOrPlayerAmount;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
index 01544df5fc..ec579aa8b3 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
@@ -42,7 +42,6 @@ import mage.filter.common.FilterLandCard;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.common.TargetCardInLibrary;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
index cb0661421f..d7887ead6a 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
@@ -45,7 +45,6 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java
index 08f11fbf81..0e2504ee52 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java
@@ -29,7 +29,6 @@ package mage.sets.magic2012;
 
 import java.util.UUID;
 import mage.Constants.CardType;
-import mage.Constants.Duration;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
@@ -37,13 +36,11 @@ import mage.abilities.Ability;
 import mage.abilities.common.OnEventTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.CantBlockAttackActivateAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPermanent;
diff --git a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
index ca2a8d9309..8d0d4c70fc 100644
--- a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
+++ b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
@@ -40,7 +40,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetCreatureOrPlayer;
diff --git a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
index eb5133808b..fdf243a894 100644
--- a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
+++ b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
@@ -40,7 +40,6 @@ import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java
index f50fc6649b..fbba78052e 100644
--- a/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java
+++ b/Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java
@@ -28,12 +28,10 @@
 package mage.sets.magic2013;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.MageInt;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.CantBlockAbility;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
@@ -41,10 +39,6 @@ import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
-import mage.game.permanent.Permanent;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java
index 5b5c5a6fbb..4d3b2c2338 100644
--- a/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java
+++ b/Mage.Sets/src/mage/sets/magic2013/YevaNaturesHerald.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.magic2013;
 
-import java.util.LinkedHashMap;
 import java.util.UUID;
 import mage.Constants.AsThoughEffectType;
 import mage.Constants.CardType;
@@ -37,14 +36,12 @@ import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.ActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.AsThoughEffectImpl;
 import mage.abilities.keyword.FlashAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.game.Game;
-import mage.players.PlayerImpl;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/mirage/Foratog.java b/Mage.Sets/src/mage/sets/mirage/Foratog.java
index 3c013f5b9e..e753e71e5d 100644
--- a/Mage.Sets/src/mage/sets/mirage/Foratog.java
+++ b/Mage.Sets/src/mage/sets/mirage/Foratog.java
@@ -34,10 +34,8 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.continious.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledLandPermanent;
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
index 9a2bb3cb88..fecee6d577 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
@@ -40,11 +40,8 @@ import mage.cards.CardsImpl;
 import mage.cards.repository.CardRepository;
 import mage.choices.Choice;
 import mage.choices.ChoiceImpl;
-import mage.filter.FilterCard;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.target.TargetCard;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java
index d4375d6415..f3f84b8471 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Scapeshift.java
@@ -35,7 +35,6 @@ import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.SearchEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledLandPermanent;
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
index f49d3426cd..46c88d5c30 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
@@ -43,7 +43,6 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetLandPermanent;
 import mage.target.targetpointer.FixedTarget;
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
index 8751a33faa..51095f9ecf 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
@@ -33,10 +33,8 @@ import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.GainLifeEffect;
@@ -45,9 +43,7 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.AnotherPredicate;
-import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java b/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java
index 705c25ec01..923d9cc524 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ElvishScrapper.java
@@ -40,7 +40,6 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterArtifactPermanent;
-import mage.filter.common.FilterEnchantmentPermanent;
 import mage.target.TargetPermanent;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java
index f5112f0138..9b8be7d4f6 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/BrindleShoat.java
@@ -33,9 +33,6 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.DevourEffect;
-import mage.abilities.keyword.DevourAbility;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.game.permanent.token.Token;
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
index 9d5e6dfce9..290c4e3e13 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
@@ -35,7 +35,6 @@ import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.SpellAbility;
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
diff --git a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java
index fb4fb7e720..79b1451225 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/ThromokTheInsatiable.java
@@ -31,14 +31,8 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
-import mage.abilities.condition.Condition;
-import mage.abilities.condition.common.DevouredCreaturesCondition;
 import mage.abilities.effects.common.DevourEffect.DevourFactor;
-import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.DevourAbility;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java b/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java
index 8dae138d1c..dd58fe08ab 100644
--- a/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java
+++ b/Mage.Sets/src/mage/sets/planeshift/SunkenHope.java
@@ -44,7 +44,6 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.Target;
-import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetControlledPermanent;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java
index ed1ac0f69e..2a5237bfc0 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java
@@ -30,7 +30,6 @@ package mage.sets.returntoravnica;
 
 import java.util.UUID;
 import mage.Constants;
-import mage.Constants.AttachmentType;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Outcome;
@@ -40,10 +39,8 @@ import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.LoseLifeSourceEffect;
 import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.abilities.effects.common.continious.BoostEnchantedEffect;
-import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
index 01c7598716..748ea888c7 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
@@ -45,7 +45,6 @@ import mage.abilities.effects.common.PopulateEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
index ced296d1a9..c904ed8f0e 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
@@ -36,7 +36,6 @@ import mage.abilities.effects.Effect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 import mage.util.functions.EmptyApplyToPermanent;
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
index 354244aa02..e5ab51328f 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
@@ -41,7 +41,6 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 import mage.watchers.WatcherImpl;
diff --git a/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java b/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java
index 1166f9ae8e..047e5e1592 100644
--- a/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java
+++ b/Mage.Sets/src/mage/sets/stronghold/VolrathsStronghold.java
@@ -31,7 +31,6 @@ import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.Constants.TargetController;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
@@ -41,9 +40,6 @@ import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.CardTypePredicate;
-import mage.filter.predicate.other.OwnerPredicate;
-import mage.filter.predicate.permanent.ControllerPredicate;
-import mage.target.common.TargetCardInGraveyard;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
index 7bb2946aa2..57fbea017c 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
@@ -40,7 +40,6 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
index 7ea047c9f8..28a99aae0a 100644
--- a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
+++ b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
@@ -41,7 +41,6 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
diff --git a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
index f7f9ba6ebc..6274c5ca91 100644
--- a/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
+++ b/Mage.Sets/src/mage/sets/worldwake/PermafrostTrap.java
@@ -40,7 +40,6 @@ import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.WatcherImpl;
diff --git a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
index af27ce1b29..c0817b9420 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
@@ -45,7 +45,6 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
index 0eba42cb32..d723080e82 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
@@ -43,7 +43,6 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetArtifactPermanent;
diff --git a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
index 3676fa8ac5..35fb8dab25 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BalothCageTrap.java
@@ -40,7 +40,6 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.Token;
 import mage.watchers.WatcherImpl;
diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
index 76b5d3b913..4269ecb7a5 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
@@ -46,7 +46,6 @@ import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
-import mage.target.TargetPlayer;
 import mage.target.targetpointer.FixedTarget;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
index 4ee7656b45..3333538d2b 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
@@ -40,7 +40,6 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetCreatureOrPlayer;
diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
index 7381eca426..d33a966a10 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
@@ -53,7 +53,6 @@ import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.NamePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.players.Player;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCardInLibrary;
diff --git a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
index 2c01525d5e..7bfaa84041 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
@@ -42,7 +42,6 @@ import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetLandPermanent;
 import mage.watchers.WatcherImpl;
diff --git a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
index 181d8da30a..e1bf9e0f4d 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
@@ -35,14 +35,12 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
 import mage.MageInt;
-import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapTargetCost;
 import mage.abilities.effects.common.CounterTargetEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.Predicates;
@@ -51,7 +49,6 @@ import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.Permanent;
 import mage.game.permanent.token.Token;
 import mage.game.stack.StackObject;
 import mage.target.Target;
diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java
index 390eb2f234..d32790e028 100644
--- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java
@@ -34,17 +34,13 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.costs.AlternativeCostImpl;
-import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.GainLifeEffect;
-import mage.abilities.effects.common.LoseLifeTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetPlayer;
 import mage.watchers.common.CardsPutIntoGraveyardWatcher;
-import mage.watchers.common.PlayerGainedLifeWatcher;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
index c1a7adc39b..4821fea2cf 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
@@ -42,7 +42,6 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreatureOrPlayer;
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java
index d17ef0d476..b4217fae29 100644
--- a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java
+++ b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.zendikar;
 
-import java.util.Iterator;
 import java.util.UUID;
 
 import mage.Constants.CardType;
diff --git a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
index 5522f1956c..531a8fea40 100644
--- a/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
+++ b/Mage.Sets/src/mage/sets/zendikar/WhiplashTrap.java
@@ -40,7 +40,6 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.WatcherImpl;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java
index b6c1b2b8b3..9388a3a494 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/TragicSlipTest.java
@@ -1,10 +1,6 @@
  package org.mage.test.cards.conditional;
 
 import mage.Constants;
-import mage.abilities.keyword.FirstStrikeAbility;
-import mage.abilities.keyword.LifelinkAbility;
-import mage.game.permanent.Permanent;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java
index b269a61f71..e6e7f1248e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MasterOfThePearlTridentTest.java
@@ -1,8 +1,6 @@
 package org.mage.test.cards.continuous;
 
-import junit.framework.Assert;
 import mage.Constants;
-import mage.abilities.keyword.IndestructibleAbility;
 import mage.abilities.keyword.IslandwalkAbility;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
diff --git a/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java
index b8aa022f51..2a18a40138 100644
--- a/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java
@@ -33,7 +33,6 @@ import mage.Constants.Zone;
 import mage.abilities.effects.Effect;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 
 /**
diff --git a/Mage/src/mage/abilities/common/LandfallAbility.java b/Mage/src/mage/abilities/common/LandfallAbility.java
index 8dce91584f..feb6204dd1 100644
--- a/Mage/src/mage/abilities/common/LandfallAbility.java
+++ b/Mage/src/mage/abilities/common/LandfallAbility.java
@@ -35,7 +35,6 @@ import mage.abilities.effects.Effect;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 
 /**
diff --git a/Mage/src/mage/abilities/keyword/EvolveAbility.java b/Mage/src/mage/abilities/keyword/EvolveAbility.java
index 8c77bc390f..0ed888ad8a 100644
--- a/Mage/src/mage/abilities/keyword/EvolveAbility.java
+++ b/Mage/src/mage/abilities/keyword/EvolveAbility.java
@@ -38,7 +38,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 
 /**
diff --git a/Mage/src/mage/cards/decks/Deck.java b/Mage/src/mage/cards/decks/Deck.java
index 4a108f0581..214632af91 100644
--- a/Mage/src/mage/cards/decks/Deck.java
+++ b/Mage/src/mage/cards/decks/Deck.java
@@ -30,8 +30,6 @@ package mage.cards.decks;
 
 import java.io.Serializable;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 import mage.cards.*;
 import mage.game.GameException;
diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/mage/target/common/TargetCardInLibrary.java
index 51e48ab78f..b2abe2d097 100644
--- a/Mage/src/mage/target/common/TargetCardInLibrary.java
+++ b/Mage/src/mage/target/common/TargetCardInLibrary.java
@@ -28,7 +28,6 @@
 
 package mage.target.common;
 
-import java.util.ArrayList;
 import java.util.List;
 import mage.Constants.Outcome;
 import mage.Constants.Zone;
diff --git a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
index 6f618a9b5e..eeec415a84 100644
--- a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
+++ b/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java
@@ -28,13 +28,11 @@
 
 package mage.watchers.common;
 
-import java.io.ObjectStreamException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 import mage.Constants.WatcherScope;
-import mage.abilities.MageSingleton;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.watchers.WatcherImpl;
diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/mage/watchers/common/SoulbondWatcher.java
index cc495b13e3..088baf2399 100644
--- a/Mage/src/mage/watchers/common/SoulbondWatcher.java
+++ b/Mage/src/mage/watchers/common/SoulbondWatcher.java
@@ -39,7 +39,6 @@ import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetControlledPermanent;