diff --git a/fsw/src/lc_action.c b/fsw/src/lc_action.c
index 41db97a..4502925 100644
--- a/fsw/src/lc_action.c
+++ b/fsw/src/lc_action.c
@@ -78,9 +78,6 @@ void LC_SampleAPs(uint16 StartIndex, uint16 EndIndex)
             LC_SampleSingleAP(TableIndex);
         }
     }
-
-    return;
-
 } /* end LC_SampleAP */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -268,9 +265,6 @@ void LC_SampleSingleAP(uint16 APNumber)
         }
 
     } /* end CurrentAPState if */
-
-    return;
-
 } /* end LC_SampleSingleAP */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/fsw/src/lc_cmds.c b/fsw/src/lc_cmds.c
index 4bed495..8ad5057 100644
--- a/fsw/src/lc_cmds.c
+++ b/fsw/src/lc_cmds.c
@@ -198,9 +198,6 @@ void LC_SampleAPReq(const CFE_SB_Buffer_t *BufPtr)
             }
         }
     }
-
-    return;
-
 } /* end LC_SampleAPReq */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -509,9 +506,6 @@ void LC_NoopCmd(const CFE_SB_Buffer_t *BufPtr)
         CFE_EVS_SendEvent(LC_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command: Version %d.%d.%d.%d",
                           LC_MAJOR_VERSION, LC_MINOR_VERSION, LC_REVISION, LC_MISSION_REV);
     }
-
-    return;
-
 } /* end LC_NoopCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -532,9 +526,6 @@ void LC_ResetCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(LC_RESET_DBG_EID, CFE_EVS_EventType_DEBUG, "Reset counters command");
     }
-
-    return;
-
 } /* end LC_ResetCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -551,9 +542,6 @@ void LC_ResetCounters(void)
     LC_AppData.MonitoredMsgCount   = 0;
     LC_AppData.RTSExecCount        = 0;
     LC_AppData.PassiveRTSExecCount = 0;
-
-    return;
-
 } /* end LC_ResetCounters */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -593,9 +581,6 @@ void LC_SetLCStateCmd(const CFE_SB_Buffer_t *BufPtr)
                 break;
         }
     }
-
-    return;
-
 } /* end LC_SetLCStateCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -724,9 +709,6 @@ void LC_SetAPStateCmd(const CFE_SB_Buffer_t *BufPtr)
         } /* end ValidState if */
 
     } /* end LC_VerifyMsgLength if */
-
-    return;
-
 } /* end LC_SetAPStateCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -792,9 +774,6 @@ void LC_SetAPPermOffCmd(const CFE_SB_Buffer_t *BufPtr)
         } /* end CmdPtr -> APNumber else */
 
     } /* end LC_VerifyMsgLength if */
-
-    return;
-
 } /* end LC_SetAPPermOffCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -839,9 +818,6 @@ void LC_ResetAPStatsCmd(const CFE_SB_Buffer_t *BufPtr)
                               CmdPtr->APNumber);
         }
     }
-
-    return;
-
 } /* end LC_ResetAPStatsCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -872,9 +848,6 @@ void LC_ResetResultsAP(uint32 StartIndex, uint32 EndIndex, bool ResetStatsCmd)
         LC_OperData.ARTPtr[TableIndex].CumulativeRTSExecCount  = 0;
         LC_OperData.ARTPtr[TableIndex].CumulativeEventMsgsSent = 0;
     }
-
-    return;
-
 } /* end LC_ResetResultsAP */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -919,9 +892,6 @@ void LC_ResetWPStatsCmd(const CFE_SB_Buffer_t *BufPtr)
                               CmdPtr->WPNumber);
         }
     }
-
-    return;
-
 } /* end LC_ResetWPStatsCmd */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -956,9 +926,6 @@ void LC_ResetResultsWP(uint32 StartIndex, uint32 EndIndex, bool ResetStatsCmd)
         LC_OperData.WRTPtr[TableIndex].LastTrueToFalse.Timestamp.Seconds    = 0;
         LC_OperData.WRTPtr[TableIndex].LastTrueToFalse.Timestamp.Subseconds = 0;
     }
-
-    return;
-
 } /* end LC_ResetResultsWP */
 
 /************************/
diff --git a/fsw/src/lc_custom.c b/fsw/src/lc_custom.c
index 6a08905..f870a3f 100644
--- a/fsw/src/lc_custom.c
+++ b/fsw/src/lc_custom.c
@@ -52,9 +52,6 @@ void LC_ExecuteRTS(uint16 RTSId)
     RTSRequest.RTSId = RTSId;
 
     CFE_SB_TransmitMsg(&RTSRequest.CmdHeader.Msg, true);
-
-    return;
-
 } /* end LC_ExecuteRTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/fsw/src/lc_watch.c b/fsw/src/lc_watch.c
index 3a8afaa..0f3a01b 100644
--- a/fsw/src/lc_watch.c
+++ b/fsw/src/lc_watch.c
@@ -131,9 +131,6 @@ void LC_CreateHashTable(void)
             LastMessageID = MessageID;
         }
     }
-
-    return;
-
 } /* End of LC_CreateHashTable() */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -323,9 +320,6 @@ void LC_CheckMsgForWPs(CFE_SB_MsgId_t MessageID, const CFE_SB_Buffer_t *BufPtr)
                               (unsigned long)CFE_SB_MsgIdToValue(MessageID));
         }
     }
-
-    return;
-
 } /* end LC_CheckMsgForWPs */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -430,9 +424,6 @@ void LC_ProcessWP(uint16 WatchIndex, const CFE_SB_Buffer_t *BufPtr, CFE_TIME_Sys
         }
 
     } /* end SizedDataValid if */
-
-    return;
-
 } /* end LC_ProcessWP */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */