3 files changed, 1 insertions, 15 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 88eddf05..7d1b5ebe 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -42,12 +42,8 @@
   , "stage": ["src", "buildtool", "execution_api", "common"]
   , "deps":
     [ "common"
-    , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/common", "config"]
-    , ["src/buildtool/common/remote", "remote_common"]
-    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/execution_api/local", "context"]
-    , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/crypto", "hash_function"]
     ]
diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp
index f587a91b..15e84440 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -21,10 +21,7 @@
 ApiBundle::ApiBundle(gsl::not_null<LocalContext const*> const& local_context,
                      gsl::not_null<RemoteContext const*> const& remote_context,
                      RepositoryConfig const* repo_config)
-    : auth{*remote_context->auth},
-      retry_config{*remote_context->retry_config},
-      remote_config{*remote_context->exec_config},
-      hash_function{local_context->storage_config->hash_function},
+    : hash_function{local_context->storage_config->hash_function},
       local{std::make_shared<LocalApi>(local_context, repo_config)},
       remote{CreateRemote(remote_context->exec_config->remote_address,
                           remote_context->auth,
diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp
index 7d524b2e..17c64d1e 100644
--- a/src/buildtool/execution_api/common/api_bundle.hpp
+++ b/src/buildtool/execution_api/common/api_bundle.hpp
@@ -19,14 +19,10 @@
 #include <optional>
 
 #include "gsl/gsl"
-#include "src/buildtool/auth/authentication.hpp"
-#include "src/buildtool/common/remote/remote_common.hpp"
-#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/local/context.hpp"
-#include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/execution_api/remote/context.hpp"
 
 /// \brief Utility structure for instantiation of local and remote apis at the
@@ -51,9 +47,6 @@ struct ApiBundle final {
         -> gsl::not_null<IExecutionApi::Ptr>;
 
     // Needed to be set before creating the remote (via CreateRemote)
-    Auth const& auth;
-    RetryConfig const& retry_config;
-    RemoteExecutionConfig const& remote_config;
     HashFunction const hash_function;
     // 7 bytes of alignment.