diff --git a/bsp_linux/InitMission.cpp b/bsp_linux/InitMission.cpp
index cf84ab0d..d076c680 100644
--- a/bsp_linux/InitMission.cpp
+++ b/bsp_linux/InitMission.cpp
@@ -4,7 +4,6 @@
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
-#include <fsfw/datapool/DataPool.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 #include <fsfw/tasks/PeriodicTaskIF.h>
@@ -29,9 +28,6 @@ ServiceInterfaceStream sif::error("ERROR", true, false, true);
 
 ObjectManagerIF *objectManager = nullptr;
 
-//Initialize Data Pool
-DataPool dataPool(nullptr);
-
 void InitMission::initMission() {
 	sif::info << "Building global objects.." << std::endl;
 	/* Instantiate global object manager and also create all objects */
diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h
index 5df83705..fdfa889a 100644
--- a/fsfwconfig/FSFWConfig.h
+++ b/fsfwconfig/FSFWConfig.h
@@ -2,6 +2,7 @@
 #define FSFWCONFIG_FSFWCONFIG_H_
 
 #include <cstddef>
+#include <cstdint>
 
 //! Used to determine whether C++ ostreams are used
 //! Those can lead to code bloat.
@@ -14,12 +15,6 @@
 //! Can be used to enable debugging printouts for developing the FSFW
 #define FSFW_DEBUGGING              0
 
-//! Defines the FIFO depth of each commanding service base which
-//! also determines how many commands a CSB service can handle in one cycle
-//! simulataneously. This will increase the required RAM for
-//! each CSB service !
-#define FSFW_CSB_FIFO_DEPTH			6
-
 //! If FSFW_OBJ_EVENT_TRANSLATION is set to one,
 //! additional output which requires the translation files translateObjects
 //! and translateEvents (and their compiled source files)
@@ -48,6 +43,12 @@ static constexpr uint8_t FSFW_MISSION_TIMESTAMP_SIZE = 8;
 static constexpr size_t FSFW_EVENTMGMR_MATCHTREE_NODES = 240;
 static constexpr size_t FSFW_EVENTMGMT_EVENTIDMATCHERS = 120;
 static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS   = 120;
+
+//! Defines the FIFO depth of each commanding service base which
+//! also determines how many commands a CSB service can handle in one cycle
+//! simulataneously. This will increase the required RAM for
+//! each CSB service !
+static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 }
 
 #endif /* FSFWCONFIG_FSFWCONFIG_H_ */
diff --git a/fsfwconfig/cdatapool/dataPoolInit.cpp b/fsfwconfig/cdatapool/dataPoolInit.cpp
deleted file mode 100644
index fd536af5..00000000
--- a/fsfwconfig/cdatapool/dataPoolInit.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <fsfwconfig/cdatapool/dataPoolInit.h>
-
-void datapool::dataPoolInit(std::map<uint32_t, PoolEntryIF*>* poolMap) {
-
-}
diff --git a/fsfwconfig/cdatapool/dataPoolInit.h b/fsfwconfig/cdatapool/dataPoolInit.h
deleted file mode 100644
index f97fe7a3..00000000
--- a/fsfwconfig/cdatapool/dataPoolInit.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_
-#define FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_
-
-#include <fsfw/datapool/DataPool.h>
-
-namespace datapool{
-	void dataPoolInit(std::map<uint32_t, PoolEntryIF*>* poolMap);
-
-	enum datapoolvariables {
-		NO_PARAMETER = 0,
-	};
-}
-#endif /* FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ */
diff --git a/fsfwconfig/objects/systemObjectList.h b/fsfwconfig/objects/systemObjectList.h
index 3b5717fb..05ed2c52 100644
--- a/fsfwconfig/objects/systemObjectList.h
+++ b/fsfwconfig/objects/systemObjectList.h
@@ -19,7 +19,6 @@ namespace objects {
 		PUS_SERVICE_23 = 0x51002300,
 		PUS_SERVICE_201 = 0x51020100,
 
-		TIME_STAMPER = 0x52000001,
 		TM_FUNNEL = 0x52000002,
 
 		/* Test Task */
diff --git a/tmtc b/tmtc
index e0c896e6..9be8713f 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f
+Subproject commit 9be8713fa0cc6128e9469da2e635365b03146de3