diff --git a/buf.yaml b/buf.yaml
index ff59172..a261df2 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,19 +1,10 @@
 version: v2
 modules:
-  - path: roadrunner/api
-  - path: third_party/api
+    - path: roadrunner/api
+    - path: third_party/api
 lint:
-  except:
-    # RR plugin RPCs share request/response types across methods (e.g. all
-    # LockService RPCs use LockRequest/LockResponse) and use domain-object
-    # names rather than the <Method>Request/<Method>Response convention.
-    - RPC_REQUEST_RESPONSE_UNIQUE
-    - RPC_REQUEST_STANDARD_NAME
-    - RPC_RESPONSE_STANDARD_NAME
-    # ServiceManager (service plugin RPC service) intentionally drops the
-    # "Service" suffix for readability.
-    - SERVICE_SUFFIX
-  ignore:
-    - third_party/api
-    - roadrunner/api/centrifugo/api
-    - roadrunner/api/centrifugo/proxy
+    disallow_comment_ignores: true
+    ignore:
+        - third_party/api
+        - roadrunner/api/centrifugo/api
+        - roadrunner/api/centrifugo/proxy
diff --git a/roadrunner/api/applogger/v2/service.proto b/roadrunner/api/applogger/v2/service.proto
index 5747961..162e530 100644
--- a/roadrunner/api/applogger/v2/service.proto
+++ b/roadrunner/api/applogger/v2/service.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package applogger.v2;
 
-import "applogger/v2/applogger.proto";
-
 option go_package = "github.com/roadrunner-server/api-go/v6/applogger/v2;apploggerV2";
 option php_metadata_namespace = "RoadRunner\\AppLogger\\DTO\\V2\\GPBMetadata";
 option php_namespace = "RoadRunner\\AppLogger\\DTO\\V2";
@@ -13,16 +11,3 @@ option php_namespace = "RoadRunner\\AppLogger\\DTO\\V2";
 message LogMessage {
   string message = 1;
 }
-
-service AppLoggerService {
-  rpc Error(LogMessage) returns (LogResponse);
-  rpc ErrorWithContext(LogEntry) returns (LogResponse);
-  rpc Info(LogMessage) returns (LogResponse);
-  rpc InfoWithContext(LogEntry) returns (LogResponse);
-  rpc Warning(LogMessage) returns (LogResponse);
-  rpc WarningWithContext(LogEntry) returns (LogResponse);
-  rpc Debug(LogMessage) returns (LogResponse);
-  rpc DebugWithContext(LogEntry) returns (LogResponse);
-  rpc Log(LogMessage) returns (LogResponse);
-  rpc LogWithContext(LogEntry) returns (LogResponse);
-}
diff --git a/roadrunner/api/centrifugo/api/v1/api.proto b/roadrunner/api/centrifugo/api/v1/api.proto
index 29f20f0..6a4db79 100644
--- a/roadrunner/api/centrifugo/api/v1/api.proto
+++ b/roadrunner/api/centrifugo/api/v1/api.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package centrifugal.centrifugo.api;
 
-option go_package = "centrifugo/api/v1";
+option go_package = "github.com/roadrunner-server/api-go/v6/centrifugo/api/v1;apiV1";
 option php_metadata_namespace = "RoadRunner\\Centrifugal\\API\\DTO\\V1\\GPBMetadata";
 option php_namespace = "RoadRunner\\Centrifugal\\API\\DTO\\V1";
 
diff --git a/roadrunner/api/centrifugo/proxy/v1/proxy.proto b/roadrunner/api/centrifugo/proxy/v1/proxy.proto
index 8cbbb89..2490552 100644
--- a/roadrunner/api/centrifugo/proxy/v1/proxy.proto
+++ b/roadrunner/api/centrifugo/proxy/v1/proxy.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package centrifugal.centrifugo.proxy;
 
-option go_package = "centrifugo/proxy/v1";
+option go_package = "github.com/roadrunner-server/api-go/v6/centrifugo/proxy/v1;proxyV1";
 option php_metadata_namespace = "RoadRunner\\Centrifugal\\Proxy\\DTO\\V1\\GPBMetadata";
 option php_namespace = "RoadRunner\\Centrifugal\\Proxy\\DTO\\V1";
 
diff --git a/roadrunner/api/http/v2/service.proto b/roadrunner/api/http/v2/service.proto
deleted file mode 100644
index 5074293..0000000
--- a/roadrunner/api/http/v2/service.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package http.v2;
-
-import "google/protobuf/empty.proto";
-import "http/v2/request.proto";
-import "http/v2/response.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/http/v2;httpV2";
-option php_metadata_namespace = "RoadRunner\\HTTP\\DTO\\V2\\GPBMetadata";
-option php_namespace = "RoadRunner\\HTTP\\DTO\\V2";
-
-service HttpProxyService {
-  rpc FetchRequest(google.protobuf.Empty) returns (HttpHandlerRequest);
-  rpc StreamRequest(google.protobuf.Empty) returns (stream HttpHandlerRequest);
-  rpc FetchRequests(HttpHandlerFetchRequest) returns (HttpHandlerRequests);
-  rpc SendResponse(HttpHandlerResponse) returns (google.protobuf.Empty);
-  rpc StreamResponse(stream HttpHandlerResponse) returns (google.protobuf.Empty);
-}
diff --git a/roadrunner/api/informer/v1/service.proto b/roadrunner/api/informer/v1/service.proto
index 75e53e3..4ce56bd 100644
--- a/roadrunner/api/informer/v1/service.proto
+++ b/roadrunner/api/informer/v1/service.proto
@@ -65,19 +65,3 @@ message RemoveWorkerRequest {
 message Response {
   bool ok = 1;
 }
-
-// InformerService exposes introspection RPCs for plugins that manage workers
-// (jobs, service, kv, etc.) and lets callers add or remove workers at runtime.
-service InformerService {
-  rpc ListPlugins(ListPluginsRequest) returns (PluginsList) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc GetWorkers(GetWorkersRequest) returns (WorkersList) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc GetJobs(GetJobsRequest) returns (JobsList) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc AddWorker(AddWorkerRequest) returns (Response);
-  rpc RemoveWorker(RemoveWorkerRequest) returns (Response);
-}
diff --git a/roadrunner/api/jobs/v2/service.proto b/roadrunner/api/jobs/v2/service.proto
deleted file mode 100644
index a0c41dc..0000000
--- a/roadrunner/api/jobs/v2/service.proto
+++ /dev/null
@@ -1,23 +0,0 @@
-syntax = "proto3";
-
-package jobs.v2;
-
-import "google/protobuf/empty.proto";
-import "jobs/v2/jobs.proto";
-import "jobs/v2/request.proto";
-import "jobs/v2/response.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/jobs/v2;jobsV2";
-option php_metadata_namespace = "RoadRunner\\Jobs\\DTO\\V2\\GPBMetadata";
-option php_namespace = "RoadRunner\\Jobs\\DTO\\V2";
-
-service JobsService {
-  rpc Push(PushRequest) returns (JobsHandlerResponse);
-  rpc PushBatch(PushBatchRequest) returns (JobsHandlerResponse);
-  rpc Pause(Pipelines) returns (JobsHandlerResponse);
-  rpc Resume(Pipelines) returns (JobsHandlerResponse);
-  rpc List(google.protobuf.Empty) returns (Pipelines);
-  rpc Declare(DeclareRequest) returns (JobsHandlerResponse);
-  rpc Destroy(Pipelines) returns (Pipelines);
-  rpc GetStats(google.protobuf.Empty) returns (Stats);
-}
diff --git a/roadrunner/api/kv/v2/service.proto b/roadrunner/api/kv/v2/service.proto
deleted file mode 100644
index fff04b2..0000000
--- a/roadrunner/api/kv/v2/service.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-package kv.v2;
-
-import "kv/v2/request.proto";
-import "kv/v2/response.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/kv/v2;kvV2";
-option php_metadata_namespace = "RoadRunner\\KV\\DTO\\V2\\GPBMetadata";
-option php_namespace = "RoadRunner\\KV\\DTO\\V2";
-
-service KvService {
-  rpc Has(KvRequest) returns (KvResponse) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc Set(KvRequest) returns (KvResponse);
-  rpc MGet(KvRequest) returns (KvResponse) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc MExpire(KvRequest) returns (KvResponse);
-  rpc TTL(KvRequest) returns (KvResponse) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc Delete(KvRequest) returns (KvResponse);
-  rpc Clear(KvRequest) returns (KvResponse);
-}
diff --git a/roadrunner/api/lock/v1/service.proto b/roadrunner/api/lock/v1/service.proto
deleted file mode 100644
index dedcec5..0000000
--- a/roadrunner/api/lock/v1/service.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-package lock.v1;
-
-import "lock/v1/lock.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/lock/v1;lockV1";
-option php_metadata_namespace = "RoadRunner\\Lock\\DTO\\V1\\GPBMetadata";
-option php_namespace = "RoadRunner\\Lock\\DTO\\V1";
-
-service LockService {
-  rpc Lock(LockRequest) returns (LockResponse);
-  rpc LockRead(LockRequest) returns (LockResponse);
-  rpc Release(LockRequest) returns (LockResponse);
-  rpc ForceRelease(LockRequest) returns (LockResponse);
-  rpc Exists(LockRequest) returns (LockResponse) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc UpdateTTL(LockRequest) returns (LockResponse);
-}
diff --git a/roadrunner/api/metrics/v1/service.proto b/roadrunner/api/metrics/v1/service.proto
index 413be87..438ec8f 100644
--- a/roadrunner/api/metrics/v1/service.proto
+++ b/roadrunner/api/metrics/v1/service.proto
@@ -66,15 +66,3 @@ message UnregisterRequest {
 message Response {
   bool ok = 1;
 }
-
-// MetricsService exposes runtime metric mutation. All methods are write-side;
-// scraping happens on the separate Prometheus HTTP endpoint configured under
-// `metrics.address` and is not part of this RPC surface.
-service MetricsService {
-  rpc Add(AddRequest)               returns (Response);
-  rpc Sub(SubRequest)               returns (Response);
-  rpc Observe(ObserveRequest)       returns (Response);
-  rpc Set(SetRequest)               returns (Response);
-  rpc Declare(DeclareRequest)       returns (Response);
-  rpc Unregister(UnregisterRequest) returns (Response);
-}
diff --git a/roadrunner/api/resetter/v1/service.proto b/roadrunner/api/resetter/v1/service.proto
index e1d5b66..b80d5eb 100644
--- a/roadrunner/api/resetter/v1/service.proto
+++ b/roadrunner/api/resetter/v1/service.proto
@@ -18,13 +18,3 @@ message ResetRequest {
 message Response {
   bool ok = 1;
 }
-
-// ResetterService exposes the runtime reset surface for plugins that opt into
-// the resetter contract (jobs, service, etc.). Listing is read-only; Reset
-// triggers a per-plugin lifecycle reset.
-service ResetterService {
-  rpc ListPlugins(ListPluginsRequest) returns (PluginsList) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc Reset(ResetRequest) returns (Response);
-}
diff --git a/roadrunner/api/service/v1/service_rpc.proto b/roadrunner/api/service/v1/service_rpc.proto
deleted file mode 100644
index 63f465b..0000000
--- a/roadrunner/api/service/v1/service_rpc.proto
+++ /dev/null
@@ -1,27 +0,0 @@
-syntax = "proto3";
-
-package service.v1;
-
-import "service/v1/service.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/service/v1;serviceV1";
-option php_metadata_namespace = "RoadRunner\\Service\\DTO\\V1\\GPBMetadata";
-option php_namespace = "RoadRunner\\Service\\DTO\\V1";
-
-// ServiceManager exposes lifecycle and status RPCs for the service plugin.
-// RPC method names are prefixed (CreateService, GetStatus, …) to avoid
-// collisions with same-named messages in this package (Create, Status, …).
-service ServiceManager {
-  rpc CreateService(Create) returns (Response);
-  rpc Terminate(Service) returns (Response);
-  rpc Restart(Service) returns (Response);
-  rpc GetStatus(Service) returns (Status) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc GetStatuses(Service) returns (Statuses) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-  rpc ListServices(Service) returns (List) {
-    option idempotency_level = NO_SIDE_EFFECTS;
-  }
-}
diff --git a/roadrunner/api/status/v2/service.proto b/roadrunner/api/status/v2/service.proto
deleted file mode 100644
index 22a97f6..0000000
--- a/roadrunner/api/status/v2/service.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-package status.v2;
-
-import "status/v2/request.proto";
-import "status/v2/response.proto";
-
-option go_package = "github.com/roadrunner-server/api-go/v6/status/v2;statusV2";
-option php_metadata_namespace = "RoadRunner\\Status\\DTO\\V2\\GPBMetadata";
-option php_namespace = "RoadRunner\\Status\\DTO\\V2";
-
-service StatusService {
-  rpc Status(StatusRequest) returns (StatusResponse);
-  rpc Ready(StatusRequest) returns (StatusResponse);
-}
diff --git a/roadrunner/api/tcp/v1/service.proto b/roadrunner/api/tcp/v1/service.proto
index 429d44e..4d22a54 100644
--- a/roadrunner/api/tcp/v1/service.proto
+++ b/roadrunner/api/tcp/v1/service.proto
@@ -13,9 +13,3 @@ message CloseRequest {
 message Response {
   bool ok = 1;
 }
-
-// TCPService exposes runtime control over open TCP connections handled by the
-// tcp plugin. Close terminates a single connection identified by its UUID.
-service TCPService {
-  rpc Close(CloseRequest) returns (Response);
-}