diff --git a/src/gateware/cxp_pipeline.py b/src/gateware/cxp_pipeline.py
index c0c5704..01eb2b8 100644
--- a/src/gateware/cxp_pipeline.py
+++ b/src/gateware/cxp_pipeline.py
@@ -201,7 +201,7 @@ class Trigger_ACK_Inserter(Module):
 
 
 @FullMemoryWE()
-class Control_Packet_Writer(Module, AutoCSR):
+class Control_Packet_Writer(Module):
     def __init__(self):
         self.word_len = Signal(log2_int(buffer_depth))
         self.stb = Signal()
@@ -547,7 +547,7 @@ class Control_Packet_Reader(Module):
             NextState("IDLE"),
         )
 
-class Trigger_Ack_Checker(Module, AutoCSR):
+class Trigger_Ack_Checker(Module):
     def __init__(self):
         self.sink = stream.Endpoint(word_layout_dchar)
         self.source = stream.Endpoint(word_layout_dchar)