diff --git a/events/fwSubsystemIdRanges.h b/events/fwSubsystemIdRanges.h
index 5e086f0e4..1b0b238e2 100644
--- a/events/fwSubsystemIdRanges.h
+++ b/events/fwSubsystemIdRanges.h
@@ -19,6 +19,7 @@ enum {
 	SYSTEM_MANAGER_1 = 75,
 	SYSTEM_1 = 79,
 	PUS_SERVICE_1 = 80,
+	PUS_SERVICE_9 = 89,
 	PUS_SERVICE_17 = 97,
 	FW_SUBSYSTEM_ID_RANGE
 };
diff --git a/returnvalues/FwClassIds.h b/returnvalues/FwClassIds.h
index e547025ba..53add6a0a 100644
--- a/returnvalues/FwClassIds.h
+++ b/returnvalues/FwClassIds.h
@@ -56,7 +56,6 @@ enum {
 	DEVICE_COMMUNICATION_IF, //DC
 	BSP, //BSP
 	TIME_STAMPER_IF, //TSI 53
-	//TODO This will shift all IDs for FLP
 	SGP4PROPAGATOR_CLASS, //SGP4 54
 	MUTEX_IF, //MUX 55
 	MESSAGE_QUEUE_IF,//MQI 56