diff --git a/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h b/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
index 682cfa5c..31067268 100644
--- a/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
+++ b/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
@@ -70,18 +70,12 @@ class ProvidesDataPoolSubscriptionIF {
   virtual ReturnValue_t subscribeForDiagPeriodicPacket(
       subdp::DiagnosticsHkPeriodicParams params) = 0;
 
-  virtual ReturnValue_t
-  subscribeForPeriodicPacket(sid_t sid, bool enableReporting, float collectionInterval,
-                             bool isDiagnostics) {
-    return subscribeForPeriodicPacket(sid, enableReporting, collectionInterval, isDiagnostics,
-                                      objects::NO_OBJECT);
-  }
-
   [[deprecated(
       "Please use the new API which takes all arguments as one wrapper "
       "struct")]] virtual ReturnValue_t
   subscribeForPeriodicPacket(sid_t sid, bool enableReporting, float collectionInterval,
-                             bool isDiagnostics, object_id_t packetDestination) {
+                             bool isDiagnostics,
+                             object_id_t packetDestination = objects::NO_OBJECT) {
     if (isDiagnostics) {
       subdp::DiagnosticsHkPeriodicParams params(sid, enableReporting, collectionInterval);
       return subscribeForDiagPeriodicPacket(params);
@@ -104,16 +98,16 @@ class ProvidesDataPoolSubscriptionIF {
   virtual ReturnValue_t subscribeForRegularUpdatePacket(subdp::RegularHkUpdateParams params) = 0;
   virtual ReturnValue_t subscribeForDiagUpdatePacket(subdp::DiagnosticsHkUpdateParams params) = 0;
 
-  virtual ReturnValue_t
-  subscribeForUpdatePacket(sid_t sid, bool reportingEnabled, bool isDiagnostics) {
-    return subscribeForUpdatePacket(sid, reportingEnabled, isDiagnostics, objects::NO_OBJECT);
-  }
+//  virtual ReturnValue_t
+//  subscribeForUpdatePacket(sid_t sid, bool reportingEnabled, bool isDiagnostics) {
+//    return subscribeForUpdatePacket(sid, reportingEnabled, isDiagnostics, objects::NO_OBJECT);
+//  }
 
   [[deprecated(
       "Please use the new API which takes all arguments as one wrapper "
       "struct")]] virtual ReturnValue_t
   subscribeForUpdatePacket(sid_t sid, bool reportingEnabled, bool isDiagnostics,
-                           object_id_t packetDestination) {
+                           object_id_t packetDestination = objects::NO_OBJECT) {
     if (isDiagnostics) {
       subdp::DiagnosticsHkUpdateParams params(sid, reportingEnabled);
       return subscribeForDiagUpdatePacket(params);