diff --git a/header/fsw_misc.h b/header/fsw_misc.h
--- a/header/fsw_misc.h
+++ b/header/fsw_misc.h
@@ -101,7 +101,9 @@ extern rtems_id AVGV_id;// id of the AVG
 
 void timer_configure( unsigned char timer, unsigned int clock_divider,
                     unsigned char interrupt_level, rtems_isr (*timer_isr)() );
-void timer_start( unsigned char timer );
+#ifdef ENABLE_DEAD_CODE
+    void timer_start( unsigned char timer );
+#endif
 void timer_stop( unsigned char timer );
 void timer_set_clock_divider(unsigned char timer, unsigned int clock_divider);
 
diff --git a/header/tc_handler.h b/header/tc_handler.h
--- a/header/tc_handler.h
+++ b/header/tc_handler.h
@@ -95,7 +95,9 @@ void setCalibrationDivisor( unsigned int
 void setCalibrationData( void );
 void setCalibrationReload( bool state);
 void setCalibrationEnable( bool state );
-void setCalibrationInterleaved( bool state );
+#ifdef ENABLE_DEAD_CODE
+    void setCalibrationInterleaved( bool state );
+#endif
 void setCalibration( bool state );
 void configureCalibration( bool interleaved );
 //
diff --git a/header/tm_lfr_tc_exe.h b/header/tm_lfr_tc_exe.h
--- a/header/tm_lfr_tc_exe.h
+++ b/header/tm_lfr_tc_exe.h
@@ -14,7 +14,9 @@ int send_tm_lfr_tc_exe_success( ccsdsTel
 int send_tm_lfr_tc_exe_inconsistent( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                     unsigned char byte_position, unsigned char rcv_value );
 int send_tm_lfr_tc_exe_not_executable( ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
-int send_tm_lfr_tc_exe_not_implemented( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
+#ifdef ENABLE_DEAD_CODE
+    int send_tm_lfr_tc_exe_not_implemented( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
+#endif
 int send_tm_lfr_tc_exe_error(ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
 int send_tm_lfr_tc_exe_corrupted( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                  unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV, unsigned char destinationID );
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,7 +66,7 @@ option(FSW_Enable_Dead_Code "Enable dead
 set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
 set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
 set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-set(SW_VERSION_N4 "23" CACHE STRING  "Choose N4 FSW Version." FORCE)
+set(SW_VERSION_N4 "24" CACHE STRING  "Choose N4 FSW Version." FORCE)
 
 if(FSW_verbose)
     add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
diff --git a/src/tc_handler.c b/src/tc_handler.c
--- a/src/tc_handler.c
+++ b/src/tc_handler.c
@@ -187,7 +187,9 @@ int action_reset(ccsdsTelecommandPacket_
 #endif
     exit(0);
 
+#ifdef ENABLE_DEAD_CODE
     send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
+#endif
 
     return LFR_DEFAULT;
 }