diff --git a/map/discovery/discovery_manager.cpp b/map/discovery/discovery_manager.cpp
index e44232aa78..d4d10678dc 100644
--- a/map/discovery/discovery_manager.cpp
+++ b/map/discovery/discovery_manager.cpp
@@ -24,9 +24,8 @@ std::string GetQuery(discovery::ItemType const type)
 
 namespace discovery
 {
-Manager::Manager(DataSource const & dataSource, search::CityFinder & cityFinder, APIs const & apis)
+Manager::Manager(DataSource const & dataSource, APIs const & apis)
   : m_dataSource(dataSource)
-  , m_cityFinder(cityFinder)
   , m_searchApi(apis.m_search)
   , m_localsApi(apis.m_locals)
 {
diff --git a/map/discovery/discovery_manager.hpp b/map/discovery/discovery_manager.hpp
index 03fb7e2b7c..a94808d761 100644
--- a/map/discovery/discovery_manager.hpp
+++ b/map/discovery/discovery_manager.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "search/city_finder.hpp"
-
 #include "map/discovery/discovery_client_params.hpp"
 #include "map/discovery/discovery_search.hpp"
 #include "map/discovery/discovery_search_params.hpp"
@@ -55,7 +53,7 @@ public:
 
   using ErrorCalback = std::function<void(uint32_t const requestId, ItemType const type)>;
 
-  Manager(DataSource const & dataSource, search::CityFinder & cityFinder, APIs const & apis);
+  Manager(DataSource const & dataSource, APIs const & apis);
 
   template <typename ResultCallback>
   uint32_t Discover(Params && params, ResultCallback const & onResult, ErrorCalback const & onError)
@@ -122,7 +120,6 @@ private:
   static DiscoverySearchParams GetSearchParams(Manager::Params const & params, ItemType const type);
 
   DataSource const & m_dataSource;
-  search::CityFinder & m_cityFinder;
   SearchAPI & m_searchApi;
   locals::Api & m_localsApi;
   uint32_t m_requestCounter = 0;
diff --git a/map/framework.cpp b/map/framework.cpp
index 4f0357655e..1b122f34cc 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1461,8 +1461,7 @@ void Framework::InitDiscoveryManager()
   CHECK(m_cityFinder.get(), ("InitDiscoveryManager() must be called after InitCityFinder()"));
 
   discovery::Manager::APIs const apis(*m_searchAPI.get(), *m_localsApi.get());
-  m_discoveryManager =
-      make_unique<discovery::Manager>(m_model.GetDataSource(), *m_cityFinder.get(), apis);
+  m_discoveryManager = make_unique<discovery::Manager>(m_model.GetDataSource(), apis);
 }
 
 void Framework::InitTransliteration()
diff --git a/map/notifications/notification_manager.hpp b/map/notifications/notification_manager.hpp
index c1ff57ce86..abed317b9a 100644
--- a/map/notifications/notification_manager.hpp
+++ b/map/notifications/notification_manager.hpp
@@ -6,6 +6,7 @@
 
 #include "metrics/eye.hpp"
 
+#include <ctime>
 #include <string>
 
 #include <boost/optional.hpp>
diff --git a/metrics/eye_info.hpp b/metrics/eye_info.hpp
index 30d2b9c5f4..e7725ec3fd 100644
--- a/metrics/eye_info.hpp
+++ b/metrics/eye_info.hpp
@@ -196,19 +196,6 @@ public:
 
   using Events = std::deque<Event>;
 
-  MapObject() = default;
-
-  MapObject(std::string const & bestType, m2::PointD const & pos, std::string const & readableName)
-    : m_bestType(bestType)
-    , m_pos(pos)
-    , m_readableName(readableName)
-    , m_limitRect(MercatorBounds::ClampX(pos.x - kMwmPointAccuracy),
-                  MercatorBounds::ClampY(pos.y - kMwmPointAccuracy),
-                  MercatorBounds::ClampX(pos.x + kMwmPointAccuracy),
-                  MercatorBounds::ClampY(pos.y + kMwmPointAccuracy))
-  {
-  }
-
   bool operator==(MapObject const & rhs) const
   {
     return GetPos() == rhs.GetPos() && GetBestType() == rhs.GetBestType() &&