diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
index b8c012683..39d011f23 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index 1c875a3e9..4ad0ad183 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index 2baa0ada5..aa1792b9c 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index ecd4ac14b..92fe3b8bc 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -15,22 +15,6 @@
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
-        <CLOS_MASK>0xfff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index 22844a7d7..f9ba3c04c 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
index 2c5ac6729..1b05c0401 100644
--- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>y</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index 2baa0ada5..aa1792b9c 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index 237eeab29..365899874 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index 594c0bb45..75c368af1 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>y</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index df7e43745..a6cd1b77c 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index 5e080bd24..6297a552b 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
index 2b4d7dadf..664774a74 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
@@ -18,14 +18,6 @@
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
         <VCAT_ENABLED>n</VCAT_ENABLED>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
-        <CLOS_MASK>0xfffff</CLOS_MASK>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>