diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c
index 707dc09..17cbda7 100644
--- a/libdleyna/renderer/upnp.c
+++ b/libdleyna/renderer/upnp.c
@@ -45,7 +45,6 @@ struct dlr_upnp_t_ {
 	void *user_data;
 	GHashTable *server_udn_map;
 	GHashTable *server_uc_map;
-	GList *cps;
 	dlr_host_service_t *host_service;
 };
 
@@ -353,7 +352,6 @@ static void prv_on_context_available(GUPnPContextManager *context_manager,
 
 	gssdp_resource_browser_set_active(GSSDP_RESOURCE_BROWSER(cp), TRUE);
 	gupnp_context_manager_manage_control_point(upnp->context_manager, cp);
-	upnp->cps = g_list_prepend (upnp->cps, g_object_ref (cp));
 	g_object_unref(cp);
 }
 
@@ -392,28 +390,10 @@ dlr_upnp_t *dlr_upnp_new(dleyna_connector_id_t connection,
 void dlr_upnp_delete(dlr_upnp_t *upnp)
 {
 	if (upnp) {
-		GList *l;
-
-		for (l = upnp->cps; l != NULL; l = l->next) {
-			GUPnPControlPoint *cp = GUPNP_CONTROL_POINT (l->data);
-
-			g_signal_handlers_disconnect_by_func (cp,
-							      prv_server_available_cb,
-							      upnp);
-			g_signal_handlers_disconnect_by_func (cp,
-							      prv_server_unavailable_cb,
-							      upnp);
-		}
-
-		g_signal_handlers_disconnect_by_func (upnp->context_manager,
-						      prv_on_context_available,
-						      upnp);
-
 		dlr_host_service_delete(upnp->host_service);
 		g_object_unref(upnp->context_manager);
 		g_hash_table_unref(upnp->server_udn_map);
 		g_hash_table_unref(upnp->server_uc_map);
-		g_list_free_full (upnp->cps, g_object_unref);
 
 		g_free(upnp);
 	}