diff --git a/trustgraph-flow/trustgraph/gateway/embeddings.py b/trustgraph-flow/trustgraph/gateway/embeddings.py
index 74785563..d0f3e1ef 100644
--- a/trustgraph-flow/trustgraph/gateway/embeddings.py
+++ b/trustgraph-flow/trustgraph/gateway/embeddings.py
@@ -26,14 +26,4 @@ class EmbeddingsRequestor(ServiceRequestor):
     def from_response(self, message):
         return { "vectors": message.vectors }, True
 
-class EmbeddingsEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(EmbeddingsEndpoint, self).__init__(
-            endpoint_path="/api/v1/embeddings",
-            auth=auth,
-            requestor = EmbeddingsRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
 
diff --git a/trustgraph-flow/trustgraph/gateway/encyclopedia.py b/trustgraph-flow/trustgraph/gateway/encyclopedia.py
index b222f528..3f4dad79 100644
--- a/trustgraph-flow/trustgraph/gateway/encyclopedia.py
+++ b/trustgraph-flow/trustgraph/gateway/encyclopedia.py
@@ -27,15 +27,3 @@ class EncyclopediaRequestor(ServiceRequestor):
     def from_response(self, message):
         return { "text": message.text }, True
 
-
-class EncyclopediaEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(EncyclopediaEndpoint, self).__init__(
-            endpoint_path="/api/v1/encyclopedia",
-            auth=auth,
-            requestor = EncyclopediaRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-
diff --git a/trustgraph-flow/trustgraph/gateway/graph_rag.py b/trustgraph-flow/trustgraph/gateway/graph_rag.py
index a9cb6a45..55fd5d2f 100644
--- a/trustgraph-flow/trustgraph/gateway/graph_rag.py
+++ b/trustgraph-flow/trustgraph/gateway/graph_rag.py
@@ -28,14 +28,3 @@ class GraphRagRequestor(ServiceRequestor):
     def from_response(self, message):
         return { "response": message.response }, True
 
-class GraphRagEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(GraphRagEndpoint, self).__init__(
-            endpoint_path="/api/v1/graph-rag",
-            auth=auth,
-            requestor = GraphRagRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-
diff --git a/trustgraph-flow/trustgraph/gateway/internet_search.py b/trustgraph-flow/trustgraph/gateway/internet_search.py
index 9843098b..127cd5d1 100644
--- a/trustgraph-flow/trustgraph/gateway/internet_search.py
+++ b/trustgraph-flow/trustgraph/gateway/internet_search.py
@@ -27,14 +27,3 @@ class InternetSearchRequestor(ServiceRequestor):
     def from_response(self, message):
         return { "text": message.text }, True
 
-class InternetSearchEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(InternetSearchEndpoint, self).__init__(
-            endpoint_path="/api/v1/internet-search",
-            auth=auth,
-            requestor = InternetSearchRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-
diff --git a/trustgraph-flow/trustgraph/gateway/prompt.py b/trustgraph-flow/trustgraph/gateway/prompt.py
index 31d8cbea..080d5618 100644
--- a/trustgraph-flow/trustgraph/gateway/prompt.py
+++ b/trustgraph-flow/trustgraph/gateway/prompt.py
@@ -39,14 +39,3 @@ class PromptRequestor(ServiceRequestor):
                 "text": message.text
             }, True
 
-class PromptEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(PromptEndpoint, self).__init__(
-            endpoint_path="/api/v1/prompt",
-            auth=auth,
-            requestor = PromptRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-
diff --git a/trustgraph-flow/trustgraph/gateway/text_completion.py b/trustgraph-flow/trustgraph/gateway/text_completion.py
index 80428c2f..7291fc88 100644
--- a/trustgraph-flow/trustgraph/gateway/text_completion.py
+++ b/trustgraph-flow/trustgraph/gateway/text_completion.py
@@ -27,14 +27,3 @@ class TextCompletionRequestor(ServiceRequestor):
     def from_response(self, message):
         return { "response": message.response }, True
 
-class TextCompletionEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(TextCompletionEndpoint, self).__init__(
-            endpoint_path="/api/v1/text-completion",
-            auth=auth,
-            requestor = TextCompletionRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-
diff --git a/trustgraph-flow/trustgraph/gateway/triples_query.py b/trustgraph-flow/trustgraph/gateway/triples_query.py
index d6ec5c54..0ea7cd8d 100644
--- a/trustgraph-flow/trustgraph/gateway/triples_query.py
+++ b/trustgraph-flow/trustgraph/gateway/triples_query.py
@@ -51,14 +51,3 @@ class TriplesQueryRequestor(ServiceRequestor):
             "response": serialize_subgraph(message.triples)
         }, True
 
-class TriplesQueryEndpoint(ServiceEndpoint):
-    def __init__(self, pulsar_host, timeout, auth):
-
-        super(TriplesQueryEndpoint, self).__init__(
-            endpoint_path="/api/v1/triples-query",
-            auth=auth,
-            requestor = TriplesQueryRequestor(
-                pulsar_host=pulsar_host, timeout=timeout, auth=auth
-            )
-        )
-