diff --git a/src/fdb5/s3/S3RootManager.cc b/src/fdb5/s3/S3RootManager.cc
index 3897ebf78..aff7b24a0 100644
--- a/src/fdb5/s3/S3RootManager.cc
+++ b/src/fdb5/s3/S3RootManager.cc
@@ -24,7 +24,6 @@
 #include "eckit/log/Log.h"
 #include "fdb5/LibFdb5.h"
 #include "fdb5/config/Config.h"
-#include "fdb5/s3/S3Root.h"
 
 #include <ostream>
 #include <string>
@@ -59,10 +58,6 @@ auto loadS3(const Config& config) -> eckit::LocalConfiguration {
         std::string configPath;
         if (s3Config.has("configuration")) { configPath = s3Config.getString("configuration"); }
         session.loadClients(configPath);
-
-        //         const auto roots = s3Config.getSubConfigurations("roots");
-        //         eckit::Log::info() << "----------> serversPath: " << serversPath << std::endl;
-        //         session.loadClients(serversPath);
     }
 
     return s3Config;
diff --git a/tests/fdb/s3/test_store.cc b/tests/fdb/s3/test_store.cc
index bac7cdcf6..0134893e8 100644
--- a/tests/fdb/s3/test_store.cc
+++ b/tests/fdb/s3/test_store.cc
@@ -10,8 +10,6 @@
 
 #include "eckit/config/YAMLConfiguration.h"
 #include "eckit/filesystem/PathName.h"
-#include "eckit/filesystem/TmpDir.h"
-#include "eckit/filesystem/TmpFile.h"
 #include "eckit/filesystem/URI.h"
 #include "eckit/io/DataHandle.h"
 #include "eckit/io/MemoryHandle.h"