diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index 0b6ea543942..04b485bf4e7 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -25,17 +25,6 @@
             <artifactId>mage-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mage</groupId>
-            <artifactId>mage-sets</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- for running embedded mage server -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mage-server</artifactId>
-            <version>${mage-version}</version>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.jspf</groupId>
             <artifactId>jspf-core</artifactId>
@@ -76,23 +65,13 @@
             <artifactId>forms_rt</artifactId>
             <version>7.0.3</version>
         </dependency>
-        <!--
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-           <version>4.8.2</version>
+           <version>4.11</version>
            <type>jar</type>
            <scope>test</scope>
        </dependency>
-        -->
-        <!--
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mage-theme-plugin</artifactId>
-            <version>0.5</version>
-            <scope>runtime</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mage-counter-plugin</artifactId>
diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 3fdf6b81d1b..3ea48536d82 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -40,7 +40,6 @@ import de.schlichtherle.truezip.fs.FsOutputOption;
 import mage.cards.decks.Deck;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
-import mage.cards.repository.CardScanner;
 import mage.client.cards.BigCard;
 import mage.client.chat.ChatPanel;
 import mage.client.components.MageComponents;
@@ -67,7 +66,6 @@ import mage.client.util.SettingsManager;
 import mage.client.util.gui.ArrowBuilder;
 import mage.client.util.MusicPlayer;
 import mage.components.ImagePanel;
-import mage.interfaces.Action;
 import mage.interfaces.MageClient;
 import mage.interfaces.callback.CallbackClient;
 import mage.interfaces.callback.ClientCallback;
@@ -75,7 +73,6 @@ import mage.remote.Connection;
 import mage.remote.Connection.ProxyType;
 import mage.remote.Session;
 import mage.remote.SessionImpl;
-import mage.server.Main;
 import mage.utils.MageVersion;
 import org.apache.log4j.Logger;
 import org.mage.card.arcane.ManaSymbols;
@@ -205,12 +202,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         this.setExtendedState(JFrame.MAXIMIZED_BOTH);
 
         session = new SessionImpl(this);
-        session.setEmbeddedMageServerAction(new Action() {
-            @Override
-            public void execute() {
-                Main.main(new String[]{});
-            }
-        });
         callbackClient = new CallbackClientImpl(this);
         connectDialog = new ConnectDialog();
         desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);