diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index b2cfb35393e..5fe5657feb8 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -60,7 +60,6 @@ import mage.components.CardInfoPane;
 import mage.game.GameException;
 import mage.sets.Sets;
 import mage.view.CardView;
-import sun.swing.SwingUtilities2;
 
 /**
  *
diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index 896b98b47d2..71d62a6c784 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -50,14 +50,12 @@ import java.util.UUID;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 
-import com.sun.swing.internal.plaf.synth.resources.synth;
 
 import mage.cards.MagePermanent;
 import mage.client.cards.BigCard;
 import mage.client.cards.Permanent;
 import mage.client.plugins.impl.Plugins;
 import mage.client.util.Config;
-import mage.client.util.DefaultActionCallback;
 import mage.view.PermanentView;
 
 /**
diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
index 618bb7f768d..88f2080b395 100644
--- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
+++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
@@ -28,10 +28,7 @@
 
 package mage.client.remote;
 
-import mage.remote.Session;
-import java.rmi.RemoteException;
 import java.util.UUID;
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import mage.cards.decks.Deck;
 import mage.client.MageFrame;
diff --git a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
index 4e603ec07a3..4ab11e91360 100644
--- a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
@@ -1,6 +1,5 @@
 package mage.abilities.common;
 
-import com.sun.org.apache.bcel.internal.generic.CASTORE;
 import mage.Constants;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;