diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index 46c033403b..dbb7bbdf72 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -19,7 +19,6 @@
       <excludes>
           <exclude>org.mage:Mage-Client</exclude>
           <exclude>org.mage:Mage-Theme-Plugin</exclude>
-          <exclude>org.mage:Mage-Card-Plugin</exclude>
           <exclude>org.mage:Mage-Counter-Plugin</exclude>
       </excludes>
     </dependencySet>
@@ -27,7 +26,6 @@
         <outputDirectory>/plugins</outputDirectory>
         <includes>
             <include>org.mage:Mage-Theme-Plugin</include>
-            <include>org.mage:Mage-Card-Plugin</include>
             <include>org.mage:Mage-Counter-Plugin</include>
             <include>org.mage:Mage-Counter-Plugin</include>
         </includes>
diff --git a/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java b/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
index 4d8b066140..815bb4d2df 100644
--- a/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
+++ b/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
@@ -1,9 +1,7 @@
 package mage.client.components.ability;
 
 import org.jdesktop.swingx.painter.AbstractPainter;
-import sun.swing.CachedPainter;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 268e9e932c..d263119136 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -34,7 +34,6 @@
 
 package mage.client.game;
 
-import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator;
 import mage.Constants;
 import mage.client.MageFrame;
 import mage.client.cards.Cards;
@@ -49,7 +48,6 @@ import mage.remote.Session;
 import mage.view.*;
 import org.apache.log4j.Logger;
 
-import javax.net.ssl.HandshakeCompletedEvent;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
@@ -61,7 +59,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
 import java.util.*;
-import java.util.List;
 import java.util.prefs.Preferences;
 
 /**
@@ -872,7 +869,7 @@ public class GamePanel extends javax.swing.JPanel {
 		}
 	}//GEN-LAST:event_btnConcedeActionPerformed
 
-	private void btnSwitchHandActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConcedeActionPerformed
+	private void btnSwitchHandActionPerformed(java.awt.event.ActionEvent evt) {                                           
 		String[] choices = handCards.keySet().toArray(new String[0]);
 
 		String chosenHandKey = (String) JOptionPane.showInputDialog(
diff --git a/Mage.Common/src/mage/remote/Session.java b/Mage.Common/src/mage/remote/Session.java
index cd9c76a658..f7c342f9ac 100644
--- a/Mage.Common/src/mage/remote/Session.java
+++ b/Mage.Common/src/mage/remote/Session.java
@@ -193,7 +193,7 @@ public class Session {
 		}
 		client.disconnected();
 		if (showMessage)
-			client.showError("Server error.  You have been disconnected");
+			client.showError("Network error.  You have been disconnected");
 	}
 
 	class CallbackHandler implements InvokerCallbackHandler {
diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java
index 8792d0d5a5..938853b602 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java
@@ -7,10 +7,8 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.Card;
 import mage.target.Target;
 import mage.target.common.TargetCreatureOrPlayer;
-import mage.target.common.TargetCreatureOrPlayerAmount;
 import mage.target.common.TargetCreaturePermanent;
 import org.apache.log4j.Logger;
-import sun.rmi.runtime.Log;
 
 import java.io.InputStream;
 import java.util.*;
diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index fc5adeca84..9f462cd58f 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -35,7 +35,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import com.sun.corba.se.spi.monitoring.StatisticMonitoredAttribute;
 import mage.Constants.Outcome;
 import mage.Constants.RangeOfInfluence;
 import mage.Constants.TargetController;
@@ -77,7 +76,6 @@ import mage.target.common.TargetCreatureOrPlayer;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.common.TargetDefender;
 
-import javax.xml.transform.Source;
 
 /**
  *
diff --git a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
index 90bc0b2eaa..f00f915e7d 100644
--- a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
+++ b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
@@ -74,7 +74,7 @@ public class ServerMessagesUtil {
 	}
 
 	private void reloadMessages() {
-		log.info("Reading server messages...");
+		log.debug("Reading server messages...");
 		List<String> newMessages = readFromFile();
 		if (newMessages != null && !newMessages.isEmpty()) {
 			lock.writeLock().lock();
@@ -90,7 +90,7 @@ public class ServerMessagesUtil {
 	private List<String> readFromFile() {
 		InputStream is = ServerMessagesUtil.class.getResourceAsStream(SERVER_MSG_TXT_FILE);
 		if (is == null) {
-			log.info("Couldn't find server.msg");
+			log.warn("Couldn't find server.msg");
 			return null;
 		}
 		Scanner scanner = new Scanner(is);