diff --git a/metropolis/node/core/curator/listener.go b/metropolis/node/core/curator/listener.go
index 4bd0d96..00b3ca1 100644
--- a/metropolis/node/core/curator/listener.go
+++ b/metropolis/node/core/curator/listener.go
@@ -48,17 +48,6 @@
 	consensus consensus.ServiceHandle
 }
 
-// listenerTarget is where the listener should forward a given curator RPC. This
-// is provided by the listener dispatcher on request (on 'dispatch').
-type listenerTarget struct {
-	// ctx is the context representing the lifetime of the given impl. It will be
-	// canceled when that implementation switches over to a different one.
-	ctx context.Context
-	// impl is the CuratorServer implementation to which RPCs should be directed
-	// according to the dispatcher.
-	impl rpc.ClusterServices
-}
-
 // run is the listener runnable. It listens on the Curator's gRPC socket, either
 // by starting a leader or follower instance.
 func (l *listener) run(ctx context.Context) error {
diff --git a/metropolis/node/core/rpc/server.go b/metropolis/node/core/rpc/server.go
index 97cb3ec..3522822 100644
--- a/metropolis/node/core/rpc/server.go
+++ b/metropolis/node/core/rpc/server.go
@@ -1,8 +1,6 @@
 package rpc
 
 import (
-	cpb "source.monogon.dev/metropolis/node/core/curator/proto/api"
-	apb "source.monogon.dev/metropolis/proto/api"
 	epb "source.monogon.dev/metropolis/proto/ext"
 )
 
@@ -15,12 +13,3 @@
 		epb.Permission_PERMISSION_UPDATE_NODE_SELF:    true,
 	}
 )
-
-// ClusterServices is the interface containing all gRPC services that a
-// Metropolis Cluster implements. With the current implementation of Metropolis,
-// this is all implemented by the Curator.
-type ClusterServices interface {
-	cpb.CuratorServer
-	apb.AAAServer
-	apb.ManagementServer
-}
diff --git a/metropolis/node/core/rpc/server_authentication.go b/metropolis/node/core/rpc/server_authentication.go
index 73f04b9..df1fd4c 100644
--- a/metropolis/node/core/rpc/server_authentication.go
+++ b/metropolis/node/core/rpc/server_authentication.go
@@ -17,7 +17,7 @@
 )
 
 // ServerSecurity are the security options of a RPC server that will run
-// ClusterServices on a Metropolis node. It contains all the data for the
+// cluster services on a Metropolis node. It contains all the data for the
 // server implementation to authenticate itself to the clients and authenticate
 // and authorize clients connecting to it.
 type ServerSecurity struct {
diff --git a/metropolis/node/core/rpc/server_authentication_test.go b/metropolis/node/core/rpc/server_authentication_test.go
index a229927..8deaaea 100644
--- a/metropolis/node/core/rpc/server_authentication_test.go
+++ b/metropolis/node/core/rpc/server_authentication_test.go
@@ -17,8 +17,8 @@
 	epb "source.monogon.dev/metropolis/proto/ext"
 )
 
-// testImplementations implements ClusterServices by returning 'unimplementd'
-// for every RPC call.
+// testImplementations implements a subset of test cluster services by returning
+// 'unimplemented' for every RPC call.
 type testImplementation struct {
 	cpb.UnimplementedCuratorServer
 	apb.UnimplementedAAAServer