diff --git a/fsw/src/lc_app.c b/fsw/src/lc_app.c
index 39360ac..14d7e54 100644
--- a/fsw/src/lc_app.c
+++ b/fsw/src/lc_app.c
@@ -186,8 +186,8 @@ int32 LC_AppInit(void)
     /*
     ** Zero out the global data structures...
     */
-    CFE_PSP_MemSet(&LC_OperData, 0, sizeof(LC_OperData_t));
-    CFE_PSP_MemSet(&LC_AppData, 0, sizeof(LC_AppData_t));
+    memset(&LC_OperData, 0, sizeof(LC_OperData));
+    memset(&LC_AppData, 0, sizeof(LC_AppData));
 
     /*
     ** Initialize event services
diff --git a/fsw/src/lc_watch.c b/fsw/src/lc_watch.c
index ec7622c..eb10bc1 100644
--- a/fsw/src/lc_watch.c
+++ b/fsw/src/lc_watch.c
@@ -92,9 +92,9 @@ void LC_CreateHashTable(void)
     }
 
     /* Initialize hash table structures */
-    CFE_PSP_MemSet(LC_OperData.HashTable, 0, (LC_HASH_TABLE_ENTRIES * sizeof(LC_MessageList_t *)));
-    CFE_PSP_MemSet(LC_OperData.MessageLinks, 0, (LC_MAX_WATCHPOINTS * sizeof(LC_MessageList_t)));
-    CFE_PSP_MemSet(LC_OperData.WatchPtLinks, 0, (LC_MAX_WATCHPOINTS * sizeof(LC_WatchPtList_t)));
+    memset(LC_OperData.HashTable, 0, sizeof(LC_OperData.HashTable));
+    memset(LC_OperData.MessageLinks, 0, sizeof(LC_OperData.MessageLinks));
+    memset(LC_OperData.WatchPtLinks, 0, sizeof(LC_OperData.WatchPtLinks));
 
     LC_OperData.MessageIDsCount = 0;
     LC_OperData.WatchpointCount = 0;
diff --git a/unit-test/lc_app_tests.c b/unit-test/lc_app_tests.c
index 8558b5c..5282eae 100644
--- a/unit-test/lc_app_tests.c
+++ b/unit-test/lc_app_tests.c
@@ -251,8 +251,8 @@ void LC_AppInit_Test_Nominal(void)
     int32 Result;
     char  Message[125];
 
-    CFE_PSP_MemSet(&LC_OperData, 1, sizeof(LC_OperData_t));
-    CFE_PSP_MemSet(&LC_AppData, 1, sizeof(LC_AppData_t));
+    memset(&LC_OperData, 1, sizeof(LC_OperData));
+    memset(&LC_AppData, 1, sizeof(LC_AppData));
 
     /* Set to prevent errors when initializing tables */
     UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_Load), CFE_SUCCESS);
diff --git a/unit-test/utilities/lc_test_utils.c b/unit-test/utilities/lc_test_utils.c
index 6db1e0d..423c266 100644
--- a/unit-test/utilities/lc_test_utils.c
+++ b/unit-test/utilities/lc_test_utils.c
@@ -80,18 +80,18 @@ void LC_Test_Setup(void)
     /* initialize test environment to default state for every test */
     UT_ResetState(0);
 
-    memset(&LC_AppData, 0, sizeof(LC_AppData_t));
-    memset(&LC_OperData, 0, sizeof(LC_OperData_t));
+    memset(&LC_AppData, 0, sizeof(LC_AppData));
+    memset(&LC_OperData, 0, sizeof(LC_OperData));
 
     LC_OperData.WDTPtr = WDTable;
     LC_OperData.ADTPtr = ADTable;
     LC_OperData.WRTPtr = WRTable;
     LC_OperData.ARTPtr = ARTable;
 
-    memset(LC_OperData.WDTPtr, 0, sizeof(LC_WDTEntry_t) * LC_MAX_WATCHPOINTS);
-    memset(LC_OperData.ADTPtr, 0, sizeof(LC_ADTEntry_t) * LC_MAX_ACTIONPOINTS);
-    memset(LC_OperData.WRTPtr, 0, sizeof(LC_WRTEntry_t) * LC_MAX_WATCHPOINTS);
-    memset(LC_OperData.ARTPtr, 0, sizeof(LC_ARTEntry_t) * LC_MAX_ACTIONPOINTS);
+    memset(&WDTable, 0, sizeof(WDTable));
+    memset(&ADTable, 0, sizeof(ADTable));
+    memset(&WRTable, 0, sizeof(WRTable));
+    memset(&ARTable, 0, sizeof(ARTable));
 
     memset(context_CFE_EVS_SendEvent, 0, sizeof(context_CFE_EVS_SendEvent));
     memset(&context_CFE_ES_WriteToSysLog, 0, sizeof(context_CFE_ES_WriteToSysLog));