diff --git a/Mage.Server.Tests/config/config.xml b/Mage.Server.Tests/config/config.xml
index 62049a2fc80..63d6d6d2824 100644
--- a/Mage.Server.Tests/config/config.xml
+++ b/Mage.Server.Tests/config/config.xml
@@ -2,16 +2,8 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
     <!-- 
-    serverAddress       - ip of the XMage server. Set it to "0.0.0.0" for local host or to the IP the server should use 
+    serverName          - name of the XMage server 
     port                - the port the primary server socket is bound to 
-    secondaryBindPort   - the port to which the secondary server socket is to be bound. if "-1" is set , an arbitrary port is selected. 
-    backlogSize         - the preferred number of unaccepted incoming connections allowed at a given time. The actual number may be greater 
-                          than the specified backlog. When the queue is full, further connection requests are rejected. The JBoss default value is 200
-    numAcceptThreads    - the number of threads listening on the ServerSocket. The JBoss default value is 1 
-    maxPoolSize         - the maximum number of ServerThreads that can exist at any given time. The JBoss default value is 300 
-    leasePeriod         - To turn on server side connection failure detection of remoting clients, it is necessary to satisfy two criteria. 
-                          The first is that the client lease period is set and is a value greater than 0. The value is represented in milliseconds. 
-                          The client lease period can be set by either the 'clientLeasePeriod' attribute within the Connector configuration or by calling the Connector method
     maxGameThreads      - Number of games that can be started simultanously on the server
     maxSecondsIdle      - Number of seconds after that a game is auto conceded by the player that was idle for such a time
     minUserNameLength   - minmal allowed length of a user name to connect to the server
@@ -20,14 +12,8 @@
     maxAiOpponents      - number of allowed AI opponents on the server
     saveGameActivated   - allow game save and replay options (not working correctly yet)
     -->
-    <server serverAddress="0.0.0.0"
-            serverName="mage-server"
+    <server serverName="mage-test-server"
             port="17171"
-            secondaryBindPort="17179"             
-            backlogSize="200" 
-            numAcceptThreads="2" 
-            maxPoolSize="300" 
-            leasePeriod="5000"             
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server.Tests/pom.xml b/Mage.Server.Tests/pom.xml
index 706cd196b5b..1eb763cc402 100644
--- a/Mage.Server.Tests/pom.xml
+++ b/Mage.Server.Tests/pom.xml
@@ -22,20 +22,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>mage-server</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jboss-common-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.remoting</groupId>
-                    <artifactId>jboss-remoting</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jboss</groupId>
-                    <artifactId>jboss-serialization</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index e2b72b90203..ed3c5934d05 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -2,16 +2,8 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
     <!--
-    serverAddress       - ip of the XMage server. Set it to "0.0.0.0" for local host or to the IP the server should use
+    serverName          - name of the XMage server
     port                - the port the primary server socket is bound to
-    secondaryBindPort   - the port to which the secondary server socket is to be bound. if "-1" is set , an arbitrary port is selected.
-    backlogSize         - the preferred number of unaccepted incoming connections allowed at a given time. The actual number may be greater
-                          than the specified backlog. When the queue is full, further connection requests are rejected. The JBoss default value is 200
-    numAcceptThreads    - the number of threads listening on the ServerSocket. The JBoss default value is 1
-    maxPoolSize         - the maximum number of ServerThreads that can exist at any given time. The JBoss default value is 300
-    leasePeriod         - To turn on server side connection failure detection of remoting clients, it is necessary to satisfy two criteria.
-                          The first is that the client lease period is set and is a value greater than 0. The value is represented in milliseconds.
-                          The client lease period can be set by either the 'clientLeasePeriod' attribute within the Connector configuration or by calling the Connector method
     maxGameThreads      - Number of games that can be started simultanously on the server
     maxSecondsIdle      - Number of seconds after that a game is auto conceded by the player that was idle for such a time
     minUserNameLength   - minmal allowed length of a user name to connect to the server
@@ -19,15 +11,10 @@
     userNamePattern     - pattern for user name validity check
     maxAiOpponents      - number of allowed AI opponents on the server
     saveGameActivated   - allow game save and replay options (not working correctly yet)
+	useSSL              - if set to "true" then SSL encryption will be used - will not provide trust verification
     -->
-    <server serverAddress="0.0.0.0"
-            serverName="mage-server"
+    <server serverName="mage-server"
             port="17171"
-            secondaryBindPort="17179"
-            backlogSize="200"
-            numAcceptThreads="2"
-            maxPoolSize="300"
-            leasePeriod="5000"
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index d071f6f62bc..b551d9672de 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <server serverAddress="0.0.0.0"
-            serverName="mage-server"
+    <server serverName="mage-server"
             port="17171"
-            secondaryBindPort="-1"
-            backlogSize="200"
-            numAcceptThreads="2"
-            maxPoolSize="300"
-            leasePeriod="5000"
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java
index 09b3b7d3f2a..8fd6e580d51 100644
--- a/Mage.Server/src/main/java/mage/server/ServerMain.java
+++ b/Mage.Server/src/main/java/mage/server/ServerMain.java
@@ -196,7 +196,7 @@ public class ServerMain implements MageServer {
             server = new Server(instance);
             server.start(config.getPort(), config.isUseSSL());
         } catch (Exception ex) {
-            logger.fatal("Failed to start server - " + config.getServerAddress(), ex);
+            logger.fatal("Failed to start server - " + config.getServerName(), ex);
         }
 
     }
diff --git a/Mage.Server/src/main/java/mage/server/util/Config.java b/Mage.Server/src/main/java/mage/server/util/Config.java
deleted file mode 100644
index 4694951c7cd..00000000000
--- a/Mage.Server/src/main/java/mage/server/util/Config.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification, are
-* permitted provided that the following conditions are met:
-*
-*    1. Redistributions of source code must retain the above copyright notice, this list of
-*       conditions and the following disclaimer.
-*
-*    2. Redistributions in binary form must reproduce the above copyright notice, this list
-*       of conditions and the following disclaimer in the documentation and/or other materials
-*       provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
-* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* The views and conclusions contained in the software and documentation are those of the
-* authors and should not be interpreted as representing official policies, either expressed
-* or implied, of BetaSteward_at_googlemail.com.
-*/
-
-package mage.server.util;
-
-import java.io.IOException;
-import java.util.Properties;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author BetaSteward_at_googlemail.com
- */
-public class Config {
-
-    private static final Logger logger = Logger.getLogger(Config.class);
-
-    static {
-        Properties p = new Properties();
-        try {
-            p.load(Config.class.getResourceAsStream("resources/config.properties"));
-        } catch (IOException ex) {
-            logger.fatal("Config error", ex);
-        }
-        port = Integer.parseInt(p.getProperty("port"));
-        secondaryBindPort = Integer.parseInt(p.getProperty("secondaryBindPort"));
-        backlogSize = Integer.parseInt(p.getProperty("backlogSize"));
-        numAcceptThreads = Integer.parseInt(p.getProperty("numAcceptThreads"));
-        maxPoolSize = Integer.parseInt(p.getProperty("numPoolSize"));
-        leasePeriod = Integer.parseInt(p.getProperty("leasePeriod"));
-        
-        remoteServer = p.getProperty("remote-server");
-        maxGameThreads = Integer.parseInt(p.getProperty("max-game-threads"));
-        maxSecondsIdle = Integer.parseInt(p.getProperty("max-seconds-idle"));
-        minUserNameLength = Integer.parseInt(p.getProperty("minUserNameLength"));
-        maxUserNameLength = Integer.parseInt(p.getProperty("maxUserNameLength"));
-        userNamePattern = p.getProperty("userNamePattern");
-        saveGameActivated = Boolean.parseBoolean(p.getProperty("saveGameActivated"));
-        useSSL = Boolean.parseBoolean(p.getProperty("useSSL"));
-    }
-
-    public static final String remoteServer;
-    public static final int port;
-    public static final int secondaryBindPort;
-    public static final int backlogSize;
-    public static final int numAcceptThreads;
-    public static final int maxPoolSize;
-    public static final int leasePeriod;
-    public static final int maxGameThreads;
-    public static final int maxSecondsIdle;
-    public static final int minUserNameLength;
-    public static final int maxUserNameLength;
-    public static final String userNamePattern;
-    public static final boolean saveGameActivated;
-    public static final boolean useSSL;
-
-}
diff --git a/Mage.Server/src/main/java/mage/server/util/Config.xsd b/Mage.Server/src/main/java/mage/server/util/Config.xsd
deleted file mode 100644
index 7360a80d73c..00000000000
--- a/Mage.Server/src/main/java/mage/server/util/Config.xsd
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-    <xs:element name="config">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="server"/>
-				<xs:element ref="playerTypes"/>
-				<xs:element ref="gameTypes"/>
-				<xs:element ref="draftTypes"/>
-				<xs:element ref="deckTypes"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="server">
-		<xs:complexType>
-			<xs:attribute name="serverAddress" type="xs:string" use="required"/>
-			<xs:attribute name="serverName" type="xs:string" use="required"/>
-			<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="secondaryBindPort" type="xs:integer" use="required"/>
-                        <xs:attribute name="backlogSize" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="numAcceptThreads" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="maxPoolSize" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="leasePeriod" type="xs:positiveInteger" use="required"/>
-			<xs:attribute name="maxGameThreads" type="xs:positiveInteger" use="required"/>
-			<xs:attribute name="maxSecondsIdle" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
-                        <xs:attribute name="maxAiOpponents" type="xs:string" use="optional"/>
-                        <xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
-                        <xs:attribute name="useSSL" type="xs:boolean" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:complexType name="plugin">
-		<xs:attribute name="name" type="xs:string"/>
-		<xs:attribute name="jar" type="xs:string"/>
-		<xs:attribute name="className" type="xs:string"/>
-	</xs:complexType>
-
-	<xs:complexType name="gamePlugin">
-		<xs:complexContent>
-			<xs:extension base="plugin">
-				<xs:attribute name="typeName" type="xs:string"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:element name="playerTypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="playerType" type="plugin" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="gameTypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="gameType" type="gamePlugin" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="draftTypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="draftType" type="plugin" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="deckTypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="deckType" type="plugin" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
index 36aa4ad8c16..4d13dce3e78 100644
--- a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
+++ b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
@@ -63,10 +63,6 @@ public class ConfigSettings {
         }
     }
 
-    public String getServerAddress() {
-        return config.getServer().getServerAddress();
-    }
-
     public String getServerName() {
         return config.getServer().getServerName();
     }
diff --git a/Mage.Server/src/main/java/mage/server/util/resources/config.xml b/Mage.Server/src/main/java/mage/server/util/resources/config.xml
index d8f61819b85..eb4f24fb597 100644
--- a/Mage.Server/src/main/java/mage/server/util/resources/config.xml
+++ b/Mage.Server/src/main/java/mage/server/util/resources/config.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <server serverAddress="0.0.0.0" 
-            serverName="mage-server" 
-            port="17171" 
-            secondaryBindPort="-1" 
-            backlogSize="200" 
-            numAcceptThreads="2" 
-            maxPoolSize="300" 
-            leasePeriod="5000" 
+    <server serverName="mage-server"
+            port="17171"
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd b/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
index 3d8aac9d911..eb0a9551041 100644
--- a/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
+++ b/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
@@ -17,16 +17,10 @@
     
 	<xs:element name="server">
 		<xs:complexType>
-			<xs:attribute name="serverAddress" type="xs:string" use="required"/>
 			<xs:attribute name="serverName" type="xs:string" use="required"/>
 			<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxGameThreads" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxSecondsIdle" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="secondaryBindPort" type="xs:integer" use="required"/>
-                        <xs:attribute name="backlogSize" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="numAcceptThreads" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="maxPoolSize" type="xs:positiveInteger" use="required"/>
-                        <xs:attribute name="leasePeriod" type="xs:positiveInteger" use="required"/>                        
                         <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
                         <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
                         <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
diff --git a/Mage.Tests/config/config.xml b/Mage.Tests/config/config.xml
index 0331f077124..49dbac16373 100644
--- a/Mage.Tests/config/config.xml
+++ b/Mage.Tests/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <server serverAddress="0.0.0.0" serverName="mage-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/>
+    <server serverName="mage-test-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/>
     <playerTypes>
         <playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>
         <playerType name="Computer - mad" jar="mage-player-ai-ma.jar" className="mage.player.ai.ComputerPlayer7"/>