diff --git a/mission/controller/acs/MultiplicativeKalmanFilter.cpp b/mission/controller/acs/MultiplicativeKalmanFilter.cpp
index 5a546409..b2c8a963 100644
--- a/mission/controller/acs/MultiplicativeKalmanFilter.cpp
+++ b/mission/controller/acs/MultiplicativeKalmanFilter.cpp
@@ -10,7 +10,6 @@
 #include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
 #include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h>
 #include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
-#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
 #include "MultiplicativeKalmanFilter.h"
 #include <acs/util/CholeskyDecomposition.h>
 #include <acs/util/MathOperations.h>
@@ -300,7 +299,7 @@ ReturnValue_t MultiplicativeKalmanFilter::mekfEst(
 		else{
 			sensorsAvail = 8; //no measurements
 			validMekf = false;
-			return RETURN_FAILED;
+			return returnvalue::FAILED;
 		}
 
 	// If we are here, MEKF will perform
@@ -1201,5 +1200,5 @@ ReturnValue_t MultiplicativeKalmanFilter::mekfEst(
 
 	// Check for new data in measurement -> SensorProcessing ?
 
-	return RETURN_OK;
+	return returnvalue::OK;
 }
diff --git a/mission/controller/acs/MultiplicativeKalmanFilter.h b/mission/controller/acs/MultiplicativeKalmanFilter.h
index d4370ad3..f972ab5a 100644
--- a/mission/controller/acs/MultiplicativeKalmanFilter.h
+++ b/mission/controller/acs/MultiplicativeKalmanFilter.h
@@ -21,7 +21,7 @@
 
 #include "AcsParameters.h"
 
-class MultiplicativeKalmanFilter : public HasReturnvaluesIF {
+class MultiplicativeKalmanFilter{
 public:
 	/* @brief: Constructor
 	 * @param: acsParameters_   Pointer to object which defines the ACS configuration parameters
diff --git a/mission/controller/acs/control/PtgCtrl.h b/mission/controller/acs/control/PtgCtrl.h
index 5bd7f0da..fe5d0e96 100644
--- a/mission/controller/acs/control/PtgCtrl.h
+++ b/mission/controller/acs/control/PtgCtrl.h
@@ -19,11 +19,10 @@
 #include <acs/SensorValues.h>
 #include <acs/OutputValues.h>
 #include <acs/AcsParameters.h>
-#include "acs/config/classIds.h"
-#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <acs/config/classIds.h>
 #include <time.h>
 
-class PtgCtrl : public HasReturnvaluesIF {
+class PtgCtrl{
 
 public:
 	/* @brief: Constructor
diff --git a/mission/controller/acs/control/SafeCtrl.h b/mission/controller/acs/control/SafeCtrl.h
index b0ce6a90..36807bcc 100644
--- a/mission/controller/acs/control/SafeCtrl.h
+++ b/mission/controller/acs/control/SafeCtrl.h
@@ -17,7 +17,7 @@
 #include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <time.h>
 
-class SafeCtrl : public HasReturnvaluesIF {
+class SafeCtrl{
 
 public: