diff --git a/src/fsfw/cfdp/CfdpHandler.cpp b/src/fsfw/cfdp/CfdpHandler.cpp
deleted file mode 100644
index 1bf03e10..00000000
--- a/src/fsfw/cfdp/CfdpHandler.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//#include "fsfw/cfdp/CfdpHandler.h"
-//
-//#include "fsfw/cfdp/CfdpMessage.h"
-//#include "fsfw/ipc/CommandMessage.h"
-//#include "fsfw/ipc/QueueFactory.h"
-//#include "fsfw/objectmanager/ObjectManager.h"
-//#include "fsfw/storagemanager/storeAddress.h"
-//#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
-//
-// CfdpHandler::CfdpHandler(object_id_t setObjectId, CfdpHandler* dist)
-//    : SystemObject(setObjectId) {
-//  requestQueue = QueueFactory::instance()->createMessageQueue(CFDP_HANDLER_MAX_RECEPTION);
-//  distributor = dist;
-//}
-//
-// CfdpHandler::~CfdpHandler() = default;
-//
-// ReturnValue_t CfdpHandler::initialize() {
-//  ReturnValue_t result = SystemObject::initialize();
-//  if (result != RETURN_OK) {
-//    return result;
-//  }
-//  this->distributor->registerHandler(this);
-//  return HasReturnvaluesIF::RETURN_OK;
-//}
-//
-// ReturnValue_t CfdpHandler::handleRequest(store_address_t storeId) {
-//#if FSFW_VERBOSE_LEVEL >= 1
-//#if FSFW_CPP_OSTREAM_ENABLED == 1
-//  sif::debug << "CFDPHandler::handleRequest" << std::endl;
-//#else
-//  sif::printDebug("CFDPHandler::handleRequest\n");
-//#endif /* !FSFW_CPP_OSTREAM_ENABLED == 1 */
-//#endif
-//
-//  // TODO read out packet from store using storeId
-//
-//  return RETURN_OK;
-//}
-//
-// ReturnValue_t CfdpHandler::performOperation(uint8_t opCode) {
-//  ReturnValue_t status = RETURN_OK;
-//  CommandMessage currentMessage;
-//  for (status = this->requestQueue->receiveMessage(&currentMessage); status == RETURN_OK;
-//       status = this->requestQueue->receiveMessage(&currentMessage)) {
-//    store_address_t storeId = CfdpMessage::getStoreId(&currentMessage);
-//    this->handleRequest(storeId);
-//  }
-//  return RETURN_OK;
-//}
-//
-// uint32_t CfdpHandler::getIdentifier() const { return 0; }
-//
-// MessageQueueId_t CfdpHandler::getRequestQueue() const { return this->requestQueue->getId(); }
diff --git a/src/fsfw/cfdp/CfdpHandler.h b/src/fsfw/cfdp/CfdpHandler.h
deleted file mode 100644
index 8c2827ec..00000000
--- a/src/fsfw/cfdp/CfdpHandler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//#ifndef FSFW_CFDP_CFDPHANDLER_H_
-//#define FSFW_CFDP_CFDPHANDLER_H_
-//
-//#include "fsfw/ipc/MessageQueueIF.h"
-//#include "fsfw/objectmanager/SystemObject.h"
-//#include "fsfw/returnvalues/HasReturnvaluesIF.h"
-//#include "fsfw/storagemanager/storeAddress.h"
-//#include "fsfw/tasks/ExecutableObjectIF.h"
-//#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
-//
-// namespace Factory {
-// void setStaticFrameworkObjectIds();
-//}
-//
-// class CfdpHandler : public ExecutableObjectIF,
-//                    public AcceptsTelecommandsIF,
-//                    public SystemObject,
-//                    public HasReturnvaluesIF {
-//  friend void(Factory::setStaticFrameworkObjectIds)();
-//
-// public:
-//  CfdpHandler(object_id_t setObjectId, CfdpHandler* distributor);
-//  /**
-//   * The destructor is empty.
-//   */
-//  virtual ~CfdpHandler();
-//
-//  virtual ReturnValue_t handleRequest(store_address_t storeId);
-//
-//  virtual ReturnValue_t initialize() override;
-//  virtual uint32_t getIdentifier() const override;
-//  MessageQueueId_t getRequestQueue() const override;
-//  ReturnValue_t performOperation(uint8_t opCode) override;
-//
-// protected:
-//  /**
-//   * This is a complete instance of the telecommand reception queue
-//   * of the class. It is initialized on construction of the class.
-//   */
-//  MessageQueueIF* requestQueue = nullptr;
-//
-//  CfdpHandler* distributor = nullptr;
-//
-//  /**
-//   * The current CFDP packet to be processed.
-//   * It is deleted after handleRequest was executed.
-//   */
-//  CfdpPacketStored currentPacket;
-//
-//  static object_id_t packetSource;
-//
-//  static object_id_t packetDestination;
-//
-// private:
-//  /**
-//   * This constant sets the maximum number of packets accepted per call.
-//   * Remember that one packet must be completely handled in one
-//   * #handleRequest call.
-//   */
-//  static const uint8_t CFDP_HANDLER_MAX_RECEPTION = 100;
-//};
-//
-//#endif /* FSFW_CFDP_CFDPHANDLER_H_ */