diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index ea8fd515be..1f497b2444 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -57,171 +57,15 @@ Actors:
 	Actor3: sbag
 		Location: 48,54
 		Owner: Neutral
-	Actor4: sbag
-		Location: 60,37
-		Owner: Neutral
-	Actor5: sbag
-		Location: 59,37
-		Owner: Neutral
-	Actor6: sbag
-		Location: 58,37
-		Owner: Neutral
-	Actor7: sbag
-		Location: 57,37
-		Owner: Neutral
-	Actor8: sbag
-		Location: 53,37
-		Owner: Neutral
-	Actor9: sbag
-		Location: 52,37
-		Owner: Neutral
-	Actor10: sbag
-		Location: 51,37
-		Owner: Neutral
-	Actor11: sbag
-		Location: 50,37
-		Owner: Neutral
-	Actor12: sbag
-		Location: 49,37
-		Owner: Neutral
-	Actor13: sbag
-		Location: 48,37
-		Owner: Neutral
-	Actor14: sbag
-		Location: 47,37
-		Owner: Neutral
-	Actor15: sbag
-		Location: 45,37
-		Owner: Neutral
-	Actor16: sbag
-		Location: 44,37
-		Owner: Neutral
-	Actor17: sbag
-		Location: 43,37
-		Owner: Neutral
-	Actor18: sbag
-		Location: 42,37
-		Owner: Neutral
-	Actor19: sbag
-		Location: 60,36
-		Owner: Neutral
-	Actor20: sbag
-		Location: 47,36
-		Owner: Neutral
-	Actor21: sbag
-		Location: 42,36
-		Owner: Neutral
-	Actor22: sbag
-		Location: 60,35
-		Owner: Neutral
-	Actor23: sbag
-		Location: 60,34
-		Owner: Neutral
-	Actor24: sbag
-		Location: 47,34
-		Owner: Neutral
-	Actor25: sbag
-		Location: 60,33
-		Owner: Neutral
-	Actor26: sbag
-		Location: 47,33
-		Owner: Neutral
-	Actor27: sbag
-		Location: 60,32
-		Owner: Neutral
-	Actor28: sbag
-		Location: 47,32
-		Owner: Neutral
-	Actor29: sbag
-		Location: 60,31
-		Owner: Neutral
-	Actor30: sbag
-		Location: 59,31
-		Owner: Neutral
-	Actor31: sbag
-		Location: 58,31
-		Owner: Neutral
-	Actor32: sbag
-		Location: 57,31
-		Owner: Neutral
-	Actor33: sbag
-		Location: 56,31
-		Owner: Neutral
-	Actor34: sbag
-		Location: 55,31
-		Owner: Neutral
-	Actor35: sbag
-		Location: 54,31
-		Owner: Neutral
-	Actor36: sbag
-		Location: 52,31
-		Owner: Neutral
-	Actor37: sbag
-		Location: 51,31
-		Owner: Neutral
-	Actor38: sbag
-		Location: 50,31
-		Owner: Neutral
-	Actor39: sbag
-		Location: 49,31
-		Owner: Neutral
-	Actor40: sbag
-		Location: 48,31
-		Owner: Neutral
-	Actor41: sbag
-		Location: 47,31
-		Owner: Neutral
 	Actor42: tc01
 		Location: 59,39
 		Owner: Neutral
-	Actor43: tc05
-		Location: 31,47
-		Owner: Neutral
-	Actor44: tc02
-		Location: 31,44
-		Owner: Neutral
 	Actor45: tc02
 		Location: 33,31
 		Owner: Neutral
-	Actor46: t01
-		Location: 32,31
-		Owner: Neutral
 	Actor47: tc02
 		Location: 55,44
 		Owner: Neutral
-	Actor48: tc02
-		Location: 31,37
-		Owner: Neutral
-	Actor49: tc04
-		Location: 37,34
-		Owner: Neutral
-	Actor50: tc05
-		Location: 31,34
-		Owner: Neutral
-	Actor51: t05
-		Location: 46,31
-		Owner: Neutral
-	Actor52: t06
-		Location: 43,35
-		Owner: Neutral
-	Actor53: t06
-		Location: 40,37
-		Owner: Neutral
-	Actor54: t07
-		Location: 41,36
-		Owner: Neutral
-	Actor55: t07
-		Location: 59,35
-		Owner: Neutral
-	Actor56: t07
-		Location: 48,31
-		Owner: Neutral
-	Actor57: t16
-		Location: 49,32
-		Owner: Neutral
-	Actor58: t17
-		Location: 49,31
-		Owner: Neutral
 	Actor59: tc01
 		Location: 58,31
 		Owner: Neutral
diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
index f2373ff22a..57b4922910 100644
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -69,18 +69,12 @@ Actors:
 	Actor7: t08
 		Location: 46,26
 		Owner: Neutral
-	Actor8: t08
-		Location: 48,23
-		Owner: Neutral
 	Actor9: t17
 		Location: 42,24
 		Owner: Neutral
 	Actor10: tc02
 		Location: 50,28
 		Owner: Neutral
-	Actor11: tc03
-		Location: 46,22
-		Owner: Neutral
 	Actor12: tc01
 		Location: 17,48
 		Owner: Neutral
@@ -156,9 +150,6 @@ Actors:
 	Actor36: t06
 		Location: 23,24
 		Owner: Neutral
-	Actor37: t06
-		Location: 3,23
-		Owner: Neutral
 	Actor38: t07
 		Location: 12,35
 		Owner: Neutral
@@ -428,7 +419,7 @@ Actors:
 		Location: 25,58
 		Owner: Neutral
 	NodHeliEntry: waypoint
-		Location: 41,23
+		Location: 41,24
 		Owner: Neutral
 	NodHeliLZ1: waypoint
 		Location: 31,39
@@ -449,7 +440,7 @@ Actors:
 		Location: 11,51
 		Owner: Neutral
 	GDIHeliEntry: waypoint
-		Location: 34,60
+		Location: 34,59
 		Owner: Neutral
 	GDIHeliLZ: waypoint
 		Location: 27,58
diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml
index fea7ab0c26..5c1a4ecca7 100644
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -499,7 +499,7 @@ Actors:
 		Location: 14,13
 		Owner: Neutral
 	HeliEntry: waypoint
-		Location: 4,26
+		Location: 5,26
 		Owner: Neutral
 	GDIHeliLZ: waypoint
 		Location: 8,14
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index 2f89566554..8df370de35 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -144,30 +144,6 @@ Actors:
 	Actor16: t08
 		Location: 55,37
 		Owner: Neutral
-	Actor17: t08
-		Location: 30,51
-		Owner: Neutral
-	Actor18: t08
-		Location: 58,53
-		Owner: Neutral
-	Actor19: t08
-		Location: 43,56
-		Owner: Neutral
-	Actor20: rock1
-		Location: 24,58
-		Owner: Neutral
-	Actor21: t08
-		Location: 52,58
-		Owner: Neutral
-	Actor22: rock1
-		Location: 55,58
-		Owner: Neutral
-	Actor23: t08
-		Location: 29,59
-		Owner: Neutral
-	Actor24: rock2
-		Location: 31,61
-		Owner: Neutral
 	Actor27: jeep
 		Location: 31,28
 		Owner: GDI
diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml
index 74e0b1dbbb..4513ac7cd3 100644
--- a/mods/cnc/maps/nod02b/map.yaml
+++ b/mods/cnc/maps/nod02b/map.yaml
@@ -138,9 +138,6 @@ Actors:
 		Location: 7,40
 		Owner: GDI
 		SubCell: 2
-	waypoint27: waypoint
-		Location: 60,61
-		Owner: Neutral
 	waypoint26: waypoint
 		Location: 26,41
 		Owner: Neutral