diff --git a/src/outputs.c b/src/outputs.c
index a6d62df0..06557a8d 100644
--- a/src/outputs.c
+++ b/src/outputs.c
@@ -34,7 +34,6 @@
 #include "logger.h"
 #include "misc.h"
 #include "transcode.h"
-#include "listener.h"
 #include "db.h"
 #include "player.h" //TODO remove me when player_pmap is removed again
 #include "worker.h"
@@ -683,14 +682,6 @@ outputs_cb(int callback_id, uint64_t device_id, enum output_device_state state)
   event_active(outputs_deferredev, 0, 0);
 }
 
-// Maybe not so great, seems it would be better if integrated into the callback
-// mechanism so that the notifications where at least deferred
-void
-outputs_listener_notify(void)
-{
-  listener_notify(LISTENER_SPEAKER);
-}
-
 
 /* ---------------------------- Called by player ---------------------------- */
 
diff --git a/src/outputs.h b/src/outputs.h
index 26b01809..2585298c 100644
--- a/src/outputs.h
+++ b/src/outputs.h
@@ -275,9 +275,6 @@ outputs_quality_unsubscribe(struct media_quality *quality);
 void
 outputs_cb(int callback_id, uint64_t device_id, enum output_device_state);
 
-void
-outputs_listener_notify(void);
-
 /* ---------------------------- Called by player ---------------------------- */
 
 int
diff --git a/src/outputs/raop.c b/src/outputs/raop.c
index 87cd461d..35fe7be9 100644
--- a/src/outputs/raop.c
+++ b/src/outputs/raop.c
@@ -1755,10 +1755,6 @@ raop_status(struct raop_session *rs)
 
   outputs_cb(rs->callback_id, rs->device_id, state);
   rs->callback_id = -1;
-
-  // Ugly... fixme...
-  if (rs->state == RAOP_STATE_UNVERIFIED)
-    outputs_listener_notify();
 }
 
 static struct raop_master_session *
@@ -4203,8 +4199,6 @@ raop_cb_verification_verify_step2(struct evrtsp_request *req, void *arg)
 
   raop_send_req_options(rs, raop_cb_startup_options, "verify_step2");
 
-  outputs_listener_notify();
-
   return;
 
  error: