diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 3d48e52f..6adc07f8 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -108,14 +108,6 @@ void Factory::setStaticFrameworkObjectIds() {
   DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
 #endif /* OBSW_Q7S_EM == 1 */
 
-  //#if OBSW_TM_TO_PTME == 1
-  //  TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;
-  //#else
-  //  TmFunnel::downlinkDestination = objects::TMTC_BRIDGE;
-  //#endif /* OBSW_TM_TO_PTME == 1 */
-  //  // No storage object for now.
-  //  TmFunnel::storageDestination = objects::NO_OBJECT;
-
   LocalDataPoolManager::defaultHkDestination = objects::PUS_SERVICE_3_HOUSEKEEPING;
 
   VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;
diff --git a/mission/tmtc/PusTmFunnel.h b/mission/tmtc/PusTmFunnel.h
index 70be0248..ae0390b3 100644
--- a/mission/tmtc/PusTmFunnel.h
+++ b/mission/tmtc/PusTmFunnel.h
@@ -12,10 +12,13 @@
 /**
  * @brief       TM Recipient.
  * @details
+ * TODO: Add support for TM storage by using the (or a) LIVE flag provided by the CCSDS or Syrlinks
+ *       handler. If we are in LIVE TM mode, forward TM to downlink destination directly. Otherwise,
+ *       forward to TM storage backend which stores TMs into files.
  * Main telemetry receiver. All generated telemetry is funneled into
  * this object.
  * @ingroup     utility
- * @author      J. Meier
+ * @author      J. Meier, R. Mueller
  */
 class PusTmFunnel : public AcceptsTelemetryIF, public SystemObject {
  public: