diff --git a/bsp_hosted/acsDummies/GpsDummy.cpp b/bsp_hosted/acsDummies/GpsDummy.cpp
deleted file mode 100644
index b4331798..00000000
--- a/bsp_hosted/acsDummies/GpsDummy.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GpsDummy.h"
-
-GpsDummy::GpsDummy() {
-}
-
-GpsDummy::~GpsDummy() {
-}
diff --git a/bsp_hosted/acsDummies/GpsDummy.h b/bsp_hosted/acsDummies/GpsDummy.h
deleted file mode 100644
index f25bf1f2..00000000
--- a/bsp_hosted/acsDummies/GpsDummy.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef BSP_HOSTED_ACSDUMMIES_GPSDUMMY_H_
-#define BSP_HOSTED_ACSDUMMIES_GPSDUMMY_H_
-
-/**
- * @brief   Dummy class to simulate sending of GPS data to ACS controller.
- */
-class GpsDummy : public ExtendedControllerBase {
- public:
-  GpsDummy();
-  virtual ~GpsDummy();
-};
-
-#endif /* BSP_HOSTED_ACSDUMMIES_GPSDUMMY_H_ */
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
deleted file mode 100644
index 28f7032b..00000000
--- a/mission/controller/AcsController.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "AcsController.h"
-
-AcsController::AcsController() {
-}
-
-AcsController::~AcsController() {
-}
-
-ReturnValue_t AcsController::initialize() {
-
-    ControllerBase::initialize();
-}
-
-ReturnValue_t AcsController::handleCommandMessage(CommandMessage * message) {
-    ReturnValue_t result = actionHelper.handleActionMessage(message);
-    if (result == HasReturnvaluesIF::RETURN_OK) {
-        return HasReturnvaluesIF::RETURN_OK;
-    }
-    return result;
-}
-
-void AcsController::performControlOperation() {
-    if (mode != MODE_OFF) {
-        monitoring.monitor(&acsParameters);
-        switch (submode) {
-        case SUBMODE_SAFE:
-            performSafe(SAFE_CONTROLLER);
-            break;
-        case SUBMODE_IDLE:
-            performPointing(IDLE_CONTROLLER);
-            break;
-        case SUBMODE_NADIR:
-            performPointing(NADIR_CONTROLLER);
-            break;
-        case SUBMODE_TARGET:
-            performPointing(TARGET_CONTROLLER);
-            break;
-        case SUBMODE_INERTIAL:
-            performPointing(INERTIAL_CONTROLLER);
-            break;
-        case SUBMODE_ROTATION:
-            performPointing(ROTATION_CONTROLLER);
-            break;
-        default:
-            break;
-        }
-    }
-}
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
deleted file mode 100644
index 20f19c15..00000000
--- a/mission/controller/AcsController.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef MISSION_CONTROLLER_ACSCONTROLLER_H_
-#define MISSION_CONTROLLER_ACSCONTROLLER_H_
-
-#include "fsfw/controller/ControllerBase.h"
-
-class AcsController : public ControllerBase {
- public:
-  AcsController();
-  virtual ~AcsController();
-
-  ReturnValue_t initialize() override;
-
- protected:
-  ReturnValue_t handleCommandMessage(CommandMessage *message);
-  void performControlOperation();
-};
-
-#endif /* MISSION_CONTROLLER_ACSCONTROLLER_H_ */
diff --git a/tmtc b/tmtc
index 592f3754..f8d6fc4c 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 592f37544f252466f702502ffb0140840ab75d8c
+Subproject commit f8d6fc4c2b2276c58247d626df3a461131027d2b