diff --git a/src/daemon/daemon-config.c b/src/daemon/daemon-config.c
index bcc09ac3d..877fe5d95 100644
--- a/src/daemon/daemon-config.c
+++ b/src/daemon/daemon-config.c
@@ -87,9 +87,9 @@ struct pw_daemon_config *pw_daemon_config_new(void)
  */
 void pw_daemon_config_free(struct pw_daemon_config *config)
 {
-	struct pw_command *cmd, *tmp;
+	struct pw_command *cmd;
 
-	spa_list_for_each_safe(cmd, tmp, &config->commands, link)
+	spa_list_consume(cmd, &config->commands, link)
 		pw_command_free(cmd);
 
 	free(config);
@@ -184,7 +184,7 @@ int pw_daemon_config_run_commands(struct pw_daemon_config *config, struct pw_cor
 {
 	char *err = NULL;
 	int ret = 0;
-	struct pw_command *command, *tmp;
+	struct pw_command *command;
 
 	spa_list_for_each(command, &config->commands, link) {
 		if ((ret = pw_command_run(command, core, &err)) < 0) {
@@ -194,7 +194,7 @@ int pw_daemon_config_run_commands(struct pw_daemon_config *config, struct pw_cor
 		}
 	}
 
-	spa_list_for_each_safe(command, tmp, &config->commands, link)
+	spa_list_consume(command, &config->commands, link)
 		pw_command_free(command);
 
 	return ret;
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index 56775376f..e5c1fcb30 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -156,9 +156,9 @@ core_global_removed(void *data, struct pw_global *global)
 static void module_destroy(void *data)
 {
 	struct impl *impl = data;
-	struct node_info *info, *t;
+	struct node_info *info;
 
-	spa_list_for_each_safe(info, t, &impl->node_list, link)
+	spa_list_consume(info, &impl->node_list, link)
 		node_info_free(info);
 
 	spa_hook_remove(&impl->core_listener);
diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c
index 560089a7c..318116050 100644
--- a/src/modules/spa/module-node-factory.c
+++ b/src/modules/spa/module-node-factory.c
@@ -136,11 +136,11 @@ static const struct pw_factory_implementation factory_impl = {
 static void factory_destroy(void *_data)
 {
 	struct factory_data *data = _data;
-	struct node_data *nd, *t;
+	struct node_data *nd;
 
 	spa_hook_remove(&data->module_listener);
 
-	spa_list_for_each_safe(nd, t, &data->node_list, link)
+	spa_list_consume(nd, &data->node_list, link)
 		pw_node_destroy(nd->node);
 
 	if (data->properties)
diff --git a/src/pipewire/control.c b/src/pipewire/control.c
index 1c8873db0..97d43e8a8 100644
--- a/src/pipewire/control.c
+++ b/src/pipewire/control.c
@@ -85,14 +85,14 @@ pw_control_new(struct pw_core *core,
 void pw_control_destroy(struct pw_control *control)
 {
 	struct impl *impl = SPA_CONTAINER_OF(control, struct impl, this);
-	struct pw_control *other, *tmp;
+	struct pw_control *other;
 
 	pw_log_debug("control %p: destroy", control);
 
 	pw_control_events_destroy(control);
 
 	if (control->direction == SPA_DIRECTION_OUTPUT) {
-		spa_list_for_each_safe(other, tmp, &control->inputs, inputs_link)
+		spa_list_consume(other, &control->inputs, inputs_link)
 			pw_control_unlink(control, other);
 	}
 	else {
diff --git a/src/pipewire/node.c b/src/pipewire/node.c
index 0a752a0e0..ad6acccc9 100644
--- a/src/pipewire/node.c
+++ b/src/pipewire/node.c
@@ -644,14 +644,10 @@ void pw_node_destroy(struct pw_node *node)
 		pw_port_unlink(port);
 
 	pw_log_debug("node %p: destroy ports", node);
-	spa_list_consume(port, &node->input_ports, link) {
-		pw_node_events_port_removed(node, port);
+	spa_list_consume(port, &node->input_ports, link)
 		pw_port_destroy(port);
-	}
-	spa_list_consume(port, &node->output_ports, link) {
-		pw_node_events_port_removed(node, port);
+	spa_list_consume(port, &node->output_ports, link)
 		pw_port_destroy(port);
-	}
 
 	if (node->global) {
 		spa_hook_remove(&node->global_listener);
diff --git a/src/pipewire/port.c b/src/pipewire/port.c
index ab4642c38..7d480a82a 100644
--- a/src/pipewire/port.c
+++ b/src/pipewire/port.c
@@ -487,14 +487,14 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
 
 void pw_port_unlink(struct pw_port *port)
 {
-	struct pw_link *l, *t;
+	struct pw_link *l;
 
 	if (port->direction == PW_DIRECTION_OUTPUT) {
-		spa_list_for_each_safe(l, t, &port->links, output_link)
+		spa_list_consume(l, &port->links, output_link)
 			pw_link_destroy(l);
 	}
 	else {
-		spa_list_for_each_safe(l, t, &port->links, input_link)
+		spa_list_consume(l, &port->links, input_link)
 			pw_link_destroy(l);
 	}
 }