diff --git a/apps/system/components/StorageManager/kata-storage-component/src/run.rs b/apps/system/components/StorageManager/kata-storage-component/src/run.rs
index 357196d..89e27bc 100644
--- a/apps/system/components/StorageManager/kata-storage-component/src/run.rs
+++ b/apps/system/components/StorageManager/kata-storage-component/src/run.rs
@@ -2,6 +2,7 @@
 
 // Code here binds the camkes component to the rust code.
 #![no_std]
+#![allow(clippy::missing_safety_doc)]
 
 extern crate alloc;
 use core::slice;
@@ -15,7 +16,7 @@ use kata_storage_manager::KATA_STORAGE;
 use log::trace;
 
 #[no_mangle]
-pub extern "C" fn pre_init() {
+pub unsafe extern "C" fn pre_init() {
     static KATA_LOGGER: KataLogger = KataLogger;
     log::set_logger(&KATA_LOGGER).unwrap();
     // NB: set to max; the LoggerInterface will filter
@@ -23,56 +24,50 @@ pub extern "C" fn pre_init() {
 
     // TODO(sleffler): temp until we integrate with seL4
     static mut HEAP_MEMORY: [u8; 8 * 1024] = [0; 8 * 1024];
-    unsafe {
-        allocator::ALLOCATOR.init(HEAP_MEMORY.as_mut_ptr() as usize, HEAP_MEMORY.len());
-        trace!(
-            "setup heap: start_addr {:p} size {}",
-            HEAP_MEMORY.as_ptr(),
-            HEAP_MEMORY.len()
-        );
-    }
+    allocator::ALLOCATOR.init(HEAP_MEMORY.as_mut_ptr() as usize, HEAP_MEMORY.len());
+    trace!(
+        "setup heap: start_addr {:p} size {}",
+        HEAP_MEMORY.as_ptr(),
+        HEAP_MEMORY.len()
+    );
 }
 
 // StorageInterface glue stubs.
 #[no_mangle]
-pub extern "C" fn storage_read(
+pub unsafe extern "C" fn storage_read(
     c_key: *const cstr_core::c_char,
     c_raw_value: *mut KeyValueData,
 ) -> StorageManagerError {
-    unsafe {
-        match CStr::from_ptr(c_key).to_str() {
-            Ok(key) => {
-                // TODO(sleffler): de-badge reply cap to get bundle_id
-                match KATA_STORAGE.read("fubar", key) {
-                    Ok(value) => {
-                        // NB: no serialization, returns raw data
-                        (*c_raw_value).copy_from_slice(&value);
-                        StorageManagerError::SmeSuccess
-                    }
-                    Err(e) => StorageManagerError::from(e),
+    match CStr::from_ptr(c_key).to_str() {
+        Ok(key) => {
+            // TODO(sleffler): de-badge reply cap to get bundle_id
+            match KATA_STORAGE.read("fubar", key) {
+                Ok(value) => {
+                    // NB: no serialization, returns raw data
+                    (*c_raw_value).copy_from_slice(&value);
+                    StorageManagerError::SmeSuccess
                 }
+                Err(e) => StorageManagerError::from(e),
             }
-            Err(_) => StorageManagerError::SmeKeyInvalid,
         }
+        Err(_) => StorageManagerError::SmeKeyInvalid,
     }
 }
 
 #[no_mangle]
-pub extern "C" fn storage_write(
+pub unsafe extern "C" fn storage_write(
     c_key: *const cstr_core::c_char,
     c_raw_value_len: usize,
     c_raw_value: *const u8,
 ) -> StorageManagerError {
-    match unsafe { CStr::from_ptr(c_key).to_str() } {
+    match CStr::from_ptr(c_key).to_str() {
         Ok(key) => {
             // TODO(sleffler): de-badge reply cap to get bundle_id
-            unsafe {
-                KATA_STORAGE.write(
-                    "fubar",
-                    key,
-                    slice::from_raw_parts(c_raw_value, c_raw_value_len),
-                )
-            }
+            KATA_STORAGE.write(
+                "fubar",
+                key,
+                slice::from_raw_parts(c_raw_value, c_raw_value_len),
+            )
             .into()
         }
         Err(_) => StorageManagerError::SmeKeyInvalid,
@@ -80,11 +75,13 @@ pub extern "C" fn storage_write(
 }
 
 #[no_mangle]
-pub extern "C" fn storage_delete(c_key: *const cstr_core::c_char) -> StorageManagerError {
-    match unsafe { CStr::from_ptr(c_key).to_str() } {
+pub unsafe extern "C" fn storage_delete(
+    c_key: *const cstr_core::c_char
+) -> StorageManagerError {
+    match CStr::from_ptr(c_key).to_str() {
         Ok(key) => {
             // TODO(sleffler): de-badge reply cap to get bundle_id
-            unsafe { KATA_STORAGE.delete("fubar", key) }.into()
+            KATA_STORAGE.delete("fubar", key).into()
         }
         Err(_) => StorageManagerError::SmeKeyInvalid,
     }
diff --git a/apps/system/components/StorageManager/kata-storage-interface/src/lib.rs b/apps/system/components/StorageManager/kata-storage-interface/src/lib.rs
index a5d1c8a..66d1444 100644
--- a/apps/system/components/StorageManager/kata-storage-interface/src/lib.rs
+++ b/apps/system/components/StorageManager/kata-storage-interface/src/lib.rs
@@ -4,7 +4,6 @@
 
 use core::str;
 use cstr_core::CString;
-use postcard;
 
 // TODO(sleffler): temp constraint on value part of key-value pairs
 pub const KEY_VALUE_DATA_SIZE: usize = 100;
@@ -77,8 +76,8 @@ impl From<StorageError> for StorageManagerError {
 impl From<Result<(), StorageError>> for StorageManagerError {
     fn from(result: Result<(), StorageError>) -> StorageManagerError {
         result.map_or_else(
-            |e| StorageManagerError::from(e),
-            |_v| StorageManagerError::SmeSuccess,
+            StorageManagerError::from,
+            |_| StorageManagerError::SmeSuccess,
         )
     }
 }