diff --git a/lib/middleware/middlewares/eqp/client.go b/lib/middleware/middlewares/eqp/client.go
index 2f8efee5e9cd44382899a03251d56c198d4c04d3..b439d154908d33417696eb49a179e2adffcaff98 100644
--- a/lib/middleware/middlewares/eqp/client.go
+++ b/lib/middleware/middlewares/eqp/client.go
@@ -11,8 +11,6 @@ import (
 type Client struct {
 	preparedStatements map[string]PreparedStatement
 	portals            map[string]Portal
-
-	middleware.Nil
 }
 
 func NewClient() *Client {
diff --git a/lib/middleware/middlewares/eqp/server.go b/lib/middleware/middlewares/eqp/server.go
index a7c8884d49e854e0ddb836e1898b11b666c408dc..10f00b560e8ca662991ef814931147df7a3af149 100644
--- a/lib/middleware/middlewares/eqp/server.go
+++ b/lib/middleware/middlewares/eqp/server.go
@@ -23,8 +23,6 @@ type Server struct {
 	pendingCloses             ring.Ring[Close]
 
 	peer *Client
-
-	middleware.Nil
 }
 
 func NewServer() *Server {
diff --git a/lib/middleware/middlewares/eqp2/client.go b/lib/middleware/middlewares/eqp2/client.go
new file mode 100644
index 0000000000000000000000000000000000000000..b15458cd9dcaf92ecd119bddff05cb42a2b7fdaf
--- /dev/null
+++ b/lib/middleware/middlewares/eqp2/client.go
@@ -0,0 +1,21 @@
+package eqp2
+
+import (
+	"pggat/lib/fed"
+	"pggat/lib/middleware"
+)
+
+type Client struct {
+}
+
+func (T *Client) Read(ctx middleware.Context, packet fed.Packet) error {
+	// TODO implement me
+	panic("implement me")
+}
+
+func (T *Client) Write(ctx middleware.Context, packet fed.Packet) error {
+	// TODO implement me
+	panic("implement me")
+}
+
+var _ middleware.Middleware = (*Client)(nil)
diff --git a/lib/middleware/middlewares/ps/client.go b/lib/middleware/middlewares/ps/client.go
index e3970c8f388258aa97b6efccf32f5c00112a4e45..eaf0cbf24d852ace1243dcd17d7d6dfcb5ece541 100644
--- a/lib/middleware/middlewares/ps/client.go
+++ b/lib/middleware/middlewares/ps/client.go
@@ -12,8 +12,6 @@ import (
 type Client struct {
 	synced     bool
 	parameters map[strutil.CIString]string
-
-	middleware.Nil
 }
 
 func NewClient(parameters map[strutil.CIString]string) *Client {
@@ -22,6 +20,10 @@ func NewClient(parameters map[strutil.CIString]string) *Client {
 	}
 }
 
+func (T *Client) Read(_ middleware.Context, _ fed.Packet) error {
+	return nil
+}
+
 func (T *Client) Write(ctx middleware.Context, packet fed.Packet) error {
 	switch packet.Type() {
 	case packets.TypeParameterStatus:
diff --git a/lib/middleware/middlewares/ps/server.go b/lib/middleware/middlewares/ps/server.go
index 187d46e1978617efc223768ee95184b5b30e9a96..b397f07dc99e2eb0866c8a0be38898a3791d44e0 100644
--- a/lib/middleware/middlewares/ps/server.go
+++ b/lib/middleware/middlewares/ps/server.go
@@ -11,8 +11,6 @@ import (
 
 type Server struct {
 	parameters map[strutil.CIString]string
-
-	middleware.Nil
 }
 
 func NewServer(parameters map[strutil.CIString]string) *Server {
@@ -37,4 +35,8 @@ func (T *Server) Read(_ middleware.Context, packet fed.Packet) error {
 	return nil
 }
 
+func (T *Server) Write(_ middleware.Context, _ fed.Packet) error {
+	return nil
+}
+
 var _ middleware.Middleware = (*Server)(nil)
diff --git a/lib/middleware/middlewares/unterminate/unterminate.go b/lib/middleware/middlewares/unterminate/unterminate.go
index 3850e66740ccd6e626e20d45c9fd0337a6989a5c..036ed9d36754263325f804ef4d82f9cdf93e97b0 100644
--- a/lib/middleware/middlewares/unterminate/unterminate.go
+++ b/lib/middleware/middlewares/unterminate/unterminate.go
@@ -12,9 +12,7 @@ import (
 // Useful if you don't want to forward to the server and close the connection.
 var Unterminate = unterm{}
 
-type unterm struct {
-	middleware.Nil
-}
+type unterm struct{}
 
 func (unterm) Read(_ middleware.Context, packet fed.Packet) error {
 	if packet.Type() == packets.TypeTerminate {
@@ -23,4 +21,8 @@ func (unterm) Read(_ middleware.Context, packet fed.Packet) error {
 	return nil
 }
 
+func (unterm) Write(_ middleware.Context, _ fed.Packet) error {
+	return nil
+}
+
 var _ middleware.Middleware = unterm{}
diff --git a/lib/middleware/nil.go b/lib/middleware/nil.go
deleted file mode 100644
index 4d838bb0da1ec0cefce52015c3e5141d99d4532a..0000000000000000000000000000000000000000
--- a/lib/middleware/nil.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package middleware
-
-import "pggat/lib/fed"
-
-type Nil struct{}
-
-func (Nil) Read(_ Context, _ fed.Packet) error {
-	return nil
-}
-
-func (Nil) Write(_ Context, _ fed.Packet) error {
-	return nil
-}
-
-var _ Middleware = Nil{}