diff --git a/.gitignore b/.gitignore
index 33c88271..eb5a316c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-bootimage.bin
 target
diff --git a/Cargo.lock b/Cargo.lock
index 7bbe3f37..540db7e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,11 +10,6 @@ name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bootloader"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "cc"
 version = "1.0.47"
@@ -24,7 +19,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "eduos-rs"
 version = "0.1.0"
 dependencies = [
- "bootloader 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "x86 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -78,7 +72,6 @@ dependencies = [
 [metadata]
 "checksum bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a165d606cf084741d4ac3a28fb6e9b1eb0bd31f6cd999098cfddb0b2ab381dc0"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bootloader 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abfbe6cdea6367860818facc8e4a184f003cb83d7d004acaaf57baebf1949da0"
 "checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
 "checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
diff --git a/Cargo.toml b/Cargo.toml
index fee4ecd1..7eac3463 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,34 +4,13 @@ version = "0.1.0"
 license = "MIT/Apache-2.0"
 authors = ["Stefan Lankes <slankes@eonerc.rwth-aachen.de>"]
 
-
 [dependencies]
 spin = "0.5.2"	# Spinlocks.
 
-[target.'cfg(target_arch = "x86_64")'.dependencies.bootloader]
-version = "0.8.*"
-default-features = false
-optional = true
-
 [target.'cfg(target_arch = "x86_64")'.dependencies.x86]
 version = "0.28.*"
 default-features = false
 
-[features]
-default = ["bootloader"]
-
-[package.metadata.cargo-xbuild]
-memcpy = true
-
-[package.metadata.bootimage]
-default-target = "x86_64-eduos.json" # This target is used if no `--target` is passed
-# The command invoked on `bootimage run`
-# (the "{}" will be replaced with the path to the bootable disk image)
-run-command = ["qemu-system-x86_64", "-display", "none", "-smp", "1", "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio", "-drive", "format=raw,file={}"]
-# Additional arguments passed to the run command for non-test executables
-# Applies to `bootimage run` and `bootimage runner`
-run-args = []
-
 # The development profile, used for `cargo build`.
 [profile.dev]
 opt-level = 0      # controls the `--opt-level` the compiler builds with
diff --git a/src/lib.rs b/src/lib.rs
index d23fcf30..ed182c6c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,5 +17,4 @@ pub mod macros;
 pub mod logging;
 pub mod arch;
 pub mod console;
-#[cfg(not(feature = "bootloader"))]
-pub mod rlib;
\ No newline at end of file
+pub mod rlib;