diff --git a/src/context/arch/aarch64.rs b/src/context/arch/aarch64.rs
index 29a230f..342e161 100644
--- a/src/context/arch/aarch64.rs
+++ b/src/context/arch/aarch64.rs
@@ -1,9 +1,11 @@
+use alloc::sync::Arc;
 use core::arch::asm;
 use core::mem;
 use core::sync::atomic::{AtomicBool, Ordering};
 use spin::Once;
 
 use crate::device::cpu::registers::{control_regs, tlb};
+use crate::paging::{RmmA, RmmArch, TableKind};
 use crate::syscall::FloatRegisters;
 
 /// This must be used by the kernel to ensure that context switches are done atomically
@@ -20,8 +22,6 @@ pub const KFX_ALIGN: usize = 16;
 pub struct Context {
     elr_el1: usize,
     sp_el0: usize,
-    ttbr0_el1: usize,   /* Pointer to U4 translation table for this Context     */
-    ttbr1_el1: usize,   /* Pointer to P4 translation table for this Context     */
     tpidr_el0: usize,   /* Pointer to TLS region for this Context               */
     tpidrro_el0: usize, /* Pointer to TLS (read-only) region for this Context   */
     spsr_el1: usize,
@@ -59,8 +59,6 @@ impl Context {
         Context {
             elr_el1: 0,
             sp_el0: 0,
-            ttbr0_el1: 0,
-            ttbr1_el1: 0,
             tpidr_el0: 0,
             tpidrro_el0: 0,
             spsr_el1: 0,
@@ -94,22 +92,6 @@ impl Context {
         }
     }
 
-    pub fn get_page_utable(&self) -> usize {
-        self.ttbr0_el1
-    }
-
-    pub fn get_page_ktable(&self) -> usize {
-        self.ttbr1_el1
-    }
-
-    pub fn set_page_utable(&mut self, address: usize) {
-        self.ttbr0_el1 = address;
-    }
-
-    pub fn set_page_ktable(&mut self, address: usize) {
-        self.ttbr1_el1 = address;
-    }
-
     pub fn set_stack(&mut self, address: usize) {
         self.sp = address;
     }
@@ -195,8 +177,6 @@ impl Context {
     pub fn dump(&self) {
         println!("elr_el1: 0x{:016x}", self.elr_el1);
         println!("sp_el0: 0x{:016x}", self.sp_el0);
-        println!("ttbr0_el1: 0x{:016x}", self.ttbr0_el1);
-        println!("ttbr1_el1: 0x{:016x}", self.ttbr1_el1);
         println!("tpidr_el0: 0x{:016x}", self.tpidr_el0);
         println!("tpidrro_el0: 0x{:016x}", self.tpidrro_el0);
         println!("spsr_el1: 0x{:016x}", self.spsr_el1);
@@ -295,10 +275,24 @@ pub unsafe fn switch_to(prev: &mut super::Context, next: &mut super::Context) {
         */
     }
 
-    prev.arch.ttbr0_el1 = control_regs::ttbr0_el1() as usize;
-    if next.arch.ttbr0_el1 != prev.arch.ttbr0_el1 {
-        control_regs::ttbr0_el1_write(next.arch.ttbr0_el1 as u64);
-        tlb::flush_all();
+    match next.addr_space {
+        // Since Arc is essentially just wraps a pointer, in this case a regular pointer (as
+        // opposed to dyn or slice fat pointers), and NonNull optimization exists, map_or will
+        // hopefully be optimized down to checking prev and next pointers, as next cannot be null.
+        Some(ref next_space) => if prev.addr_space.as_ref().map_or(true, |prev_space| !Arc::ptr_eq(&prev_space, &next_space)) {
+            // Suppose we have two sibling threads A and B. A runs on CPU 0 and B on CPU 1. A
+            // recently called yield and is now here about to switch back. Meanwhile, B is
+            // currently creating a new mapping in their shared address space, for example a
+            // message on a channel.
+            //
+            // Unless we acquire this lock, it may be possible that the TLB will not contain new
+            // entries. While this can be caught and corrected in a page fault handler, this is not
+            // true when entries are removed from a page table!
+            next_space.read().table.utable.make_current();
+        }
+        None => {
+            RmmA::set_table(TableKind::User, empty_cr3());
+        }
     }
 
     switch_to_inner(&mut prev.arch, &mut next.arch);
diff --git a/src/context/arch/x86.rs b/src/context/arch/x86.rs
index 6c874b3..62fb8d9 100644
--- a/src/context/arch/x86.rs
+++ b/src/context/arch/x86.rs
@@ -155,7 +155,7 @@ pub unsafe fn switch_to(prev: &mut super::Context, next: &mut super::Context) {
             next_space.read().table.utable.make_current();
         }
         None => {
-            RmmA::set_table(empty_cr3());
+            RmmA::set_table(TableKind::User, empty_cr3());
         }
     }
 
diff --git a/src/context/memory.rs b/src/context/memory.rs
index a5b6148..3ee6d31 100644
--- a/src/context/memory.rs
+++ b/src/context/memory.rs
@@ -898,26 +898,10 @@ impl Drop for Table {
     }
 }
 
-/// Allocates a new identically mapped ktable and empty utable
+/// Allocates a new empty utable
 #[cfg(target_arch = "aarch64")]
 pub fn setup_new_utable() -> Result<Table> {
-    let mut utable = unsafe { PageMapper::create(TableKind::User, crate::rmm::FRAME_ALLOCATOR).ok_or(Error::new(ENOMEM))? };
-
-    {
-        let active_ktable = KernelMapper::lock();
-
-        let mut copy_mapping = |p4_no| unsafe {
-            let entry = active_ktable.table().entry(p4_no)
-                .unwrap_or_else(|| panic!("expected kernel PML {} to be mapped", p4_no));
-
-            utable.table().set_entry(p4_no, entry)
-        };
-
-        // Copy higher half (kernel) mappings
-        for i in 256..512 {
-            copy_mapping(i);
-        }
-    }
+    let utable = unsafe { PageMapper::create(TableKind::User, crate::rmm::FRAME_ALLOCATOR).ok_or(Error::new(ENOMEM))? };
 
     Ok(Table {
         utable,