diff --git a/daemon/fw/access-strategy.cpp b/daemon/fw/access-strategy.cpp
index ace5426..45235d8 100644
--- a/daemon/fw/access-strategy.cpp
+++ b/daemon/fw/access-strategy.cpp
@@ -230,6 +230,7 @@
 AccessStrategy::updateMeasurements(const Face& inFace, const Data& data,
                                    const RttEstimator::Duration& rtt)
 {
+  ///\todo move FaceInfoTable out of AccessStrategy instance, to Measurements or somewhere else
   FaceInfo& fi = m_fit[inFace.getId()];
   fi.rtt.addMeasurement(rtt);
 
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 7482cf4..8efc522 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -68,7 +68,6 @@
   });
 
   m_strategyChoice.setDefaultStrategy(getDefaultStrategyName());
-  m_strategyChoice.installFromRegistry();
 }
 
 Forwarder::~Forwarder() = default;