diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp
index 4f1adcffca..ff97f3cc9b 100644
--- a/android/jni/com/mapswithme/maps/MapManager.cpp
+++ b/android/jni/com/mapswithme/maps/MapManager.cpp
@@ -102,7 +102,7 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeMoveFile(JNIEnv * env, jcla
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes)
 {
-  return IsEnoughSpaceForDownload(bytes, GetStorage().GetMaxMwmSizeBytes());
+  return IsEnoughSpaceForDownload(bytes);
 }
 
 // static boolean nativeHasSpaceToDownloadCountry(String root);
diff --git a/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm b/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm
index b5f70bbbf1..16d7786754 100644
--- a/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm
+++ b/iphone/CoreApi/CoreApi/Storage/MWMStorage.mm
@@ -143,7 +143,7 @@ using namespace storage;
 - (BOOL)downloadNodes:(NSArray<NSString *> *)countryIds error:(NSError *__autoreleasing _Nullable *)error {
   auto &s = GetFramework().GetStorage();
 
-  MwmSize requiredSize = s.GetMaxMwmSizeBytes();
+  MwmSize requiredSize = 0;
   for (NSString *countryId in countryIds) {
     NodeAttrs nodeAttrs;
     GetFramework().GetStorage().GetNodeAttrs(countryId.UTF8String, nodeAttrs);
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 5e62a7de00..5e7e1db8c4 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -130,7 +130,6 @@ Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */,
 
   SetLocale(languages::GetCurrentTwine());
   LoadCountriesFile(pathToCountriesFile);
-  CalcMaxMwmSizeBytes();
 
   m_downloader->SetDataVersion(m_currentVersion);
 }
@@ -145,7 +144,6 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting,
       LoadCountriesFromBuffer(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations,
                               m_countryNameSynonyms, m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds);
   CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file"));
-  CalcMaxMwmSizeBytes();
 
   m_downloader->SetDataVersion(m_currentVersion);
 }
@@ -1375,20 +1373,6 @@ bool Storage::IsWorldCountryID(CountryId const & country)
   return strings::StartsWith(country, WORLD_FILE_NAME);
 }
 
-void Storage::CalcMaxMwmSizeBytes()
-{
-  m_maxMwmSizeBytes = 0;
-  m_countries.GetRoot().ForEachInSubtree([&](CountryTree::Node const & node)
-  {
-    if (node.ChildrenCount() == 0)
-    {
-      MwmSize mwmSizeBytes = node.Value().GetSubtreeMwmSizeBytes();
-      if (mwmSizeBytes > m_maxMwmSizeBytes)
-        m_maxMwmSizeBytes = mwmSizeBytes;
-    }
-  });
-}
-
 /*
 void Storage::LoadDiffScheme()
 {
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 10f76cc141..5db4c15e2e 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -247,8 +247,6 @@ private:
   MwmTopCountryGeoIds m_mwmTopCountryGeoIds;
   /// @}
 
-  MwmSize m_maxMwmSizeBytes = 0;
-
   ThreadChecker m_threadChecker;
 
   bool m_needToStartDeferredDownloading = false;
@@ -557,8 +555,6 @@ public:
   void SetLocale(std::string const & locale) { m_countryNameGetter.SetLocale(locale); }
   std::string GetLocale() const { return m_countryNameGetter.GetLocale(); }
 
-  MwmSize GetMaxMwmSizeBytes() const { return m_maxMwmSizeBytes; }
-
   // for testing:
   void SetEnabledIntegrityValidationForTesting(bool enabled);
   void SetDownloaderForTesting(std::unique_ptr<MapFilesDownloader> downloader);
@@ -650,8 +646,6 @@ private:
   static bool IsCountryLeaf(CountryTree::Node const & node);
   static bool IsWorldCountryID(CountryId const & country);
 
-  void CalcMaxMwmSizeBytes();
-
   void OnMapDownloadFailed(CountryId const & countryId);
 
   //void LoadDiffScheme();