diff --git a/bootloader/bootloader/src/arch/mod.rs b/bootloader/bootloader/src/arch/mod.rs
index 6f1d16f..de54e06 100644
--- a/bootloader/bootloader/src/arch/mod.rs
+++ b/bootloader/bootloader/src/arch/mod.rs
@@ -1,5 +1,2 @@
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub use self::x86::*;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod x86;
diff --git a/bootloader/bootloader/src/main.rs b/bootloader/bootloader/src/main.rs
index b9c7529..cd9fd7e 100644
--- a/bootloader/bootloader/src/main.rs
+++ b/bootloader/bootloader/src/main.rs
@@ -579,13 +579,6 @@ fn main<D: Disk, V: Iterator<Item = OsVideoMode>>(os: &dyn Os<D, V>) -> (usize,
 			writeln!(w, "REDOXFS_PASSWORD_SIZE={:016x}", password.len()).unwrap();
 		}
 
-		#[cfg(target_arch = "riscv64")]
-		{
-			let boot_hartid = os::efi_get_boot_hartid()
-				.expect("Could not retrieve boot hart id from EFI implementation!");
-			writeln!(w, "BOOT_HART_ID={:016x}", boot_hartid).unwrap();
-		}
-
 		for output_i in 0..os.video_outputs() {
 			if let Some(mut mode) = mode_opts[output_i] {
 				// Set mode to get updated values
diff --git a/bootloader/bootloader/src/os/mod.rs b/bootloader/bootloader/src/os/mod.rs
index e70e2f6..c0ad978 100644
--- a/bootloader/bootloader/src/os/mod.rs
+++ b/bootloader/bootloader/src/os/mod.rs
@@ -1,9 +1,6 @@
 use redoxfs::Disk;
 
-#[cfg(all(target_arch = "x86", target_os = "none"))]
 pub use self::bios::*;
-
-#[cfg(all(target_arch = "x86", target_os = "none"))]
 #[macro_use]
 mod bios;
 
diff --git a/bootloader/bootloader/src/serial_16550.rs b/bootloader/bootloader/src/serial_16550.rs
index ea8bdc8..0143a7f 100644
--- a/bootloader/bootloader/src/serial_16550.rs
+++ b/bootloader/bootloader/src/serial_16550.rs
@@ -2,7 +2,6 @@ use bitflags::bitflags;
 use core::convert::TryInto;
 use core::fmt;
 use core::ptr::{addr_of, addr_of_mut};
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use syscall::io::Pio;
 use syscall::io::{Io, Mmio, ReadOnly};
 
@@ -46,7 +45,6 @@ pub struct SerialPort<T: Io> {
 	modem_sts: ReadOnly<T>,
 }
 
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 impl SerialPort<Pio<u8>> {
 	pub const fn new(base: u16) -> SerialPort<Pio<u8>> {
 		SerialPort {