diff --git a/pkg/com/net.go b/pkg/com/net.go
index 69ffaf24..35be93a1 100644
--- a/pkg/com/net.go
+++ b/pkg/com/net.go
@@ -177,4 +177,5 @@ func (t *RPC[_, _]) Cleanup() {
 		}
 		close(task.done)
 	}
+	t.calls.Clear()
 }
diff --git a/pkg/coordinator/user.go b/pkg/coordinator/user.go
index 923aeff3..d11b144d 100644
--- a/pkg/coordinator/user.go
+++ b/pkg/coordinator/user.go
@@ -18,7 +18,7 @@ type HasServerInfo interface {
 }
 
 func NewUser(sock *com.Connection, log *logger.Logger) *User {
-	conn := com.NewConnection[api.PT, api.In[com.Uid], api.Out, *api.Out](sock, com.NewUid(), log)
+	conn := com.NewConnection[api.PT, api.In[com.Uid], api.Out](sock, com.NewUid(), log)
 	return &User{
 		Connection: conn,
 		log: log.Extend(log.With().
diff --git a/pkg/coordinator/worker.go b/pkg/coordinator/worker.go
index 6770af3a..de6c937c 100644
--- a/pkg/coordinator/worker.go
+++ b/pkg/coordinator/worker.go
@@ -60,7 +60,7 @@ type AppMeta struct {
 }
 
 func NewWorker(sock *com.Connection, handshake api.ConnectionRequest[com.Uid], log *logger.Logger) *Worker {
-	conn := com.NewConnection[api.PT, api.In[com.Uid], api.Out, *api.Out](sock, handshake.Id, log)
+	conn := com.NewConnection[api.PT, api.In[com.Uid], api.Out](sock, handshake.Id, log)
 	return &Worker{
 		Connection: conn,
 		Addr:       handshake.Addr,
diff --git a/pkg/worker/coordinator.go b/pkg/worker/coordinator.go
index 2840a0e4..05bfa969 100644
--- a/pkg/worker/coordinator.go
+++ b/pkg/worker/coordinator.go
@@ -54,7 +54,7 @@ func newCoordinatorConnection(host string, conf config.Worker, addr string, log
 	}
 
 	clog := log.Extend(log.With().Str(logger.ClientField, "c"))
-	client := com.NewConnection[api.PT, api.In[com.Uid], api.Out, *api.Out](conn, id, clog)
+	client := com.NewConnection[api.PT, api.In[com.Uid], api.Out](conn, id, clog)
 
 	return &coordinator{
 		Connection: client,