diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 17a65a559c..3e56487a82 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -986,7 +986,7 @@ void RoutingManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine, bool is3dAl
       // In case of the engine reinitialization recover route.
       if (IsRoutingActive())
       {
-        m_routingSession.ProtectedCall([this](Route const & route) { InsertRoute(route); });
+        m_routingSession.RouteCall([this](Route const & route) { InsertRoute(route); });
 
         if (is3dAllowed && m_routingSession.IsFollowing())
           m_drapeEngine.SafeCall(&df::DrapeEngine::EnablePerspective);
diff --git a/routing/async_router.cpp b/routing/async_router.cpp
index dd0bf29a42..5bd99b8261 100644
--- a/routing/async_router.cpp
+++ b/routing/async_router.cpp
@@ -439,7 +439,7 @@ void AsyncRouter::CalculateRoute()
   if (code != RouterResultCode::NoError)
   {
     if (code == RouterResultCode::NeedMoreMaps)
-       RunOnGuiThread([delegate, routeId, absent]() { delegate->OnNeedMoreMaps(routeId, absent); });
+      RunOnGuiThread([delegate, routeId, absent]() { delegate->OnNeedMoreMaps(routeId, absent); });
     else
       RunOnGuiThread([delegate, code]() { delegate->OnRemoveRoute(code); });
   }
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index edf794ff1f..c52c7ef93f 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -189,13 +189,13 @@ bool RoutingSession::IsActive() const
 bool RoutingSession::IsNavigable() const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  return IsNavigableImpl();
+  return (m_state == RouteNotStarted || m_state == OnRoute || m_state == RouteFinished);
 }
 
 bool RoutingSession::IsBuilt() const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  return (IsNavigableImpl() || m_state == RouteNeedRebuild);
+  return (IsNavigable() || m_state == RouteNeedRebuild);
 }
 
 bool RoutingSession::IsBuilding() const
@@ -247,12 +247,6 @@ bool RoutingSession::IsFollowing() const
 }
 
 void RoutingSession::Reset()
-{
-  CHECK_THREAD_CHECKER(m_threadChecker, ());
-  ResetImpl();
-}
-
-void RoutingSession::ResetImpl()
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(m_router != nullptr, ());
@@ -378,7 +372,7 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const
     return;
   }
 
-  if (!IsNavigableImpl())
+  if (!IsNavigable())
   {
     info = FollowingInfo();
     FormatDistance(m_route->GetTotalDistanceMeters(), info.m_distToTarget, info.m_targetUnitsSuffix);
@@ -484,7 +478,7 @@ void RoutingSession::GenerateTurnNotifications(vector<string> & turnNotification
   if (!m_routingSettings.m_soundDirection)
     return;
 
-  if (!m_route->IsValid() || !IsNavigableImpl())
+  if (!m_route->IsValid() || !IsNavigable())
     return;
 
   vector<turns::TurnItemDist> turns;
@@ -524,7 +518,7 @@ void RoutingSession::SetRouter(unique_ptr<IRouter> && router,
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(m_router != nullptr, ());
-  ResetImpl();
+  Reset();
   m_router->SetRouter(move(router), move(fetcher));
 }
 
@@ -685,7 +679,7 @@ double RoutingSession::GetDistanceToCurrentCamM(SpeedCameraRestriction & camera,
   return kInvalidSpeedCameraDistance;
 }
 
-void RoutingSession::ProtectedCall(RouteCallback const & callback) const
+void RoutingSession::RouteCall(RouteCallback const & callback) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   CHECK(m_route, ());
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index 253ca40285..a183bb898a 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -17,7 +17,6 @@
 #include "geometry/point2d.hpp"
 #include "geometry/polyline2d.hpp"
 
-#include "base/mutex.hpp"
 #include "base/thread_checker.hpp"
 
 #include "std/functional.hpp"
@@ -167,7 +166,7 @@ public:
 
   void EmitCloseRoutingEvent() const;
 
-  void ProtectedCall(RouteCallback const & callback) const;
+  void RouteCall(RouteCallback const & callback) const;
 
   // RoutingObserver overrides:
   void OnTrafficInfoClear() override;
@@ -181,8 +180,6 @@ public:
   void CopyTraffic(std::map<MwmSet::MwmId, std::shared_ptr<traffic::TrafficInfo::Coloring>> & trafficColoring) const override;
 
 private:
-  // @TODO(bykoianko) This class should be removed when all methods RoutingSession and
-  // all routing callbacks are called from ui thread.
   struct DoReadyCallback
   {
     RoutingSession & m_rs;
@@ -196,26 +193,18 @@ private:
     void operator()(shared_ptr<Route> route, RouterResultCode e);
   };
 
-  // Should be called with locked m_routingSessionMutex.
   void AssignRoute(shared_ptr<Route> route, RouterResultCode e);
 
   /// Returns a nearest speed camera record on your way and distance to it.
   /// Returns kInvalidSpeedCameraDistance if there is no cameras on your way.
-  // Should be called with locked m_routingSessionMutex.
   double GetDistanceToCurrentCamM(SpeedCameraRestriction & camera, DataSource const & dataSource);
 
   /// RemoveRoute removes m_route and resets route attributes (m_state, m_lastDistance, m_moveAwayCounter).
   void RemoveRoute();
   void RebuildRouteOnTrafficUpdate();
 
-  // Should be called with locked m_routingSessionMutex.
-  void ResetImpl();
-  // Should be called with locked m_routingSessionMutex.
   double GetCompletionPercent() const;
-  // Should be called with locked m_routingSessionMutex.
   void PassCheckpoints();
-  // Should be called with locked m_routingSessionMutex.
-  bool IsNavigableImpl() const { return (m_state == RouteNotStarted || m_state == OnRoute || m_state == RouteFinished); }
 
 private:
   unique_ptr<AsyncRouter> m_router;