diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt
index 954e092..56e9342 100644
--- a/unit-test/CMakeLists.txt
+++ b/unit-test/CMakeLists.txt
@@ -30,14 +30,14 @@ target_include_directories(coverage-mm_internal-stubs PUBLIC ../fsw/src)
 # Accomplish this by cycling through all the app's source files, there must be
 # a *_tests file for each
 foreach(SRCFILE ${APP_SRC_FILES})
-    
-    # Get the base sourcefile name as a module name without path or the  
+
+    # Get the base sourcefile name as a module name without path or the
     # extension, this will be used as the base name of the unit test file.
     get_filename_component(UNIT_NAME "${SRCFILE}" NAME_WE)
 
     # Use the module name to make the test name by adding _tests to the end
     set(TESTS_NAME "${UNIT_NAME}_tests")
-    
+
     # Make the test sourcefile name with unit test path and extension
     set(TESTS_SOURCE_FILE "${PROJECT_SOURCE_DIR}/unit-test/${TESTS_NAME}.c")
 
@@ -46,5 +46,5 @@ foreach(SRCFILE ${APP_SRC_FILES})
 
     # Add dependency to utilities and internal stubs
     add_cfe_coverage_dependency(mm "${UNIT_NAME}" mm_internal)
-    
+
 endforeach()
diff --git a/unit-test/utilities/mm_test_utils.c b/unit-test/utilities/mm_test_utils.c
index 009f798..dcfa772 100644
--- a/unit-test/utilities/mm_test_utils.c
+++ b/unit-test/utilities/mm_test_utils.c
@@ -94,77 +94,3 @@ void MM_Test_TearDown(void)
 {
     /* cleanup test environment */
 }
-
-/*
- * Placeholder stubs until PSP UT implementation is available
- */
-
-int32 CFE_PSP_EepromWriteEnable(uint32 Bank)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_EepromWriteEnable);
-    return status;
-}
-
-int32 CFE_PSP_EepromWriteDisable(uint32 Bank)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_EepromWriteDisable);
-    return status;
-}
-
-int32 CFE_PSP_EepromWrite32(cpuaddr MemoryAddress, uint32 uint32Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_EepromWrite32);
-    return status;
-}
-
-int32 CFE_PSP_EepromWrite16(cpuaddr MemoryAddress, uint16 uint16Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_EepromWrite16);
-    return status;
-}
-
-int32 CFE_PSP_EepromWrite8(cpuaddr MemoryAddress, uint8 ByteValue)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_EepromWrite8);
-    return status;
-}
-
-int32 CFE_PSP_MemWrite8(cpuaddr MemoryAddress, uint8 ByteValue)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_MemWrite8);
-    return status;
-}
-
-int32 CFE_PSP_MemRead16(cpuaddr MemoryAddress, uint16 *uint16Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_MemRead16);
-    return status;
-}
-
-int32 CFE_PSP_MemWrite16(cpuaddr MemoryAddress, uint16 uint16Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_MemWrite16);
-    return status;
-}
-
-int32 CFE_PSP_MemRead32(cpuaddr MemoryAddress, uint32 *uint32Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_MemRead32);
-    return status;
-}
-
-int32 CFE_PSP_MemWrite32(cpuaddr MemoryAddress, uint32 uint32Value)
-{
-    int32 status;
-    status = UT_DEFAULT_IMPL(CFE_PSP_MemWrite32);
-    return status;
-}