diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index 71755e4144..3701e0196a 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -823,17 +823,9 @@ Rules:
 			Amount: -10
 		-Capturable:
 	HQ:
-		Buildable:
-			Prerequisites: ~disabled
-	NOHQ:
-		Inherits: HQ
-		Buildable:
-			Prerequisites: proc
 		Tooltip:
 			Description: Provides an overview of the battlefield.\n  Requires power to operate.
 		-AirstrikePower:
-		RenderBuilding:
-			Image: hq
 	airstrike.proxy:
 		AirstrikePower:
 			Icon: airstrike
diff --git a/mods/cnc/maps/gdi05b/map.bin b/mods/cnc/maps/gdi05b/map.bin
index 3462de6bff..00085d0dfa 100644
Binary files a/mods/cnc/maps/gdi05b/map.bin and b/mods/cnc/maps/gdi05b/map.bin differ
diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml
index 16ab696b87..ccd0f2192a 100644
--- a/mods/cnc/maps/gdi05b/map.yaml
+++ b/mods/cnc/maps/gdi05b/map.yaml
@@ -720,13 +720,13 @@ Rules:
 			Prerequisites: ~disabled
 	GUN:
 		Buildable:
-			Prerequisites: ~disabled	
+			Prerequisites: ~disabled
 	OBLI:
 		Buildable:
-			Prerequisites: ~disabled	
+			Prerequisites: ~disabled
 	TMPL:
 		Buildable:
-			Prerequisites: ~disabled	
+			Prerequisites: ~disabled
 	E2:
 		Buildable:
 			Prerequisites: ~pyle
@@ -771,7 +771,7 @@ Rules:
 			DisplayBeacon: True
 			BeaconPoster: airstrike
 			DisplayRadarPing: True
-			CameraActor: camera			
+			CameraActor: camera
 
 Sequences:
 
diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml
index e8869abbe8..cb756333a9 100644
--- a/mods/cnc/maps/nod02a/map.yaml
+++ b/mods/cnc/maps/nod02a/map.yaml
@@ -20,9 +20,9 @@ Type: Campaign
 
 Videos:
 	Briefing: nod2.vqa
-	GameLost: deskill.vqa
-	GameWon: airstrk.vqa
 	GameStart: seige.vqa
+	GameWon: airstrk.vqa
+	GameLost: deskill.vqa
 
 Options:
 	Crates: False
@@ -39,7 +39,7 @@ Players:
 	PlayerReference@GDI:
 		Name: GDI
 		Race: gdi
-		ColorRamp: 31,222,183		
+		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
 		Name: Nod
@@ -51,7 +51,7 @@ Players:
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
-		LockTeam: True		
+		LockTeam: True
 		Enemies: GDI
 	PlayerReference@Neutral:
 		Name: Neutral
@@ -97,7 +97,7 @@ Actors:
 	Actor19: e1
 		Location: 43,36
 		Owner: GDI
-		SubCell: 3	
+		SubCell: 3
 	Actor31: e1
 		Location: 47,53
 		Owner: GDI
@@ -106,7 +106,7 @@ Actors:
 		Location: 49,54
 		Owner: GDI
 		Facing: 224
-		SubCell: 1	
+		SubCell: 1
 	Actor35: e1
 		Location: 34,57
 		Owner: GDI
diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml
index 45bf7eafbc..644728419c 100644
--- a/mods/cnc/maps/nod02b/map.yaml
+++ b/mods/cnc/maps/nod02b/map.yaml
@@ -20,9 +20,9 @@ Type: Campaign
 
 Videos:
 	Briefing: nod2.vqa
-	GameLost: deskill.vqa
-	GameWon: airstrk.vqa
 	GameStart: seige.vqa
+	GameWon: airstrk.vqa
+	GameLost: deskill.vqa
 
 Options:
 	Crates: False
@@ -102,7 +102,7 @@ Actors:
 		Owner: Neutral
 	Actor13: rock1
 		Location: 22,32
-		Owner: Neutral	
+		Owner: Neutral
 	Actor20: jeep
 		Location: 5,24
 		Owner: GDI
@@ -127,7 +127,7 @@ Actors:
 		SubCell: 1
 	Actor30: e1
 		Location: 9,24
-		Owner: GDI		
+		Owner: GDI
 		Facing: 96
 		SubCell: 4
 	Actor31: e1
@@ -148,13 +148,13 @@ Actors:
 		SubCell: 1
 	Actor35: e1
 		Location: 10,24
-		Owner: GDI		
+		Owner: GDI
 		Facing: 96
-		SubCell: 2	
+		SubCell: 2
 	Actor37: e1
 		Location: 7,40
 		Owner: GDI
-		SubCell: 2	
+		SubCell: 2
 	waypoint27: waypoint
 		Location: 60,61
 		Owner: Neutral
diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml
index aeb10e2879..5258d81f03 100644
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 7
+MapFormat: 7
 
 RequiresMod: cnc
 
@@ -20,8 +20,8 @@ Type: Campaign
 
 Videos:
 	Briefing: nod4b.vqa
-	GameLost: deskill.vqa
 	GameStart: retro.vqa
+	GameLost: deskill.vqa
 
 Options:
 	Crates: False
@@ -49,7 +49,7 @@ Players:
 	PlayerReference@GDI:
 		Name: GDI
 		Race: gdi
-		ColorRamp: 31,222,183		
+		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
 		Name: Nod
@@ -64,7 +64,7 @@ Players:
 		LockTeam: True
 		Enemies: GDI
 
-Actors:	
+Actors:
 	Actor0: t08
 		Location: 34,20
 		Owner: Neutral
@@ -151,7 +151,7 @@ Actors:
 		Owner: Neutral
 	Actor28: t18
 		Location: 20,7
-		Owner: Neutral	
+		Owner: Neutral
 	Actor30: t08
 		Location: 12,8
 		Owner: Neutral
@@ -276,7 +276,7 @@ Actors:
 		Owner: GDI
 		Health: 94
 		Facing: 32
-		SubCell: 4	
+		SubCell: 4
 	Actor105: e1
 		Location: 46,14
 		Owner: GDI
diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml
index 939aeccd8e..95d560c51f 100644
--- a/mods/ra/maps/soviet-01/map.yaml
+++ b/mods/ra/maps/soviet-01/map.yaml
@@ -625,8 +625,6 @@ Rules:
 			GenericStancePrefix: false
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
-	^CivInfantry:
-		MustBeDestroyed:
 	^CivBuilding:
 		MustBeDestroyed:
 	^Plane: