diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg
index 14606a3420bb6546b863be178953dfdc2b23aa4e..cae622bb7ed2cbb68eb6ec91e854f294d77feafa 100644
--- a/Build/Configurations/Includes/ZDoom_misc.cfg
+++ b/Build/Configurations/Includes/ZDoom_misc.cfg
@@ -104,9 +104,6 @@ defaultthingflags_udmf
 	skill3;
 	skill4;
 	skill5;
-	skill6;
-	skill7;
-	skill8;
 	single;
 	coop;
 	dm;
@@ -115,9 +112,6 @@ defaultthingflags_udmf
 	class3;
 	class4;
 	class5;
-	class6;
-	class7;
-	class8;
 }
 
 // How thing flags should be compared (for the stuck thing error check)
@@ -379,197 +373,136 @@ universalfields
 			type = 3;
 			default = false;
 		} 
-
-		skill1
-		{
-			type = 3;
-			default = true;
-		} 
-    
-		skill2
-		{
-			type = 3;
-			default = true;
-		}
-    
-		skill3
-		{
-			type = 3;
-			default = true;
-		}
-    
-		skill4
-		{
-			type = 3;
-			default = true;
-		}
-    
-		skill5
-		{
-			type = 3;
-			default = true;
-		}
     
 		skill6
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill7
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill8
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill9
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill10
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill11
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill12
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill13
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill14
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill15
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		skill16
 		{
 			type = 3;
-			default = true;
-		} 
-
-		class1
-		{
-			type = 3;
-			default = true;
+			default = false;
 		} 
     
-    
-		class2
-		{
-			type = 3;
-			default = true;
-		}
-    
-		class3
-		{
-			type = 3;
-			default = true;
-		}
-    
-		class4
-		{
-			type = 3;
-			default = true;
-		}
-    
-		class5
-		{
-			type = 3;
-			default = true;
-		}
-    
 		class6
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class7
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class8
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class9
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class10
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class11
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class12
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class13
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class14
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
     
 		class15
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
 		class16
 		{
 			type = 3;
-			default = true;
+			default = false;
 		}
 
 		arg0str