diff --git a/.gitmodules b/.gitmodules
index a3bb9430..2a28807e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,12 +61,6 @@
 [submodule "mcpelauncher-mac-bin"]
 	path = mcpelauncher-mac-bin
 	url = ../mcpelauncher-mac-bin.git
-[submodule "fake-jni"]
-	path = fake-jni
-	url = ../fake-jni.git
-[submodule "baron"]
-	path = baron
-	url = ../baron.git
 [submodule "android-support-headers"]
 	path = android-support-headers
 	url = ../android-support-headers.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b737f6..c1c6a163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,17 +128,11 @@ if (BUILD_CLIENT)
     add_subdirectory(mcpelauncher-core)
 endif()
 
-option(JNI_USE_JNIVM "if off it uses fake-jni + baron or it uses jnivm instead as jni interface" ON)
 if (BUILD_CLIENT)
     add_subdirectory(android-support-headers)
-    if (JNI_USE_JNIVM)
-        set(JNIVM_ENABLE_RETURN_NON_ZERO ON CACHE BOOL "" FORCE)
-        set(JNIVM_FAKE_JNI_MINECRAFT_LINUX_COMPAT ON CACHE BOOL "" FORCE)
-        add_subdirectory(libjnivm)
-    else()
-        add_subdirectory(fake-jni)
-        add_subdirectory(baron)
-    endif()
+    set(JNIVM_ENABLE_RETURN_NON_ZERO ON CACHE BOOL "" FORCE)
+    set(JNIVM_FAKE_JNI_MINECRAFT_LINUX_COMPAT ON CACHE BOOL "" FORCE)
+    add_subdirectory(libjnivm)
     add_subdirectory(mcpelauncher-client)
 endif()
 if (BUILD_CLIENT OR BUILD_UI)
diff --git a/baron b/baron
deleted file mode 160000
index 0088704e..00000000
--- a/baron
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0088704e8cd24174b3dbb34b5fbccbfc066f7bf6
diff --git a/fake-jni b/fake-jni
deleted file mode 160000
index 7245154b..00000000
--- a/fake-jni
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7245154bcbc588740717440cebf883641dc8dc56
diff --git a/libc-shim b/libc-shim
index 4c18499d..fe6920c0 160000
--- a/libc-shim
+++ b/libc-shim
@@ -1 +1 @@
-Subproject commit 4c18499d13460faa2787cc5d5b55195a8e024445
+Subproject commit fe6920c070cfad776913ce92502a120f338dd5db
diff --git a/mcpelauncher-client b/mcpelauncher-client
index ad987e1b..5e5a3f1a 160000
--- a/mcpelauncher-client
+++ b/mcpelauncher-client
@@ -1 +1 @@
-Subproject commit ad987e1b8505df2580a5c2586084f05b89268d70
+Subproject commit 5e5a3f1a9fc8c60f851b2c4efbcea42da75549a9