diff --git a/.gitmodules b/.gitmodules
index 03e1094..4c62f6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "source/SuperUserLib3DS"]
-	path = source/SuperUserLib3DS
-	url = https://github.com/delebile/SuperUserLib3DS
 [submodule "source/svchax"]
 	path = source/svchax
 	url = https://github.com/aliaspider/svchax.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c2949e..40ee76c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,7 @@ file(GLOB_RECURSE SOURCE_FILES
     source/*
 )
 file(GLOB FILTER_FILES
-    source/SuperUserLib3DS/demo/source/*
-    source/svchax/test.c
+    source/svchax/svchax.c
 )
 list(REMOVE_ITEM SOURCE_FILES
     ${FILTER_FILES}
diff --git a/source/SuperUserLib3DS b/source/SuperUserLib3DS
deleted file mode 160000
index 80ccc2e..0000000
--- a/source/SuperUserLib3DS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 80ccc2e132448842db30c2c66928787a2f7fbf53
diff --git a/source/Utility.cpp b/source/Utility.cpp
index 08ea7ef..8ef66c0 100644
--- a/source/Utility.cpp
+++ b/source/Utility.cpp
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <stdio.h>
 #include "Utility.h"
-#include "SuperUserLib3DS/libsu.h"
 #include "libmd5-rfc/md5.h"
 
 #define BUFSIZE 131072
@@ -229,19 +228,10 @@ int Utility::getAMu() {
     }
 
     // try to get arm11
-    if(osGetKernelVersion() > SYSTEM_VERSION(2,50,9)) {
-        svchax_init();
-        aptInit();
-        APT_CheckNew3DS(&isNew3DS);
-        patchServiceAccess();
-    } else {
-        gfxExit();
-        if (suInit() != 0) {
-            _gfxInit();
-            return 1;
-        }
-        _gfxInit();
-    }
+    svchax_init();
+    aptInit();
+    APT_CheckNew3DS(&isNew3DS);
+    patchServiceAccess();
 
     srvGetServiceHandleDirect(&amHandle, "am:u");
     if (amHandle) {
diff --git a/source/svchax b/source/svchax
index 40d050e..e1ddbff 160000
--- a/source/svchax
+++ b/source/svchax
@@ -1 +1 @@
-Subproject commit 40d050ee92cd933d603a23558382f79780faec72
+Subproject commit e1ddbff8699131831c001dd977968261edc842a1