diff --git a/Build/Configurations/Includes/Boom_common.cfg b/Build/Configurations/Includes/Boom_common.cfg
index 7a0a593bcf2fe64c170648cd0c7fe4b5efae4d0c..3d5a9aba79469863aa67a1e47c89fbdaa487d0f2 100755
--- a/Build/Configurations/Includes/Boom_common.cfg
+++ b/Build/Configurations/Includes/Boom_common.cfg
@@ -98,6 +98,7 @@ mapformat_doom
 		// How to compare thing flags (for the stuck things error checker)
 	thingflagscompare
 	{
+		include("Doom_misc.cfg", "thingflagscompare");
 		include("Boom_misc.cfg", "thingflagscompare");
 	}
 
diff --git a/Build/Configurations/Includes/Boom_misc.cfg b/Build/Configurations/Includes/Boom_misc.cfg
index c20c32e9d79ed23080d56384b99f5578027d0ef8..01fa35f8fc80ee8cbf0d0b9f7c30adbd741cf904 100755
--- a/Build/Configurations/Includes/Boom_misc.cfg
+++ b/Build/Configurations/Includes/Boom_misc.cfg
@@ -35,23 +35,6 @@ thingflagstranslation
 // How thing flags should be compared (for the stuck thing error check)
 thingflagscompare
 {
-	skills
-	{
-		1;
-		2;
-		4;
-	}
-
-	gamemodes
-	{
-		16
-		{
-			comparemethod = "equal";
-			ignoredgroups = "skills";
-			ingnorethisgroupwhenunset = true;
-		}
-	}
-
 	gamemodes_extra
 	{	
 		optional = true;
@@ -59,16 +42,11 @@ thingflagscompare
 		32
 		{
 			invert = true;
-			requiredflag = "16";
-			requiredgroups = "gamemodes";
-			ignoredgroups = "skills";
 		}
 
 		64
 		{
 			invert = true;
-			requiredflag = "16";
-			requiredgroups = "skills,gamemodes";
 		}
 	}
 }
diff --git a/Build/Configurations/Includes/Doom_misc.cfg b/Build/Configurations/Includes/Doom_misc.cfg
index c6cdf1fa9f3c5a8bf8f555ebf531e9b115cbacbc..ddc3ec787fcd4bf0964a9da9cecfcfb31ec1ed3b 100755
--- a/Build/Configurations/Includes/Doom_misc.cfg
+++ b/Build/Configurations/Includes/Doom_misc.cfg
@@ -53,7 +53,6 @@ thingflagscompare
 		16
 		{
 			comparemethod = "equal";
-			ignoredgroups = "skills";
 			ingnorethisgroupwhenunset = true;
 		}
 	}