diff --git a/main_shared/maps/mp/bots/_wp_editor.gsc b/main_shared/maps/mp/bots/_wp_editor.gsc
index 829a792..3e9d5fe 100644
--- a/main_shared/maps/mp/bots/_wp_editor.gsc
+++ b/main_shared/maps/mp/bots/_wp_editor.gsc
@@ -413,6 +413,12 @@ DeleteAllWaypoints()
 {
 	level.waypoints = [];
 	level.waypointCount = 0;
+	level.waypointsKDTree = WaypointsToKDTree();
+	
+	level.waypointsCamp = [];
+	level.waypointsTube = [];
+	level.waypointsGren = [];
+	level.waypointsClay = [];
 	
 	self iprintln("DelAllWps");
 }
@@ -584,9 +590,7 @@ destroyOnDeath(hud)
 {
 	hud endon("death");
 	self waittill_either("death","disconnect");
-	hud notify("death");
 	hud destroy();
-	hud = undefined;
 }
 
 textScroll(string)