diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index b022527094d..1f3aa1355cd 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -17,7 +17,7 @@
 		if((T.z in config.station_levels))
 			pick_turfs += T
 
-	for(var/i = 1, i <= number_of_wormholes, i++)
+	for(var/i in 1 to number_of_wormholes)
 		var/turf/T = pick(pick_turfs)
 		wormholes += new /obj/effect/portal/wormhole(T, null, null, -1)
 
@@ -31,9 +31,8 @@
 			if(T)	O.loc = T
 
 /datum/event/wormholes/end()
-	portals.Remove(wormholes)
 	for(var/obj/effect/portal/wormhole/O in wormholes)
-		O.loc = null
+		qdel(O)
 	wormholes.Cut()