diff --git a/classes/deck/deck.gd b/classes/deck/deck.gd
index 7426da5..c22ac10 100644
--- a/classes/deck/deck.gd
+++ b/classes/deck/deck.gd
@@ -110,10 +110,10 @@ func remove_node(uuid: String, remove_connections: bool = false) -> void:
 	if remove_connections:
 		var outgoing_connections := node.outgoing_connections.duplicate(true)
 
-		# FIXME: rework this to account for new outgoing connections format
 		for output_port: int in outgoing_connections:
-			for connection: Dictionary in outgoing_connections[output_port]:
-				disconnect_nodes(uuid, connection.keys()[0], output_port, connection.values()[0])
+			for to_node: String in outgoing_connections[output_port]:
+				for to_port: int in outgoing_connections[output_port][to_node]:
+					disconnect_nodes(uuid, to_node, output_port, to_port)
 
 		var incoming_connections := node.incoming_connections.duplicate(true)