Remove unneeded compat_storage

19 files changed, 5 insertions, 137 deletions

diff --git a/src/buildtool/execution_api/serve/mr_git_api.cpp b/src/buildtool/execution_api/serve/mr_git_api.cpp
index cd2d7a69..9a9f7ec3 100644
--- a/src/buildtool/execution_api/serve/mr_git_api.cpp
+++ b/src/buildtool/execution_api/serve/mr_git_api.cpp
@@ -26,12 +26,10 @@ MRGitApi::MRGitApi(
     gsl::not_null<RepositoryConfig const*> const& repo_config,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compatible_storage_config,
-    Storage const* compatible_storage,
     IExecutionApi const* compatible_local_api) noexcept
     : repo_config_{repo_config},
       native_storage_config_{native_storage_config},
       compat_storage_config_{compatible_storage_config},
-      compat_storage_{compatible_storage},
       compat_local_api_{compatible_local_api} {}
 
 auto MRGitApi::RetrieveToCas(
diff --git a/src/buildtool/execution_api/serve/mr_git_api.hpp b/src/buildtool/execution_api/serve/mr_git_api.hpp
index 8b0d8d9d..31f723bf 100644
--- a/src/buildtool/execution_api/serve/mr_git_api.hpp
+++ b/src/buildtool/execution_api/serve/mr_git_api.hpp
@@ -30,7 +30,6 @@
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_engine/dag/dag.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 
 /// \brief Multi-repo-specific implementation of the abstract Execution API.
 /// Handles interaction between the Git CAS and another api, irrespective of the
@@ -41,7 +40,6 @@ class MRGitApi final : public IExecutionApi {
     MRGitApi(gsl::not_null<RepositoryConfig const*> const& repo_config,
              gsl::not_null<StorageConfig const*> const& native_storage_config,
              StorageConfig const* compatible_storage_config = nullptr,
-             Storage const* compatible_storage = nullptr,
              IExecutionApi const* compatible_local_api = nullptr) noexcept;
 
     /// \brief Not supported.
@@ -136,7 +134,6 @@ class MRGitApi final : public IExecutionApi {
     // retain references to needed storages and configs
     gsl::not_null<StorageConfig const*> native_storage_config_;
     StorageConfig const* compat_storage_config_;
-    Storage const* compat_storage_;
 
     // an api accessing compatible storage, used purely to communicate with a
     // compatible remote; only instantiated if in compatible mode
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index 3e9153ee..3e4e04e1 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -359,7 +359,6 @@ auto SourceTreeService::SyncGitEntryToCas(
         MRGitApi{&repo,
                  native_context_->storage_config,
                  is_compat ? &*compat_context_->storage_config : nullptr,
-                 is_compat ? &*compat_context_->storage : nullptr,
                  is_compat ? &*apis_.local : nullptr};
     if (not git_api.RetrieveToCas(
             {Artifact::ObjectInfo{.digest = *digest, .type = kType}},
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index adae801f..ab56db41 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -527,7 +527,6 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
         serve ? &*serve : nullptr,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         &(*apis.local),
         has_remote_api ? &*apis.remote : nullptr,
         fetch_args.backup_to_remote,
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 229d162f..3247b06d 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -325,7 +325,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         serve ? &*serve : nullptr,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         &(*apis.local),
         has_remote_api ? &*apis.remote : nullptr,
         false, /* backup_to_remote */
@@ -344,7 +343,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         serve ? &*serve : nullptr,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         &(*apis.local),
         has_remote_api ? &*apis.remote : nullptr,
         common_args.fetch_absent,
@@ -363,7 +361,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
         &native_storage,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         has_remote_api ? &*apis.local : nullptr,  // only needed if remote given
         has_remote_api ? &*apis.remote : nullptr,
         common_args.fetch_absent,
@@ -387,7 +384,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         serve ? &*serve : nullptr,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         has_remote_api ? &*apis.local : nullptr,  // only needed if remote given
         has_remote_api ? &*apis.remote : nullptr,
         common_args.jobs,
@@ -403,7 +399,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
         &native_storage,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         &(*apis.local),
         has_remote_api ? &*apis.remote : nullptr,
         common_args.jobs);
@@ -416,7 +411,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
         serve ? &*serve : nullptr,
         &native_storage_config,
         compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
-        compat_storage != nullptr ? &*compat_storage : nullptr,
         &(*apis.local),
         has_remote_api ? &*apis.remote : nullptr,
         common_args.jobs);
diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp
index f233fac7..d4e7c0f6 100644
--- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp
+++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp
@@ -43,7 +43,6 @@ namespace {
 void BackupToRemote(ArtifactDigest const& digest,
                     StorageConfig const& native_storage_config,
                     StorageConfig const* compat_storage_config,
-                    Storage const* compat_storage,
                     gsl::not_null<IExecutionApi const*> const& local_api,
                     IExecutionApi const& remote_api,
                     GitTreeFetchMap::LoggerPtr const& logger) {
@@ -54,7 +53,6 @@ void BackupToRemote(ArtifactDigest const& digest,
             MRGitApi{&repo,
                      &native_storage_config,
                      compat_storage_config,
-                     compat_storage,
                      compat_storage_config != nullptr ? &*local_api : nullptr};
         if (not git_api.RetrieveToCas(
                 {Artifact::ObjectInfo{.digest = digest,
@@ -83,7 +81,6 @@ void MoveCASTreeToGit(
     gsl::not_null<ImportToGitMap*> const& import_to_git_map,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool backup_to_remote,
@@ -117,7 +114,6 @@ void MoveCASTreeToGit(
          tree_hash,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          local_api,
          remote_api,
          backup_to_remote,
@@ -135,7 +131,6 @@ void MoveCASTreeToGit(
                 BackupToRemote(native_digest,
                                *native_storage_config,
                                compat_storage_config,
-                               compat_storage,
                                local_api,
                                *remote_api,
                                logger);
@@ -156,7 +151,6 @@ void TagAndSetRoot(
     ArtifactDigest const& digest,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
@@ -179,7 +173,6 @@ void TagAndSetRoot(
          backup_to_remote,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          local_api,
          remote_api,
          logger,
@@ -195,7 +188,6 @@ void TagAndSetRoot(
                 BackupToRemote(digest,
                                *native_storage_config,
                                compat_storage_config,
-                               compat_storage,
                                local_api,
                                *remote_api,
                                logger);
@@ -217,7 +209,6 @@ void TakeTreeFromOlderGeneration(
     ArtifactDigest const& digest,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     GitCASPtr const& git_cas,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     gsl::not_null<IExecutionApi const*> const& local_api,
@@ -248,8 +239,7 @@ void TakeTreeFromOlderGeneration(
          logger,
          source,
          native_storage_config,
-         compat_storage_config,
-         compat_storage](auto const& values) {
+         compat_storage_config](auto const& values) {
             GitOpValue op_result = *values[0];
             if (not op_result.result) {
                 (*logger)("Tree tagging failed", /*fatal=*/true);
@@ -277,7 +267,6 @@ void TakeTreeFromOlderGeneration(
             TagAndSetRoot(digest,
                           native_storage_config,
                           compat_storage_config,
-                          compat_storage,
                           critical_git_op_map,
                           local_api,
                           remote_api,
@@ -306,7 +295,6 @@ auto CreateGitTreeFetchMap(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool backup_to_remote,
@@ -319,7 +307,6 @@ auto CreateGitTreeFetchMap(
                           serve,
                           native_storage_config,
                           compat_storage_config,
-                          compat_storage,
                           local_api,
                           remote_api,
                           backup_to_remote,
@@ -350,7 +337,6 @@ auto CreateGitTreeFetchMap(
              serve,
              native_storage_config,
              compat_storage_config,
-             compat_storage,
              local_api,
              remote_api,
              backup_to_remote,
@@ -397,7 +383,6 @@ auto CreateGitTreeFetchMap(
                         BackupToRemote(ArtifactDigest{key.tree_hash, 0},
                                        *native_storage_config,
                                        compat_storage_config,
-                                       compat_storage,
                                        local_api,
                                        *remote_api,
                                        logger);
@@ -427,7 +412,6 @@ auto CreateGitTreeFetchMap(
                                     ArtifactDigest{key.tree_hash, 0},
                                     native_storage_config,
                                     compat_storage_config,
-                                    compat_storage,
                                     op_result.git_cas,
                                     critical_git_op_map,
                                     local_api,
@@ -451,7 +435,6 @@ auto CreateGitTreeFetchMap(
                                      import_to_git_map,
                                      native_storage_config,
                                      compat_storage_config,
-                                     compat_storage,
                                      local_api,
                                      remote_api,
                                      backup_to_remote,
@@ -481,7 +464,6 @@ auto CreateGitTreeFetchMap(
                                          import_to_git_map,
                                          native_storage_config,
                                          compat_storage_config,
-                                         compat_storage,
                                          local_api,
                                          remote_api,
                                          false,  // tree already on remote,
@@ -506,7 +488,6 @@ auto CreateGitTreeFetchMap(
                                      import_to_git_map,
                                      native_storage_config,
                                      compat_storage_config,
-                                     compat_storage,
                                      local_api,
                                      remote_api,
                                      false,  // tree already on remote,
@@ -592,7 +573,6 @@ auto CreateGitTreeFetchMap(
                      launcher,
                      native_storage_config,
                      compat_storage_config,
-                     compat_storage,
                      local_api,
                      remote_api,
                      backup_to_remote,
@@ -734,7 +714,6 @@ auto CreateGitTreeFetchMap(
                             [remote_api,
                              native_storage_config,
                              compat_storage_config,
-                             compat_storage,
                              local_api,
                              backup_to_remote,
                              key,
@@ -756,7 +735,6 @@ auto CreateGitTreeFetchMap(
                                         ArtifactDigest{key.tree_hash, 0},
                                         *native_storage_config,
                                         compat_storage_config,
-                                        compat_storage,
                                         local_api,
                                         *remote_api,
                                         logger);
diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.hpp b/src/other_tools/ops_maps/git_tree_fetch_map.hpp
index 156e822a..7f698247 100644
--- a/src/other_tools/ops_maps/git_tree_fetch_map.hpp
+++ b/src/other_tools/ops_maps/git_tree_fetch_map.hpp
@@ -27,7 +27,6 @@
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 #include "src/other_tools/just_mr/progress_reporting/progress.hpp"
 #include "src/other_tools/ops_maps/critical_git_op_map.hpp"
 #include "src/other_tools/ops_maps/import_to_git_map.hpp"
@@ -68,7 +67,6 @@ using GitTreeFetchMap = AsyncMapConsumer<GitTreeInfo, bool>;
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool backup_to_remote,
diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp
index d877772e..942bd00f 100644
--- a/src/other_tools/root_maps/commit_git_map.cpp
+++ b/src/other_tools/root_maps/commit_git_map.cpp
@@ -75,7 +75,6 @@ void EnsureRootAsAbsent(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     CommitGitMap::SetterPtr const& ws_setter,
@@ -132,7 +131,6 @@ void EnsureRootAsAbsent(
                                                 repo_root,
                                                 native_storage_config,
                                                 compat_storage_config,
-                                                compat_storage,
                                                 &*local_api,
                                                 remote_api,
                                                 logger,
@@ -536,7 +534,6 @@ void EnsureCommit(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool fetch_absent,
@@ -620,7 +617,6 @@ void EnsureCommit(
                     serve,
                     native_storage_config,
                     compat_storage_config,
-                    compat_storage,
                     local_api,
                     remote_api,
                     ws_setter,
@@ -1075,7 +1071,6 @@ void EnsureCommit(
                                serve,
                                native_storage_config,
                                compat_storage_config,
-                               compat_storage,
                                local_api,
                                remote_api,
                                ws_setter,
@@ -1108,7 +1103,6 @@ auto CreateCommitGitMap(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool fetch_absent,
@@ -1123,7 +1117,6 @@ auto CreateCommitGitMap(
                           serve,
                           native_storage_config,
                           compat_storage_config,
-                          compat_storage,
                           local_api,
                           remote_api,
                           fetch_absent,
@@ -1168,7 +1161,6 @@ auto CreateCommitGitMap(
              serve,
              native_storage_config,
              compat_storage_config,
-             compat_storage,
              local_api,
              remote_api,
              fetch_absent,
@@ -1205,7 +1197,6 @@ auto CreateCommitGitMap(
                              serve,
                              native_storage_config,
                              compat_storage_config,
-                             compat_storage,
                              local_api,
                              remote_api,
                              fetch_absent,
diff --git a/src/other_tools/root_maps/commit_git_map.hpp b/src/other_tools/root_maps/commit_git_map.hpp
index 5298caf7..304f37b6 100644
--- a/src/other_tools/root_maps/commit_git_map.hpp
+++ b/src/other_tools/root_maps/commit_git_map.hpp
@@ -28,7 +28,6 @@
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 #include "src/other_tools/just_mr/mirrors.hpp"
 #include "src/other_tools/just_mr/progress_reporting/progress.hpp"
 #include "src/other_tools/ops_maps/critical_git_op_map.hpp"
@@ -88,7 +87,6 @@ using CommitGitMap =
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     bool fetch_absent,
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp
index a6968f79..8a903943 100644
--- a/src/other_tools/root_maps/content_git_map.cpp
+++ b/src/other_tools/root_maps/content_git_map.cpp
@@ -66,7 +66,6 @@ void EnsureRootAsAbsent(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     bool is_cache_hit,
@@ -131,7 +130,6 @@ void EnsureRootAsAbsent(
                             native_storage_config->GitRoot(), /*repo_path*/
                             native_storage_config,
                             compat_storage_config,
-                            compat_storage,
                             local_api,
                             remote_api,
                             logger,
@@ -161,7 +159,6 @@ void EnsureRootAsAbsent(
                         native_storage_config->GitRoot(), /*repo_root*/
                         native_storage_config,
                         compat_storage_config,
-                        compat_storage,
                         local_api,
                         remote_api,
                         logger,
@@ -196,7 +193,6 @@ void ResolveContentTree(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
@@ -225,7 +221,6 @@ void ResolveContentTree(
                                    serve,
                                    native_storage_config,
                                    compat_storage_config,
-                                   compat_storage,
                                    local_api,
                                    remote_api,
                                    is_cache_hit,
@@ -251,8 +246,7 @@ void ResolveContentTree(
                                     /*known_info=*/std::nullopt,
                                     just_git_cas,
                                     just_git_cas)},
-                [resolve_symlinks_map,
-                 critical_git_op_map,
+                [critical_git_op_map,
                  tree_hash,
                  tree_id_file,
                  is_cache_hit,
@@ -261,7 +255,6 @@ void ResolveContentTree(
                  serve,
                  native_storage_config,
                  compat_storage_config,
-                 compat_storage,
                  local_api,
                  remote_api,
                  ts,
@@ -288,7 +281,6 @@ void ResolveContentTree(
                          serve,
                          native_storage_config,
                          compat_storage_config,
-                         compat_storage,
                          local_api,
                          remote_api,
                          is_cache_hit,
@@ -318,7 +310,6 @@ void ResolveContentTree(
                                                    serve,
                                                    native_storage_config,
                                                    compat_storage_config,
-                                                   compat_storage,
                                                    local_api,
                                                    remote_api,
                                                    is_cache_hit,
@@ -364,7 +355,6 @@ void ResolveContentTree(
                                serve,
                                native_storage_config,
                                compat_storage_config,
-                               compat_storage,
                                local_api,
                                remote_api,
                                is_cache_hit,
@@ -394,7 +384,6 @@ void WriteIdFileAndSetWSRoot(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
@@ -442,7 +431,6 @@ void WriteIdFileAndSetWSRoot(
                        serve,
                        native_storage_config,
                        compat_storage_config,
-                       compat_storage,
                        local_api,
                        remote_api,
                        critical_git_op_map,
@@ -463,7 +451,6 @@ void ExtractAndImportToGit(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
@@ -504,7 +491,6 @@ void ExtractAndImportToGit(
          serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          local_api,
          remote_api,
          critical_git_op_map,
@@ -529,7 +515,6 @@ void ExtractAndImportToGit(
                                     serve,
                                     native_storage_config,
                                     compat_storage_config,
-                                    compat_storage,
                                     local_api,
                                     remote_api,
                                     critical_git_op_map,
@@ -572,7 +557,6 @@ void HandleLocallyKnownTree(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     IExecutionApi const* local_api,
@@ -608,7 +592,6 @@ void HandleLocallyKnownTree(
          serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          local_api,
          remote_api,
          critical_git_op_map,
@@ -654,7 +637,6 @@ void HandleLocallyKnownTree(
                 serve,
                 native_storage_config,
                 compat_storage_config,
-                compat_storage,
                 local_api,
                 remote_api,
                 critical_git_op_map,
@@ -681,7 +663,6 @@ void HandleKnownInOlderGenerationAfterImport(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     IExecutionApi const* local_api,
@@ -707,7 +688,6 @@ void HandleKnownInOlderGenerationAfterImport(
                            serve,
                            native_storage_config,
                            compat_storage_config,
-                           compat_storage,
                            resolve_symlinks_map,
                            critical_git_op_map,
                            local_api,
@@ -727,7 +707,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     IExecutionApi const* local_api,
@@ -770,7 +749,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
          serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          resolve_symlinks_map,
          critical_git_op_map,
          local_api,
@@ -791,7 +769,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
                                                     serve,
                                                     native_storage_config,
                                                     compat_storage_config,
-                                                    compat_storage,
                                                     resolve_symlinks_map,
                                                     critical_git_op_map,
                                                     local_api,
@@ -817,7 +794,6 @@ void HandleKnownInOlderGenerationAfterTagging(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     IExecutionApi const* local_api,
@@ -845,7 +821,6 @@ void HandleKnownInOlderGenerationAfterTagging(
          serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          resolve_symlinks_map,
          critical_git_op_map,
          local_api,
@@ -869,7 +844,6 @@ void HandleKnownInOlderGenerationAfterTagging(
                 serve,
                 native_storage_config,
                 compat_storage_config,
-                compat_storage,
                 resolve_symlinks_map,
                 critical_git_op_map,
                 local_api,
@@ -895,7 +869,6 @@ void HandleKnownInOlderGeneration(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
     gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
     IExecutionApi const* local_api,
@@ -934,7 +907,6 @@ void HandleKnownInOlderGeneration(
          serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          resolve_symlinks_map,
          critical_git_op_map,
          local_api,
@@ -956,7 +928,6 @@ void HandleKnownInOlderGeneration(
                                                      serve,
                                                      native_storage_config,
                                                      compat_storage_config,
-                                                     compat_storage,
                                                      resolve_symlinks_map,
                                                      critical_git_op_map,
                                                      local_api,
@@ -989,7 +960,6 @@ auto CreateContentGitMap(
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
     gsl::not_null<Storage const*> const& native_storage,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     bool fetch_absent,
@@ -1006,7 +976,6 @@ auto CreateContentGitMap(
                            native_storage_config,
                            compat_storage_config,
                            native_storage,
-                           compat_storage,
                            local_api,
                            remote_api,
                            fetch_absent,
@@ -1026,7 +995,6 @@ auto CreateContentGitMap(
                                    serve,
                                    native_storage_config,
                                    compat_storage_config,
-                                   compat_storage,
                                    resolve_symlinks_map,
                                    critical_git_op_map,
                                    local_api,
@@ -1043,7 +1011,6 @@ auto CreateContentGitMap(
                                          serve,
                                          native_storage_config,
                                          compat_storage_config,
-                                         compat_storage,
                                          resolve_symlinks_map,
                                          critical_git_op_map,
                                          local_api,
@@ -1100,7 +1067,6 @@ auto CreateContentGitMap(
                                           serve,
                                           native_storage_config,
                                           compat_storage_config,
-                                          compat_storage,
                                           local_api,
                                           remote_api,
                                           critical_git_op_map,
@@ -1141,7 +1107,6 @@ auto CreateContentGitMap(
                      native_storage_config,
                      compat_storage_config,
                      native_storage,
-                     compat_storage,
                      local_api,
                      remote_api,
                      progress,
@@ -1204,7 +1169,6 @@ auto CreateContentGitMap(
                                                       serve,
                                                       native_storage_config,
                                                       compat_storage_config,
-                                                      compat_storage,
                                                       local_api,
                                                       remote_api,
                                                       critical_git_op_map,
@@ -1245,7 +1209,6 @@ auto CreateContentGitMap(
                                                   serve,
                                                   native_storage_config,
                                                   compat_storage_config,
-                                                  compat_storage,
                                                   local_api,
                                                   remote_api,
                                                   critical_git_op_map,
@@ -1304,7 +1267,6 @@ auto CreateContentGitMap(
                                               /*serve=*/nullptr,
                                               native_storage_config,
                                               /*compat_storage_config=*/nullptr,
-                                              /*compat_storage=*/nullptr,
                                               /*local_api=*/nullptr,
                                               /*remote_api=*/nullptr,
                                               critical_git_op_map,
diff --git a/src/other_tools/root_maps/content_git_map.hpp b/src/other_tools/root_maps/content_git_map.hpp
index 1aa342e9..e7f6b756 100644
--- a/src/other_tools/root_maps/content_git_map.hpp
+++ b/src/other_tools/root_maps/content_git_map.hpp
@@ -51,7 +51,6 @@ using ContentGitMap =
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
     gsl::not_null<Storage const*> const& native_storage,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     bool fetch_absent,
diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp
index aa95fa74..422a89cd 100644
--- a/src/other_tools/root_maps/distdir_git_map.cpp
+++ b/src/other_tools/root_maps/distdir_git_map.cpp
@@ -149,7 +149,6 @@ auto CreateDistdirGitMap(
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
     gsl::not_null<Storage const*> const& native_storage,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs) -> DistdirGitMap {
@@ -160,7 +159,6 @@ auto CreateDistdirGitMap(
                            native_storage_config,
                            compat_storage_config,
                            native_storage,
-                           compat_storage,
                            local_api,
                            remote_api](auto ts,
                                        auto setter,
@@ -200,7 +198,6 @@ auto CreateDistdirGitMap(
                  serve,
                  native_storage_config,
                  compat_storage_config,
-                 compat_storage,
                  local_api,
                  remote_api,
                  setter,
@@ -279,7 +276,6 @@ auto CreateDistdirGitMap(
                                                 ->GitRoot(), /*repo_root*/
                                             native_storage_config,
                                             compat_storage_config,
-                                            compat_storage,
                                             &*local_api,
                                             remote_api,
                                             logger,
@@ -428,7 +424,6 @@ auto CreateDistdirGitMap(
                                 /*repo_path=*/"",
                                 native_storage_config,
                                 /*compat_storage_config=*/nullptr,
-                                /*compat_storage=*/nullptr,
                                 /*local_api=*/nullptr,
                                 /*remote_api=*/nullptr,
                                 logger,
@@ -469,7 +464,6 @@ auto CreateDistdirGitMap(
                                 /*repo_path=*/"",
                                 native_storage_config,
                                 /*compat_storage_config=*/nullptr,
-                                /*compat_storage=*/nullptr,
                                 /*local_api=*/nullptr,
                                 /*remote_api=*/nullptr,
                                 logger,
diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp
index 39cb961b..7bd82ca0 100644
--- a/src/other_tools/root_maps/distdir_git_map.hpp
+++ b/src/other_tools/root_maps/distdir_git_map.hpp
@@ -64,7 +64,6 @@ using DistdirGitMap =
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
     gsl::not_null<Storage const*> const& native_storage,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs) -> DistdirGitMap;
diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp
index 83065bb4..4a11025f 100644
--- a/src/other_tools/root_maps/fpath_git_map.cpp
+++ b/src/other_tools/root_maps/fpath_git_map.cpp
@@ -41,7 +41,6 @@ void CheckServeAndSetRoot(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     FilePathGitMap::SetterPtr const& ws_setter,
@@ -73,7 +72,6 @@ void CheckServeAndSetRoot(
                                                 repo_root,
                                                 native_storage_config,
                                                 compat_storage_config,
-                                                compat_storage,
                                                 local_api,
                                                 remote_api,
                                                 logger,
@@ -113,7 +111,6 @@ void ResolveFilePathTree(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     gsl::not_null<TaskSystem*> const& ts,
@@ -142,7 +139,6 @@ void ResolveFilePathTree(
                                  serve,
                                  native_storage_config,
                                  compat_storage_config,
-                                 compat_storage,
                                  local_api,
                                  remote_api,
                                  ws_setter,
@@ -158,15 +154,13 @@ void ResolveFilePathTree(
                                     /*known_info=*/std::nullopt,
                                     source_cas,
                                     target_cas)},
-                [resolve_symlinks_map,
-                 critical_git_op_map,
+                [critical_git_op_map,
                  tree_hash,
                  tree_id_file,
                  absent,
                  serve,
                  native_storage_config,
                  compat_storage_config,
-                 compat_storage,
                  local_api,
                  remote_api,
                  ts,
@@ -192,7 +186,6 @@ void ResolveFilePathTree(
                          serve,
                          native_storage_config,
                          compat_storage_config,
-                         compat_storage,
                          local_api,
                          remote_api,
                          ws_setter,
@@ -224,7 +217,6 @@ void ResolveFilePathTree(
                                 serve,
                                 native_storage_config,
                                 compat_storage_config,
-                                compat_storage,
                                 local_api,
                                 remote_api,
                                 ws_setter,
@@ -260,7 +252,6 @@ void ResolveFilePathTree(
                              serve,
                              native_storage_config,
                              compat_storage_config,
-                             compat_storage,
                              local_api,
                              remote_api,
                              ws_setter,
@@ -278,7 +269,6 @@ auto CreateFilePathGitMap(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs,
@@ -291,7 +281,6 @@ auto CreateFilePathGitMap(
                        serve,
                        native_storage_config,
                        compat_storage_config,
-                       compat_storage,
                        local_api,
                        remote_api,
                        multi_repo_tool_name,
@@ -333,7 +322,6 @@ auto CreateFilePathGitMap(
                  serve,
                  native_storage_config,
                  compat_storage_config,
-                 compat_storage,
                  local_api,
                  remote_api,
                  ts,
@@ -397,7 +385,6 @@ auto CreateFilePathGitMap(
                          serve,
                          native_storage_config,
                          compat_storage_config,
-                         compat_storage,
                          local_api,
                          remote_api,
                          ts,
@@ -423,7 +410,6 @@ auto CreateFilePathGitMap(
                                 serve,
                                 native_storage_config,
                                 compat_storage_config,
-                                compat_storage,
                                 local_api,
                                 remote_api,
                                 ts,
@@ -495,7 +481,6 @@ auto CreateFilePathGitMap(
                  serve,
                  native_storage_config,
                  compat_storage_config,
-                 compat_storage,
                  local_api,
                  remote_api,
                  ts,
@@ -524,7 +509,6 @@ auto CreateFilePathGitMap(
                         serve,
                         native_storage_config,
                         compat_storage_config,
-                        compat_storage,
                         local_api,
                         remote_api,
                         ts,
diff --git a/src/other_tools/root_maps/fpath_git_map.hpp b/src/other_tools/root_maps/fpath_git_map.hpp
index 79df10ce..2c6f7360 100644
--- a/src/other_tools/root_maps/fpath_git_map.hpp
+++ b/src/other_tools/root_maps/fpath_git_map.hpp
@@ -29,7 +29,6 @@
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 #include "src/other_tools/ops_maps/critical_git_op_map.hpp"
 #include "src/other_tools/ops_maps/import_to_git_map.hpp"
 #include "src/utils/cpp/hash_combine.hpp"
@@ -61,7 +60,6 @@ using FilePathGitMap = AsyncMapConsumer<FpathInfo, nlohmann::json>;
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs,
diff --git a/src/other_tools/root_maps/root_utils.cpp b/src/other_tools/root_maps/root_utils.cpp
index 13e18d06..b38aa43b 100644
--- a/src/other_tools/root_maps/root_utils.cpp
+++ b/src/other_tools/root_maps/root_utils.cpp
@@ -49,7 +49,6 @@ auto EnsureAbsentRootOnServe(
     std::filesystem::path const& repo_path,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     AsyncMapConsumerLoggerPtr const& logger,
@@ -71,11 +70,8 @@ auto EnsureAbsentRootOnServe(
                 /*fatal=*/true);
             return false;
         }
-        auto git_api = MRGitApi{&repo,
-                                native_storage_config,
-                                compat_storage_config,
-                                compat_storage,
-                                local_api};
+        auto git_api = MRGitApi{
+            &repo, native_storage_config, compat_storage_config, local_api};
         if (not git_api.RetrieveToCas(
                 {Artifact::ObjectInfo{.digest = *native_digest,
                                       .type = ObjectType::Tree}},
diff --git a/src/other_tools/root_maps/root_utils.hpp b/src/other_tools/root_maps/root_utils.hpp
index 17e1868d..2ba8b5ef 100644
--- a/src/other_tools/root_maps/root_utils.hpp
+++ b/src/other_tools/root_maps/root_utils.hpp
@@ -24,7 +24,6 @@
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 
 /// \brief Calls the ServeApi to check whether the serve endpoint has the given
 /// tree available to build against.
@@ -70,7 +69,6 @@
     std::filesystem::path const& repo_path,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     IExecutionApi const* local_api,
     IExecutionApi const* remote_api,
     AsyncMapConsumerLoggerPtr const& logger,
diff --git a/src/other_tools/root_maps/tree_id_git_map.cpp b/src/other_tools/root_maps/tree_id_git_map.cpp
index 7f9d9bd3..6fe0f5ee 100644
--- a/src/other_tools/root_maps/tree_id_git_map.cpp
+++ b/src/other_tools/root_maps/tree_id_git_map.cpp
@@ -41,7 +41,6 @@ void UploadToServeAndSetRoot(
     ServeApi const& serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     std::string const& tree_id,
     ArtifactDigest const& digest,
     gsl::not_null<IExecutionApi const*> const& local_api,
@@ -56,7 +55,6 @@ void UploadToServeAndSetRoot(
             MRGitApi{&repo_config,
                      native_storage_config,
                      compat_storage_config,
-                     compat_storage,
                      compat_storage_config != nullptr ? &*local_api : nullptr};
         if (not git_api.RetrieveToCas(
                 {Artifact::ObjectInfo{.digest = digest,
@@ -82,7 +80,6 @@ void UploadToServeAndSetRoot(
                                 /*repo_path=*/"",
                                 native_storage_config,
                                 /*compat_storage_config=*/nullptr,
-                                /*compat_storage=*/nullptr,
                                 /*local_api=*/nullptr,
                                 /*remote_api=*/nullptr,
                                 logger,
@@ -103,7 +100,6 @@ void MoveCASTreeToGitAndProcess(
     ServeApi const& serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     std::string const& tree_id,
     ArtifactDigest const& digest,
     gsl::not_null<ImportToGitMap*> const& import_to_git_map,
@@ -139,7 +135,6 @@ void MoveCASTreeToGitAndProcess(
         [&serve,
          native_storage_config,
          compat_storage_config,
-         compat_storage,
          tmp_dir,  // keep tmp_dir alive
          tree_id,
          digest,
@@ -158,7 +153,6 @@ void MoveCASTreeToGitAndProcess(
             UploadToServeAndSetRoot(serve,
                                     native_storage_config,
                                     compat_storage_config,
-                                    compat_storage,
                                     tree_id,
                                     digest,
                                     local_api,
@@ -187,7 +181,6 @@ auto CreateTreeIdGitMap(
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs) -> TreeIdGitMap {
@@ -198,7 +191,6 @@ auto CreateTreeIdGitMap(
                         serve,
                         native_storage_config,
                         compat_storage_config,
-                        compat_storage,
                         local_api,
                         remote_api](auto ts,
                                     auto setter,
@@ -248,7 +240,6 @@ auto CreateTreeIdGitMap(
                             /*repo_path=*/"",
                             native_storage_config,
                             /*compat_storage_config=*/nullptr,
-                            /*compat_storage=*/nullptr,
                             /*local_api=*/nullptr,
                             /*remote_api=*/nullptr,
                             logger,
@@ -288,7 +279,6 @@ auto CreateTreeIdGitMap(
                     [serve,
                      native_storage_config,
                      compat_storage_config,
-                     compat_storage,
                      digest,
                      import_to_git_map,
                      local_api,
@@ -341,7 +331,6 @@ auto CreateTreeIdGitMap(
                                 *serve,
                                 native_storage_config,
                                 compat_storage_config,
-                                compat_storage,
                                 key.tree_info.tree_hash.Hash(),
                                 digest,
                                 local_api,
@@ -360,7 +349,6 @@ auto CreateTreeIdGitMap(
                                 *serve,
                                 native_storage_config,
                                 compat_storage_config,
-                                compat_storage,
                                 key.tree_info.tree_hash.Hash(),
                                 digest,
                                 import_to_git_map,
diff --git a/src/other_tools/root_maps/tree_id_git_map.hpp b/src/other_tools/root_maps/tree_id_git_map.hpp
index 9e6a6872..23428598 100644
--- a/src/other_tools/root_maps/tree_id_git_map.hpp
+++ b/src/other_tools/root_maps/tree_id_git_map.hpp
@@ -25,7 +25,6 @@
 #include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
-#include "src/buildtool/storage/storage.hpp"
 #include "src/other_tools/ops_maps/critical_git_op_map.hpp"
 #include "src/other_tools/ops_maps/git_tree_fetch_map.hpp"
 #include "src/other_tools/ops_maps/import_to_git_map.hpp"
@@ -73,7 +72,6 @@ using TreeIdGitMap =
     ServeApi const* serve,
     gsl::not_null<StorageConfig const*> const& native_storage_config,
     StorageConfig const* compat_storage_config,
-    Storage const* compat_storage,
     gsl::not_null<IExecutionApi const*> const& local_api,
     IExecutionApi const* remote_api,
     std::size_t jobs) -> TreeIdGitMap;