diff --git a/Usermode/Makefile b/Usermode/Makefile
index ed494fd2debd43d773cf088ab49f7db3b933b331..9c32b324edc27f53291d7b030042949933ca8bf5 100644
--- a/Usermode/Makefile
+++ b/Usermode/Makefile
@@ -103,9 +103,7 @@ $(OBJDIR)loader/bin/src/main.o: $(LOADER_DEPS)
 
 .PHONY: xargo
 xargo: $(OBJDIR)rustrt0.o $(LIBDIR)libloader_dyn.so $(LIBDIR)libloader_start.a	# Referenced by link-$(TARGET).ld
-	#$(XARGO) build $(XARGO_FLAGS) --manifest-path libstd/Cargo.toml
 	$(XARGO) build $(XARGO_FLAGS) --manifest-path loader/bin/Cargo.toml
-	#cp target/$(XARGO_TARGET)/$(XARGO_PROFILE)/libstd.rlib ../.prefix/xargo/lib/rustlib/$(XARGO_TARGET)/lib/
 	$(XARGO) build $(XARGO_FLAGS)
 
 $(LIBDIR)libloader_start.a: $(OBJDIR)loader/bin/start.ao
diff --git a/Usermode/filebrowser/Cargo.toml b/Usermode/filebrowser/Cargo.toml
index abc74a0efef6b9c262db2d4ac9d51b8b36ada428..3564d4cb029b8e25c6c35c9b836684ca20a9ebb6 100644
--- a/Usermode/filebrowser/Cargo.toml
+++ b/Usermode/filebrowser/Cargo.toml
@@ -3,8 +3,8 @@ name = "filebrowser"
 version = "0.0.1"
 
 [dependencies]
-#std = { path = "../libstd" }
 wtk = { path = "../libwtk" }
 vec_ring = { path = "../libvec_ring" }
-syscalls = { path = "../libsyscalls" }
-loader = { path = "../loader/lib" }
+
+#syscalls = { path = "../libsyscalls" }
+#loader = { path = "../loader/lib" }
diff --git a/Usermode/libasync/Cargo.toml b/Usermode/libasync/Cargo.toml
index 25984cf8e3b7225da96c313714f3cfb3b4534fa1..a9cce034388abd463c19950c2c375760cf50e582 100644
--- a/Usermode/libasync/Cargo.toml
+++ b/Usermode/libasync/Cargo.toml
@@ -7,4 +7,4 @@ path = "lib.rs"
 
 [dependencies]
 #std = { path = "../libstd" }
-syscalls = { path = "../libsyscalls" }
+#syscalls = { path = "../libsyscalls" }
diff --git a/Usermode/libstd/Cargo.toml b/Usermode/libstd/Cargo.toml
index b23003ff724be2dc1d26afbb79833864a4505727..f139856e780e535403ad25b8d90543ce19f75fea 100644
--- a/Usermode/libstd/Cargo.toml
+++ b/Usermode/libstd/Cargo.toml
@@ -9,3 +9,5 @@ std_sync = { path = "../libstd_sync" }
 syscalls = { path = "../libsyscalls" }
 macros = { path = "../libmacros" }
 alloc_system = { path = "../liballoc_system" }
+
+loader = { path = "../loader/lib" }
diff --git a/Usermode/libwtk/Cargo.toml b/Usermode/libwtk/Cargo.toml
index a6bc07001107fb815a095c93bbf6da548d73e24f..1d12d85d9408072c5755eb66dc8b147767d3486f 100644
--- a/Usermode/libwtk/Cargo.toml
+++ b/Usermode/libwtk/Cargo.toml
@@ -6,9 +6,9 @@ version = "0.0.1"
 path = "lib.rs"
 
 [dependencies]
-syscalls = { path = "../libsyscalls" }
 macros = { path = "../libmacros" }
 async = { path = "../libasync" }
 byteorder = { path = "../libbyteorder" }
 
 #std = { path = "../libstd" }
+#syscalls = { path = "../libsyscalls" }
diff --git a/Usermode/loader/bin/Cargo.toml b/Usermode/loader/bin/Cargo.toml
index 3f5df146f18e162073436dc72984eff52cd9b168..793e5dcecad5eb5ac6fe4a082a924bee885d7a14 100644
--- a/Usermode/loader/bin/Cargo.toml
+++ b/Usermode/loader/bin/Cargo.toml
@@ -6,10 +6,10 @@ version = "0.0.0"
 #path = "src/main.rs"
 
 [dependencies]
-loader = { path = "../lib" }
 byteorder = { path = "../../libbyteorder" }
 macros = { path = "../../libmacros" }
 cmdline_words_parser = { path = "../../../externals/crates.io/cmdline_words_parser" }
 
 # Part of sysroot
 #syscalls = { path = "../../libsyscalls" }
+#loader = { path = "../lib" }
diff --git a/Usermode/loader/lib/Cargo.toml b/Usermode/loader/lib/Cargo.toml
index d0f1730b3796cec581e139fcfc6700be4be99318..46a5bb8dc22b3890e50e8051a51d7de600bf61b3 100644
--- a/Usermode/loader/lib/Cargo.toml
+++ b/Usermode/loader/lib/Cargo.toml
@@ -7,6 +7,7 @@ path = "lib.rs"
 
 [dependencies]
 syscalls = { path = "../../libsyscalls" }
+
 #byteorder = { path = "../libbyteorder" }
 #macros = { path = "../libmacros" }
 #cmdline_words_parser = { path = "../../externals/crates.io/cmdline_words_parser" }