diff --git a/tools/traff_assessment_tool/mainwindow.cpp b/tools/traff_assessment_tool/mainwindow.cpp
index 0be4db79b..3b2819042 100644
--- a/tools/traff_assessment_tool/mainwindow.cpp
+++ b/tools/traff_assessment_tool/mainwindow.cpp
@@ -317,11 +317,7 @@ void MainWindow::CreateTrafficPanel()
 {
   if (!m_trafficModel)
   {
-    // TODO simplify the call, almost everything depends on m_framework
-    m_trafficModel = new TrafficModel(m_framework, m_framework.GetDataSource(),
-                                      std::make_unique<TrafficDrawerDelegate>(m_framework),
-                                      std::make_unique<PointsControllerDelegate>(m_framework),
-                                      *this);
+    m_trafficModel = new TrafficModel(m_framework, *this);
 
     connect(m_mapWidget, &MapWidget::TrafficMarkupClick,
             m_trafficModel, &TrafficModel::OnClick);
diff --git a/tools/traff_assessment_tool/traffic_model.cpp b/tools/traff_assessment_tool/traffic_model.cpp
index f1bfceb18..df297384e 100644
--- a/tools/traff_assessment_tool/traffic_model.cpp
+++ b/tools/traff_assessment_tool/traffic_model.cpp
@@ -298,16 +298,14 @@ QVariant GetDescription(TraffMessage const & message)
 }
 
 // TrafficModel -------------------------------------------------------------------------------------
-TrafficModel::TrafficModel(Framework & framework, DataSource const & dataSource,
-                         std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,    // TODO do we need that?
-                         std::unique_ptr<PointsControllerDelegateBase> pointsDelegate, // TODO do we need that?
+TrafficModel::TrafficModel(Framework & framework,
                          MainWindow & mainWindow,
                          QObject * parent)
   : QAbstractTableModel(parent)
   , m_framework(framework)
-  , m_dataSource(dataSource)
-  , m_drawerDelegate(std::move(drawerDelegate))
-  , m_pointsDelegate(std::move(pointsDelegate))
+  , m_dataSource(framework.GetDataSource())
+  , m_drawerDelegate(std::make_unique<TrafficDrawerDelegate>(framework))
+  , m_pointsDelegate(std::make_unique<PointsControllerDelegate>(framework))
   , m_mainWindow(mainWindow)
 {
   framework.GetTrafficManager().SetTrafficUpdateCallbackFn([this, &framework](bool final) {
diff --git a/tools/traff_assessment_tool/traffic_model.hpp b/tools/traff_assessment_tool/traffic_model.hpp
index 7d3387e99..c2dcf24a7 100644
--- a/tools/traff_assessment_tool/traffic_model.hpp
+++ b/tools/traff_assessment_tool/traffic_model.hpp
@@ -70,9 +70,7 @@ class TrafficModel : public QAbstractTableModel
 
 public:
   // TODO(mgsergio): Check we are on the right mwm. I.e. right mwm version and everything.
-  TrafficModel(Framework & framework, DataSource const & dataSource,
-              std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,
-              std::unique_ptr<PointsControllerDelegateBase> pointsDelegate,
+  TrafficModel(Framework & framework,
               MainWindow & mainWindow,
               QObject * parent = Q_NULLPTR);