diff --git a/generator/feature_merger.cpp b/generator/feature_merger.cpp
index 1e2d5d1997..96204ecd6e 100644
--- a/generator/feature_merger.cpp
+++ b/generator/feature_merger.cpp
@@ -288,8 +288,9 @@ void FeatureTypesProcessor::CorrectType(uint32_t & t) const
   ftype::TruncValue(t, 2);
 
   // 2. get mapping type:
-  map<uint32_t, uint32_t>::const_iterator i = m_mapping.find(t);
-  if (i != m_mapping.end()) t = i->second;
+  auto i = m_mapping.find(t);
+  if (i != m_mapping.end())
+    t = i->second;
 }
 
 void FeatureTypesProcessor::SetMappingTypes(char const * arr1[2], char const * arr2[2])
diff --git a/generator/osm2type.hpp b/generator/osm2type.hpp
index 60c9fe1666..cf62aa7a40 100644
--- a/generator/osm2type.hpp
+++ b/generator/osm2type.hpp
@@ -10,9 +10,6 @@ namespace ftype
   /// Get the types, name and layer for feature with the tree of tags.
   void GetNameAndType(XMLElement * p, FeatureParams & params);
 
-  /// @return 'boundary-administrative' type.
-  uint32_t GetBoundaryType2();
-
   /// Check that final types set for feature is valid.
   bool IsValidTypes(FeatureParams const & params);
 }
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index 8ccf731ef5..3f482231a1 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -373,8 +373,6 @@ namespace
         if (info.m_house.empty())
           info.m_house = m_cont[i].m_house;
 
-        info.m_isBuilding = info.m_isBuilding || m_checker.IsBuilding(m_cont[i].m_types);
-
         if (info.m_name.empty())
         {
           /// @todo Make logic better.
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index a37c78bc37..7d8f4fd195 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -100,7 +100,7 @@ namespace qt
         layout.RetryDownloading(idx);
       else
         layout.DownloadMap(idx, static_cast<TMapOptions>(opt));
-     });
+    });
 
     m_framework->SetRouteBuildingListener([] (routing::IRouter::ResultCode, vector<storage::TIndex> const &)
     {
diff --git a/search/result.hpp b/search/result.hpp
index 2e53b56915..77312cb52e 100644
--- a/search/result.hpp
+++ b/search/result.hpp
@@ -145,8 +145,6 @@ struct AddressInfo
 {
   string m_country, m_city, m_street, m_house, m_name;
   vector<string> m_types;
-  // TODO(AlexZ): It is not initialized in MakeFrom() below because we don't need it in search at the moment.
-  bool m_isBuilding = false;
 
   void MakeFrom(search::Result const & res);
 
@@ -159,7 +157,6 @@ struct AddressInfo
   string FormatNameAndAddress() const;  // Caroline, 7 vulica Frunze, Belarus
   char const * GetBestType() const;
   bool IsEmptyName() const;
-  bool IsBuilding() const { return m_isBuilding; }
 
   void Clear();
 };