diff --git a/ableos/src/lib.rs b/ableos/src/lib.rs
index 2c200a44..2b78b4b8 100644
--- a/ableos/src/lib.rs
+++ b/ableos/src/lib.rs
@@ -98,7 +98,6 @@ pub use driver_traits::*;
 pub use experiments::*;
 pub use graphics::*;
 pub use kernel;
-pub use kernel::messaging;
 // pub use kernel::panic;
 pub use kernel_state::*;
 pub use keyboard::*;
diff --git a/ableos/src/tests/mod.rs b/ableos/src/tests/mod.rs
index 4429d367..ca8643a5 100644
--- a/ableos/src/tests/mod.rs
+++ b/ableos/src/tests/mod.rs
@@ -66,5 +66,3 @@ pub fn test_kernel_main(boot_info: &'static BootInfo) -> ! {
     loop {}
 }
 use bootloader::{entry_point, BootInfo};
-
-use crate::test_main;
diff --git a/kernel/src/task.rs b/kernel/src/task.rs
index 5bf4eb1e..da1020ea 100644
--- a/kernel/src/task.rs
+++ b/kernel/src/task.rs
@@ -87,9 +87,8 @@ impl Executor {
             .map(|t| TaskId(self.tasks.insert(t)))
             .or_else(|| self.queue.pop())
         {
-            let task = match self.tasks.get_mut(id.0) {
-                Some(t) => t,
-                None => panic!("attempted to get non-extant task with id {}", id.0),
+            let Some(task) = self.tasks.get_mut(id.0) else {
+                panic!("attempted to get non-extant task with id {}", id.0)
             };
 
             let mut cx = Context::from_waker(