diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/ProguardConf.java b/LaunchServer/src/main/java/ru/gravit/launchserver/ProguardConf.java
index cd8e490e..e89d85cf 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/ProguardConf.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/ProguardConf.java
@@ -10,11 +10,8 @@
 import java.nio.file.Paths;
 import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
 
 import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.JVMHelper;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java b/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java
index 6acb2dbf..36feb2c2 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java
@@ -2,7 +2,7 @@
 
 import org.objectweb.asm.*;
 
-import launcher.helper.IOHelper;
+import ru.gravit.utils.helper.IOHelper;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java
index b6abbd47..18930538 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java
@@ -1,6 +1,5 @@
 package ru.gravit.launchserver.auth.hwid;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java
index 79a0edd1..25391290 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java
@@ -1,12 +1,7 @@
 package ru.gravit.launchserver.auth.provider;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;
@@ -20,9 +15,6 @@
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 
 public final class JsonAuthProvider extends AuthProvider {
-    private static final int TIMEOUT = Integer.parseInt(
-            System.getProperty("launcher.connection.timeout", Integer.toString(1500)));
-
     private final URL url;
     private final String userKeyName;
     private final String passKeyName;
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java
index 733a7757..697e1beb 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java
@@ -3,10 +3,6 @@
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.socket.NettyServerSocketHandler;
-import ru.gravit.utils.HttpDownloader;
-import ru.gravit.utils.helper.LogHelper;
-
-import java.net.URL;
 
 public class TestCommand extends Command {
     public TestCommand(LaunchServer server) {
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java
index 2efef5f9..d86675bc 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java
@@ -14,7 +14,9 @@ public ModulesManager(LaunchServer lsrv) {
 		modules = new ArrayList<>(1);
 		classloader = new LauncherClassLoader(new URL[0], ClassLoader.getSystemClassLoader());
 		context = new LaunchServerModuleContext(lsrv, classloader);
+		registerCoreModule();
 	}
+	
 	private void registerCoreModule() {
 		load(new CoreModule());
 	}
diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java
index 6c7b77cb..c727976f 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckBitSetModelBase.java
@@ -7,7 +7,6 @@
 import com.sun.javafx.collections.NonIterableChange;
 import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
 
-import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.ListChangeListener;
diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java
index 4a7e8026..7f81ca68 100644
--- a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java
+++ b/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java
@@ -8,7 +8,6 @@
 public class LauncherSSLContext {
     public SSLServerSocketFactory ssf;
     public SSLSocketFactory sf;
-    private SSLContext sc;
     public LauncherSSLContext(KeyStore ks,String keypassword) throws NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, UnrecoverableKeyException, KeyManagementException {
         TrustManager[] trustAllCerts = new TrustManager[] {
                 new LauncherTrustManager()