diff --git a/api/lua/pinnacle/output.lua b/api/lua/pinnacle/output.lua
index ff0e90b..6e802b8 100644
--- a/api/lua/pinnacle/output.lua
+++ b/api/lua/pinnacle/output.lua
@@ -159,11 +159,9 @@ function output.connect_for_all(callback)
         callback(handle)
     end
 
-    client.server_streaming_request(build_grpc_request_params("ConnectForAll", {}), function(response)
-        local output_name = response.output_name
-        local handle = output_handle.new(output_name)
-        callback(handle)
-    end)
+    output.connect_signal({
+        connect = callback,
+    })
 end
 
 ---@class OutputSignal
diff --git a/api/lua/pinnacle/signal.lua b/api/lua/pinnacle/signal.lua
index 4ed7110..c876ae1 100644
--- a/api/lua/pinnacle/signal.lua
+++ b/api/lua/pinnacle/signal.lua
@@ -186,7 +186,7 @@ end
 ---@param callback fun(response: table)
 function signal.connect(request, callback)
     local stream = client.bidirectional_streaming_request(
-        build_grpc_request_params("Layout", {
+        build_grpc_request_params(request, {
             control = stream_control.READY,
         }),
         function(response)
diff --git a/api/protocol/pinnacle/output/v0alpha1/output.proto b/api/protocol/pinnacle/output/v0alpha1/output.proto
index 620551b..8f2bc49 100644
--- a/api/protocol/pinnacle/output/v0alpha1/output.proto
+++ b/api/protocol/pinnacle/output/v0alpha1/output.proto
@@ -10,11 +10,6 @@ message SetLocationRequest {
   optional int32 y = 3;
 }
 
-message ConnectForAllRequest {}
-message ConnectForAllResponse {
-  optional string output_name = 1;
-}
-
 message GetRequest {}
 message GetResponse {
   repeated string output_names = 1;
@@ -41,7 +36,6 @@ message GetPropertiesResponse {
 
 service OutputService {
   rpc SetLocation(SetLocationRequest) returns (google.protobuf.Empty);
-  rpc ConnectForAll(ConnectForAllRequest) returns (stream ConnectForAllResponse);
   rpc Get(GetRequest) returns (GetResponse);
   rpc GetProperties(GetPropertiesRequest) returns (GetPropertiesResponse);
 }
diff --git a/api/protocol/pinnacle/signal/v0alpha1/signal.proto b/api/protocol/pinnacle/signal/v0alpha1/signal.proto
index c1da727..4a0150a 100644
--- a/api/protocol/pinnacle/signal/v0alpha1/signal.proto
+++ b/api/protocol/pinnacle/signal/v0alpha1/signal.proto
@@ -2,8 +2,6 @@ syntax = "proto2";
 
 package pinnacle.signal.v0alpha1;
 
-import "google/protobuf/empty.proto";
-
 enum StreamControl {
   STREAM_CONTROL_UNSPECIFIED = 0;
   // The client is ready to receive the next signal.
diff --git a/src/api.rs b/src/api.rs
index d91f610..7ed2142 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -12,9 +12,7 @@ use pinnacle_api_defs::pinnacle::{
     },
     output::{
         self,
-        v0alpha1::{
-            output_service_server, ConnectForAllRequest, ConnectForAllResponse, SetLocationRequest,
-        },
+        v0alpha1::{output_service_server, SetLocationRequest},
     },
     process::v0alpha1::{process_service_server, SetEnvRequest, SpawnRequest, SpawnResponse},
     tag::{
@@ -944,8 +942,6 @@ impl OutputService {
 
 #[tonic::async_trait]
 impl output_service_server::OutputService for OutputService {
-    type ConnectForAllStream = ResponseStream<ConnectForAllResponse>;
-
     async fn set_location(
         &self,
         request: Request<SetLocationRequest>,
@@ -997,18 +993,6 @@ impl output_service_server::OutputService for OutputService {
         .await
     }
 
-    // TODO: remove this and integrate it into a signal/event system
-    async fn connect_for_all(
-        &self,
-        _request: Request<ConnectForAllRequest>,
-    ) -> Result<Response<Self::ConnectForAllStream>, Status> {
-        tracing::trace!("OutputService.connect_for_all");
-
-        run_server_streaming(&self.sender, move |state, sender| {
-            state.config.output_callback_senders.push(sender);
-        })
-    }
-
     async fn get(
         &self,
         _request: Request<output::v0alpha1::GetRequest>,
diff --git a/src/backend/udev.rs b/src/backend/udev.rs
index e4339ab..d014ab4 100644
--- a/src/backend/udev.rs
+++ b/src/backend/udev.rs
@@ -8,9 +8,7 @@ use std::{
 };
 
 use anyhow::Context;
-use pinnacle_api_defs::pinnacle::{
-    output::v0alpha1::ConnectForAllResponse, signal::v0alpha1::OutputConnectResponse,
-};
+use pinnacle_api_defs::pinnacle::signal::v0alpha1::OutputConnectResponse;
 use smithay::{
     backend::{
         allocator::{
@@ -985,13 +983,6 @@ impl State {
 
             output.with_state(|state| state.tags = tags.clone());
         } else {
-            // Run any output callbacks
-            for sender in self.config.output_callback_senders.iter() {
-                let _ = sender.send(Ok(ConnectForAllResponse {
-                    output_name: Some(output.name()),
-                }));
-            }
-
             self.signal_state.output_connect.signal(|buffer| {
                 buffer.push_back(OutputConnectResponse {
                     output_name: Some(output.name()),
diff --git a/src/config.rs b/src/config.rs
index ebedc1c..99a6a7d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -17,7 +17,7 @@ use std::{
 use anyhow::Context;
 use pinnacle_api_defs::pinnacle::{
     input::v0alpha1::input_service_server::InputServiceServer,
-    output::v0alpha1::{output_service_server::OutputServiceServer, ConnectForAllResponse},
+    output::v0alpha1::output_service_server::OutputServiceServer,
     process::v0alpha1::process_service_server::ProcessServiceServer,
     signal::v0alpha1::signal_service_server::SignalServiceServer,
     tag::v0alpha1::tag_service_server::TagServiceServer,
@@ -30,7 +30,7 @@ use smithay::{
     utils::{Logical, Point},
 };
 use sysinfo::ProcessRefreshKind;
-use tokio::{sync::mpsc::UnboundedSender, task::JoinHandle};
+use tokio::task::JoinHandle;
 use toml::Table;
 
 use xdg::BaseDirectories;
@@ -166,7 +166,6 @@ pub enum Key {
 pub struct Config {
     /// Window rules and conditions on when those rules should apply
     pub window_rules: Vec<(WindowRuleCondition, WindowRule)>,
-    pub output_callback_senders: Vec<UnboundedSender<Result<ConnectForAllResponse, tonic::Status>>>,
     /// Saved states when outputs are disconnected
     pub connector_saved_states: HashMap<OutputName, ConnectorSavedState>,
 
@@ -177,7 +176,6 @@ pub struct Config {
 impl Config {
     pub fn clear(&mut self, loop_handle: &LoopHandle<State>) {
         self.window_rules.clear();
-        self.output_callback_senders.clear();
         self.connector_saved_states.clear();
         if let Some(join_handle) = self.config_join_handle.take() {
             join_handle.abort();