diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp
index 903a84ac63..074283e464 100644
--- a/platform/local_country_file.cpp
+++ b/platform/local_country_file.cpp
@@ -62,12 +62,9 @@ string LocalCountryFile::GetPath(MapFileType type) const
 
 uint64_t LocalCountryFile::GetSize(MapFileType type) const
 {
-  ASSERT_LESS(base::Underlying(type), m_files.size(), ());
-
-  if (!m_files[base::Underlying(type)].has_value())
-    return 0;
-
-  return *m_files[base::Underlying(type)];
+  auto const ut = base::Underlying(type);
+  ASSERT_LESS(ut, m_files.size(), ());
+  return m_files[ut].value_or(0);
 }
 
 bool LocalCountryFile::HasFiles() const
diff --git a/storage/http_map_files_downloader.cpp b/storage/http_map_files_downloader.cpp
index 2de76cde46..e7392fe1c8 100644
--- a/storage/http_map_files_downloader.cpp
+++ b/storage/http_map_files_downloader.cpp
@@ -44,7 +44,6 @@ void HttpMapFilesDownloader::Download(QueuedCountry && queuedCountry)
 
   m_queue.Append(std::move(queuedCountry));
 
-  /// @todo Remain old behaviour, but why == 1?
   if (m_queue.Count() == 1)
     Download();
 }
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 57764b723d..ad3634862b 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -327,7 +327,7 @@ LocalAndRemoteSize Storage::CountrySizeInBytes(CountryId const & countryId) cons
 
   auto const it = m_downloadingCountries.find(countryId);
   if (it != m_downloadingCountries.cend())
-    sizes.first = it->second.m_bytesDownloaded + GetRemoteSize(countryFile);
+    sizes.first = it->second.m_bytesDownloaded;
 
   return sizes;
 }
@@ -605,9 +605,6 @@ void Storage::ReportProgressForHierarchy(CountryId const & countryId, Progress c
   // Reporting progress for a leaf in country tree.
   ReportProgress(countryId, leafProgress);
 
-  // Reporting progress for the parents of the leaf with |countryId|.
-  auto const setQueue = GetQueuedCountries(m_downloader->GetQueue());
-
   auto calcProgress = [&](CountryId const & parentId, CountryTree::Node const & parentNode) {
     CountriesVec descendants;
     parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container) {