diff --git a/include/bedrock/client.h b/include/bedrock/client.h
deleted file mode 100644
index 49974e7..0000000
--- a/include/bedrock/client.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * (C) 2022 The University of Chicago
- *
- * See COPYRIGHT in top-level directory.
- */
-#ifndef __BEDROCK_CLIENT_H
-#define __BEDROCK_CLIENT_H
-
-#include <margo.h>
-#include <bedrock/common.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* bedrock_client_t;
-
-/**
- * @brief Create a Bedrock client handle.
- *
- * @param[out] client Client
- *
- * @return 0 for success
- */
-int bedrock_client_init(margo_instance_id mid, bedrock_client_t* client);
-
-/**
- * @brief Finalize a Bedrock client handle.
- *
- * @param[int] client Client
- *
- * @return 0 for success
- */
-int bedrock_client_finalize(bedrock_client_t client);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/bedrock/common.h b/include/bedrock/common.h
deleted file mode 100644
index 861ad47..0000000
--- a/include/bedrock/common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * (C) 2020 The University of Chicago
- *
- * See COPYRIGHT in top-level directory.
- */
-#ifndef __BEDROCK_H
-#define __BEDROCK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BEDROCK_SUCCESS 0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/bedrock/module.h b/include/bedrock/module.h
index 1fe840d..3e3d74f 100644
--- a/include/bedrock/module.h
+++ b/include/bedrock/module.h
@@ -7,12 +7,13 @@
 #define __BEDROCK_MODULE_H
 
 #include <margo.h>
-#include <bedrock/common.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define BEDROCK_SUCCESS 0
+
 #define BEDROCK_MODULE_API_VERSION 1
 
 #define BEDROCK_OPTIONAL 0x0
diff --git a/include/bedrock/service-handle.h b/include/bedrock/service-handle.h
deleted file mode 100644
index e18e8a4..0000000
--- a/include/bedrock/service-handle.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * (C) 2022 The University of Chicago
- *
- * See COPYRIGHT in top-level directory.
- */
-#ifndef __BEDROCK_SERVICE_HANDLE_H
-#define __BEDROCK_SERVICE_HANDLE_H
-
-#include <bedrock/client.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* bedrock_service_t;
-
-/**
- * @brief Create a service handle pointing to a specific
- * Bedrock process.
- *
- * @param client Client
- * @param addr Address of the Bedrock process
- * @param provider_id Provider id of the Bedrock process
- * @param sh Resulting service handle
- *
- * @return 0 on success
- */
-int bedrock_service_handle_create(
-        bedrock_client_t client,
-        const char* addr,
-        uint16_t provider_id,
-        bedrock_service_t* sh);
-
-/**
- * @brief Destroys a service handle.
- *
- * @param sh Service handle
- *
- * @return 0 on success
- */
-int bedrock_service_handle_destroy(
-        bedrock_service_t sh);
-
-/**
- * @brief Request the execution of a JX9 script on
- * the remote service, to query its configuration.
- *
- * IMPORTANT: the caller is responsible for calling
- * free() on the returned string.
- *
- * @param script JX9 script
- *
- * @return 0 on success
- */
-char* bedrock_service_query_config(
-        bedrock_service_t sh,
-        const char* script);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/Client.cpp b/src/Client.cpp
index 0fd34ca..861517b 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -8,7 +8,6 @@
 #include "bedrock/ServiceHandle.hpp"
 #include "bedrock/ServiceGroupHandle.hpp"
 #include "bedrock/RequestResult.hpp"
-#include "bedrock/client.h"
 
 #include "ClientImpl.hpp"
 #include "ServiceHandleImpl.hpp"
diff --git a/src/ServiceGroupHandle.cpp b/src/ServiceGroupHandle.cpp
index 90c2705..245acda 100644
--- a/src/ServiceGroupHandle.cpp
+++ b/src/ServiceGroupHandle.cpp
@@ -6,7 +6,6 @@
 #include "bedrock/ServiceHandle.hpp"
 #include "bedrock/ServiceGroupHandle.hpp"
 #include "bedrock/RequestResult.hpp"
-#include "bedrock/service-handle.h"
 
 #include "Exception.hpp"
 #include "AsyncRequestImpl.hpp"
diff --git a/src/ServiceHandle.cpp b/src/ServiceHandle.cpp
index a4af591..1cd474b 100644
--- a/src/ServiceHandle.cpp
+++ b/src/ServiceHandle.cpp
@@ -5,7 +5,6 @@
  */
 #include "bedrock/ServiceHandle.hpp"
 #include "bedrock/RequestResult.hpp"
-#include "bedrock/service-handle.h"
 
 #include "Exception.hpp"
 #include "AsyncRequestImpl.hpp"
diff --git a/tests/modules/BaseModule.hpp b/tests/modules/BaseModule.hpp
index b7a7a94..078fb54 100644
--- a/tests/modules/BaseModule.hpp
+++ b/tests/modules/BaseModule.hpp
@@ -41,21 +41,11 @@ class BaseServiceFactory : public bedrock::AbstractServiceFactory {
         delete static_cast<TestProviderHandle*>(providerHandle);
     }
 
-    const std::vector<bedrock::Dependency>& getProviderDependencies() override {
-        static std::vector<bedrock::Dependency> deps = {};
-        return deps;
-    }
-
     std::vector<bedrock::Dependency> getProviderDependencies(const char*) override {
-        return getProviderDependencies();
-    }
-
-    const std::vector<bedrock::Dependency>& getClientDependencies() override {
-        static std::vector<bedrock::Dependency> deps = {};
-        return deps;
+        return {};
     }
 
     std::vector<bedrock::Dependency> getClientDependencies(const char*) override {
-        return getClientDependencies();
+        return {};
     }
 };