diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index eb2feaf73..5f2ca6573 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -68,7 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </description>
     <pattern>xsd:token { pattern = "y?n?i?u?" }</pattern>
   </type>
-  @IF_COMPLIANCE_REPORTS@
   <type>
     <name>compliance_status</name>
     <summary>A compliance status</summary>
@@ -76,7 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       xsd:token { pattern = "yes|no|incomplete|undefined" }
     </pattern>
   </type>
-  @ENDIF_COMPLIANCE_REPORTS@
   <type>
     <name>ctime</name>
     <summary>A date and time, in the C `ctime' format</summary>
@@ -2025,16 +2023,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <e>permissions</e>
             <o><e>user_tags</e></o>
             <e>scan_run_status</e>
-            @IF_COMPLIANCE_REPORTS@
             <o>
-            @ENDIF_COMPLIANCE_REPORTS@
             <e>result_count</e>
             <e>severity</e>
-            @IF_COMPLIANCE_REPORTS@
             </o>
             <o><e>compliance_count</e></o>
             <o><e>compliance</e></o>
-            @ENDIF_COMPLIANCE_REPORTS@
             <e>task</e>
             <e>ports</e>
             <e>results</e>
@@ -2468,7 +2462,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           </ele>
         </ele>
       </ele>
-      @IF_COMPLIANCE_REPORTS@
       <ele>
         <name>compliance_count</name>
         <summary>Counts of compliance results. Only for reports of an audit task.</summary>
@@ -2577,7 +2570,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           </ele>
         </ele>
       </ele>
-      @ENDIF_COMPLIANCE_REPORTS@
       <ele>
         <name>severity</name>
         <pattern>
@@ -2595,7 +2587,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <summary>Maximum severity of the report after filtering</summary>
         </ele>
       </ele>
-      @IF_COMPLIANCE_REPORTS@
       <ele>
         <name>compliance</name>
         <pattern>
@@ -2613,7 +2604,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <summary>Compliance of the report after filtering ("yes", "no", "incomplete" or "undefined")</summary>
         </ele>
       </ele>
-      @ENDIF_COMPLIANCE_REPORTS@
       <ele>
         <name>task</name>
         <pattern>
@@ -2875,15 +2865,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <e>start</e>
           <e>end</e>
           <e>port_count</e>
-          @IF_COMPLIANCE_REPORTS@
           <o>
-          @ENDIF_COMPLIANCE_REPORTS@
           <e>result_count</e>
-          @IF_COMPLIANCE_REPORTS@
           </o>
           <o><e>compliance_count</e></o>
           <o><e>host_compliance</e></o>
-          @ENDIF_COMPLIANCE_REPORTS@
           <any><e>detail</e></any>
         </pattern>
         <ele>
@@ -3001,7 +2987,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </ele>
           </ele>
         </ele>
-        @IF_COMPLIANCE_REPORTS@
         <ele>
           <name>compliance_count</name>
           <summary>Only for audit reports</summary>
@@ -3071,7 +3056,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <summary>Only for audit reports. Host compliance</summary>
           <pattern><t>compliance_status</t></pattern>
         </ele>
-        @ENDIF_COMPLIANCE_REPORTS@
         <ele>
           <name>detail</name>
           <summary>A detail associated with the host</summary>
@@ -18029,13 +18013,11 @@ END:VCALENDAR
             <type>integer</type>
             <summary>Minimum QoD of the results</summary>
           </option>
-          @IF_COMPLIANCE_REPORTS@
           <option>
             <name>report_compliance_levels</name>
             <type>compliance_levels</type>
             <summary>report compliance level to select</summary>
           </option>
-          @ENDIF_COMPLIANCE_REPORTS@   
           <column>
             <name>tag</name>
             <type>text</type>
@@ -18181,7 +18163,6 @@ END:VCALENDAR
             <type>iso_time</type>
             <summary>Scan end time</summary>
           </column>
-          @IF_COMPLIANCE_REPORTS@
           <column>
             <name>compliance_yes</name>
             <type>integer</type>
@@ -18202,7 +18183,6 @@ END:VCALENDAR
             <type>compliance_status</type>
             <summary>Compliance state of the report. Can be yes, no, incomplete or undefined</summary>
           </column>
-          @ENDIF_COMPLIANCE_REPORTS@      
         </filter_keywords>
       </attrib>
       <attrib>
@@ -18272,7 +18252,6 @@ END:VCALENDAR
         </summary>
         <type>boolean</type>
       </attrib>
-      @IF_COMPLIANCE_REPORTS@
       <attrib>
           <name>usage_type</name>
           <summary>Optional usage type to limit the reports to. Affects total count unlike filter</summary>
@@ -18284,7 +18263,6 @@ END:VCALENDAR
             </alts>
           </type>
       </attrib>
-      @ENDIF_COMPLIANCE_REPORTS@
     </pattern>
     <response>
       <pattern>
@@ -23005,15 +22983,11 @@ END:VCALENDAR
               </attrib>
               <e>timestamp</e>
               <e>scan_end</e>
-              @IF_COMPLIANCE_REPORTS@
               <o>
-              @ENDIF_COMPLIANCE_REPORTS@
               <e>result_count</e>
               <e>severity</e>
-              @IF_COMPLIANCE_REPORTS@
               </o>
               <o><e>compliance_count</e></o>
-              @ENDIF_COMPLIANCE_REPORTS@
             </pattern>
             <ele>
               <name>timestamp</name>
@@ -23059,7 +23033,6 @@ END:VCALENDAR
               <pattern><t>severity</t></pattern>
               <summary>Maximum severity of the report</summary>
             </ele>
-            @IF_COMPLIANCE_REPORTS@
             <ele>
               <name>compliance_count</name>
               <summary>Complaince counts. Only for audit tasks</summary>
@@ -23086,7 +23059,6 @@ END:VCALENDAR
                 <pattern><t>integer</t></pattern>
               </ele>
             </ele>
-            @ENDIF_COMPLIANCE_REPORTS@
           </ele>
         </ele>
         <ele>