diff --git a/common/config/commonClassIds.h b/common/config/commonClassIds.h
index 793cb1ba..5c8e263a 100644
--- a/common/config/commonClassIds.h
+++ b/common/config/commonClassIds.h
@@ -7,8 +7,6 @@
 namespace CLASS_ID {
 enum commonClassIds: uint8_t {
 	COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
-	MGM_LIS3MDL, //MGMLIS3
-	MGM_RM3100, //MGMRM3100
 	PCDU_HANDLER, //PCDU
 	HEATER_HANDLER, //HEATER
 	SYRLINKS_HANDLER, //SYRLINKS
diff --git a/common/config/commonSubsystemIds.h b/common/config/commonSubsystemIds.h
index 58ebac66..4cef8774 100644
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@@ -6,8 +6,6 @@
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
 	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	MGM_LIS3MDL = 106,
-	MGM_RM3100 = 107,
 	PCDU_HANDLER = 108,
 	HEATER_HANDLER = 109,
 	SA_DEPL_HANDLER = 110,
diff --git a/fsfw b/fsfw
index 2b6c9963..36607c87 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 2b6c996364be4aee65a1353bbe29d07604c4bdc8
+Subproject commit 36607c876422738aabe23fd5ab3e43ae58e41746