diff --git a/Server/Crandor Server - 530 - World 1.bat b/Server/Crandor Server - 530 - World 1.bat
index c07f0a926..e10d1ccec 100644
--- a/Server/Crandor Server - 530 - World 1.bat	
+++ b/Server/Crandor Server - 530 - World 1.bat	
@@ -1,4 +1,4 @@
 @echo off
 @title World 1
-java -server -Xms512m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Main server1.properties
+java -server -Xms512m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Server server1.properties
 pause
\ No newline at end of file
diff --git a/Server/Crandor Server - 530 - World 2.bat b/Server/Crandor Server - 530 - World 2.bat
index cf5814e6f..37e59a4a6 100644
--- a/Server/Crandor Server - 530 - World 2.bat	
+++ b/Server/Crandor Server - 530 - World 2.bat	
@@ -1,4 +1,4 @@
 @echo off
 @title World 2
-java -server -Xms1024m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Main server2.properties
+java -server -Xms1024m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Server server2.properties
 pause
diff --git a/Server/Crandor Server - 530 - World 3.bat b/Server/Crandor Server - 530 - World 3.bat
index ba7ae6d7f..e1d8c6b16 100644
--- a/Server/Crandor Server - 530 - World 3.bat	
+++ b/Server/Crandor Server - 530 - World 3.bat	
@@ -1,4 +1,4 @@
 @echo off
 @title World 3
-java -server -Xms1024m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Main server3.properties
+java -server -Xms1024m -Xmx1536m -XX:NewSize=32m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:+AggressiveOpts -cp bin;data/libs/*;data/libs/slf4j/*; org.crandor.Server server3.properties
 pause
diff --git a/Server/src/org/crandor/Main.java b/Server/src/org/crandor/Main.java
deleted file mode 100644
index 2bab7fff1..000000000
--- a/Server/src/org/crandor/Main.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.crandor;
-
-import org.crandor.game.system.SystemLogger;
-import org.crandor.game.system.SystemShutdownHook;
-import org.crandor.game.system.mysql.SQLManager;
-import org.crandor.game.world.GameSettings;
-import org.crandor.game.world.GameWorld;
-import org.crandor.gui.ConsoleFrame;
-import org.crandor.net.NioReactor;
-import org.crandor.net.amsc.WorldCommunicator;
-import org.crandor.tools.TimeStamp;
-import org.crandor.tools.backup.AutoBackup;
-
-import java.net.BindException;
-
-/**
- * The main class, for those that are unable to read the class' name.
- * @author Emperor
- * @author Vexia
- * 
- */
-public final class Main{
-
-	/**
-	 * The time stamp of when the server started running.
-	 */
-	public static long startTime;
-
-	/**
-	 * The NIO reactor.
-	 */
-	public static NioReactor reactor;
-
-	private static AutoBackup backup;
-
-	/**
-	 * The main method, in this method we load background utilities such as
-	 * cache and our world, then end with starting networking.
-	 * @param args The arguments cast on runtime.
-	 * @throws Throwable When an exception occurs.
-	 */
-	public static void main(String... args) throws Throwable {
-		if (args.length > 0) {
-			GameWorld.setSettings(GameSettings.parse(args));
-		}
-		if (GameWorld.getSettings().isGui()) {
-			ConsoleFrame.getInstance().init();
-		}
-		startTime = System.currentTimeMillis();
-		final TimeStamp t = new TimeStamp();
-//		backup = new AutoBackup();
-		GameWorld.prompt(true);
-		SQLManager.init();
-		Runtime.getRuntime().addShutdownHook(new Thread(new SystemShutdownHook()));
-		SystemLogger.log("Starting NIO reactor...");
-
-		try {
-			reactor = NioReactor.configure(43594 + GameWorld.getSettings().getWorldId());
-		} catch (BindException e) {
-			System.out.println("Port " + 43594 + GameWorld.getSettings().getWorldId() + " is already in use!");
-			throw e;
-		}
-
-		WorldCommunicator.connect();
-		reactor.start();
-		SystemLogger.log(GameWorld.getName() + " flags " + GameWorld.getSettings().toString());
-		SystemLogger.log(GameWorld.getName() + " started in " + t.duration(false, "") + " milliseconds.");
-
-	}
-
-	/**
-	 * Gets the startTime.
-	 * @return the startTime
-	 */
-	public static long getStartTime() {
-		return startTime;
-	}
-
-	/**
-	 * Sets the bastartTime.
-	 * @param startTime the startTime to set.
-	 */
-	public static void setStartTime(long startTime) {
-		Main.startTime = startTime;
-	}
-
-}
\ No newline at end of file