diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,2 +1,2 @@
 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
-321ffad81ce675a1ad47d6fec71f04137fd44501 header/lfr_common_headers
+0adeb6c86feb96a126ce48641604949b87c70481 header/lfr_common_headers
diff --git a/header/fsw_misc.h b/header/fsw_misc.h
--- a/header/fsw_misc.h
+++ b/header/fsw_misc.h
@@ -10,30 +10,16 @@
 #include "fsw_spacewire.h"
 #include "lfr_cpu_usage_report.h"
 
-#define LFR_RESET_CAUSE_UNKNOWN_CAUSE 0
 #define WATCHDOG_LOOP_PRINTF    10
 #define WATCHDOG_LOOP_DEBUG     3
 
-#define DUMB_MESSAGE_NB 15
 #define NB_RTEMS_EVENTS 32
 #define EVENT_12        12
 #define EVENT_13        13
 #define EVENT_14        14
-#define DUMB_MESSAGE_0  "in DUMB *** default"
 #define DUMB_MESSAGE_1  "in DUMB *** timecode_irq_handler"
-#define DUMB_MESSAGE_2  "in DUMB *** f3 buffer changed"
-#define DUMB_MESSAGE_3  "in DUMB *** in SMIQ *** Error sending event to AVF0"
-#define DUMB_MESSAGE_4  "in DUMB *** spectral_matrices_isr *** Error sending event to SMIQ"
-#define DUMB_MESSAGE_5  "in DUMB *** waveforms_simulator_isr"
-#define DUMB_MESSAGE_6  "VHDL SM *** two buffers f0 ready"
-#define DUMB_MESSAGE_7  "ready for dump"
-#define DUMB_MESSAGE_8  "VHDL ERR *** spectral matrix"
-#define DUMB_MESSAGE_9  "tick"
-#define DUMB_MESSAGE_10 "VHDL ERR *** waveform picker"
-#define DUMB_MESSAGE_11 "VHDL ERR *** unexpected ready matrix values"
 #define DUMB_MESSAGE_12 "WATCHDOG timer"
 #define DUMB_MESSAGE_13 "TIMECODE timer"
-#define DUMB_MESSAGE_14 "TIMECODE ISR"
 
 enum lfr_reset_cause_t{
     UNKNOWN_CAUSE,
diff --git a/header/lfr_cpu_usage_report.h b/header/lfr_cpu_usage_report.h
--- a/header/lfr_cpu_usage_report.h
+++ b/header/lfr_cpu_usage_report.h
@@ -33,6 +33,5 @@ unsigned char lfr_rtems_cpu_usage_report
 #define CONST_100       100
 #define CONST_255       255
 #define CONST_1000      1000
-#define CONST_100000    100000
 
 #endif // LFR_CPU_USAGE_REPORT_H
diff --git a/header/processing/fsw_processing.h b/header/processing/fsw_processing.h
--- a/header/processing/fsw_processing.h
+++ b/header/processing/fsw_processing.h
@@ -15,15 +15,6 @@
 #define MAX_SRC_DATA                780     // MAX size is 26 bins * 30 Bytes [TM_LFR_SCIENCE_BURST_BP2_F1]
 #define MAX_SRC_DATA_WITH_SPARE     143     // 13 bins  * 11 Bytes
 
-#define NODE_0  0
-#define NODE_1  1
-#define NODE_2  2
-#define NODE_3  3
-#define NODE_4  4
-#define NODE_5  5
-#define NODE_6  6
-#define NODE_7  7
-
 typedef struct ring_node_asm
 {
     struct ring_node_asm *next;
diff --git a/header/tc_load_dump_parameters.h b/header/tc_load_dump_parameters.h
--- a/header/tc_load_dump_parameters.h
+++ b/header/tc_load_dump_parameters.h
@@ -19,16 +19,6 @@
 #define DELTAF_F0           96.
 #define DELTAF_F1           16.
 #define DELTAF_F2           1.
-#define DELTAF_DIV          2.
-
-#define BIT_RW1_F1  0x80
-#define BIT_RW1_F2  0x40
-#define BIT_RW2_F1  0x20
-#define BIT_RW2_F2  0x10
-#define BIT_RW3_F1  0x08
-#define BIT_RW3_F2  0x04
-#define BIT_RW4_F1  0x02
-#define BIT_RW4_F2  0x01
 
 #define WHEEL_1 1
 #define WHEEL_2 2
diff --git a/header/wf_handler.h b/header/wf_handler.h
--- a/header/wf_handler.h
+++ b/header/wf_handler.h
@@ -24,7 +24,6 @@
 #define FREQ_F0     24576.
 #define FREQ_F1     4096.
 #define FREQ_F2     256.
-#define FREQ_F3     16.
 
 #define DELTAT_F0   2731    // (2048. / 24576. / 2.) * 65536. = 2730.667;
 #define DELTAT_F1   16384   // (2048. / 4096.  / 2.) * 65536. = 16384;
diff --git a/testbenches/fsw_matrices_handling/functions.h b/testbenches/fsw_matrices_handling/functions.h
--- a/testbenches/fsw_matrices_handling/functions.h
+++ b/testbenches/fsw_matrices_handling/functions.h
@@ -3,7 +3,6 @@
 
 #define NB_BINS_COMPRESSED_SM_F0    11
 #define ASM_F0_INDICE_START         17      // 88 bins
-#define ASM_F0_INDICE_STOP          104     // 2 packets of 44 bins
 #define NB_BINS_TO_AVERAGE_ASM_F0   8
 
 void ASM_reorganize_and_divide( float *averaged_spec_mat, float *averaged_spec_mat_reorganized, float divider )