diff --git a/apps/system/components/MailboxDriver/MailboxDriver.camkes b/apps/system/components/MailboxDriver/MailboxDriver.camkes
index 71e4d64..f8cdf5c 100644
--- a/apps/system/components/MailboxDriver/MailboxDriver.camkes
+++ b/apps/system/components/MailboxDriver/MailboxDriver.camkes
@@ -6,7 +6,6 @@
  */
 
 import <MailboxInterface.camkes>;
-import <MemoryInterface.camkes>;
 import <LoggerInterface.camkes>;
 
 component MailboxDriver {
@@ -26,8 +25,5 @@ component MailboxDriver {
   consumes Interrupt rtirq;
   consumes Interrupt eirq;
 
-  // Enable KataOS CAmkES support.
-  attribute int kataos = true;
-
   uses LoggerInterface logger;
 }
diff --git a/apps/system/components/MailboxDriver/mailbox-driver/Cargo.toml b/apps/system/components/MailboxDriver/mailbox-driver/Cargo.toml
index 68a1b17..2ffd596 100644
--- a/apps/system/components/MailboxDriver/mailbox-driver/Cargo.toml
+++ b/apps/system/components/MailboxDriver/mailbox-driver/Cargo.toml
@@ -10,7 +10,6 @@ default = []
 kata-os-common = { path = "../../kata-os-common" }
 log = "0.4"
 cty = "0.2.1"
-kata-memory-interface = { path = "../../MemoryManager/kata-memory-interface" }
 
 [lib]
 name = "mailbox_driver"
diff --git a/apps/system/components/MailboxDriver/mailbox-driver/src/lib.rs b/apps/system/components/MailboxDriver/mailbox-driver/src/lib.rs
index 34ae261..6e3fd0f 100644
--- a/apps/system/components/MailboxDriver/mailbox-driver/src/lib.rs
+++ b/apps/system/components/MailboxDriver/mailbox-driver/src/lib.rs
@@ -4,7 +4,6 @@
 #![allow(non_snake_case)]
 
 use kata_os_common::logger::KataLogger;
-use kata_os_common::sel4_sys::seL4_CPtr;
 use log::{error, trace};
 
 //------------------------------------------------------------------------------
@@ -78,10 +77,6 @@ extern "C" {
     fn wtirq_acknowledge() -> u32;
     fn rtirq_acknowledge() -> u32;
     fn eirq_acknowledge() -> u32;
-
-    // Enable KataOS CAmkES support.
-    static SELF_CNODE: seL4_CPtr;
-    static SELF_VSPACE_ROOT: seL4_CPtr;
 }
 
 //------------------------------------------------------------------------------