From f87ba3e4a236f49f6ebaab6f13ee189857f1cb7e Mon Sep 17 00:00:00 2001
From: Guy Zylberberg <guyzyl@gmail.com>
Date: Wed, 16 Mar 2022 10:08:15 +0200
Subject: [PATCH] Remove `NEW CONTENT` comment blocks

Also removed the related blocks:
- `END NEW CONTENT`
- `NEW`
- `END NEW`

This fixes #1176
---
 src/metaschema/oscal_assessment-common_metaschema.xml  | 9 ---------
 src/metaschema/oscal_assessment-plan_metaschema.xml    | 3 ---
 src/metaschema/oscal_assessment-results_metaschema.xml | 9 ---------
 3 files changed, 21 deletions(-)

diff --git a/src/metaschema/oscal_assessment-common_metaschema.xml b/src/metaschema/oscal_assessment-common_metaschema.xml
index 39c80e4fa5..2be367881b 100644
--- a/src/metaschema/oscal_assessment-common_metaschema.xml
+++ b/src/metaschema/oscal_assessment-common_metaschema.xml
@@ -34,9 +34,6 @@
       </model>
    </define-assembly>
 
-   <!-- =========== -->
-   <!-- === NEW === -->
-   <!-- =========== -->
    <define-assembly name="local-objective">
       <formal-name>Assessment-Specific Control Objective</formal-name>
       <description>A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.</description>
@@ -98,9 +95,6 @@
       </model>
    </define-assembly>
 
-   <!-- ===============================  -->
-   <!-- ========= NEW CONTENT =========  -->
-   <!-- ===============================  -->
    <define-assembly name="activity">
       <formal-name>Activity</formal-name>
       <description>Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.</description>
@@ -364,9 +358,6 @@
          <field ref="remarks" in-xml="WITH_WRAPPER" min-occurs="0" max-occurs="1"/>
       </model>
    </define-assembly>
-   <!-- =========== -->
-   <!-- = END NEW = -->
-   <!-- =========== -->
 
    <!-- ********** OBJECTIVES Assembly ********** -->
    <define-assembly name="reviewed-controls">
diff --git a/src/metaschema/oscal_assessment-plan_metaschema.xml b/src/metaschema/oscal_assessment-plan_metaschema.xml
index 7827ed7309..0bbef29a1a 100644
--- a/src/metaschema/oscal_assessment-plan_metaschema.xml
+++ b/src/metaschema/oscal_assessment-plan_metaschema.xml
@@ -132,7 +132,4 @@
         -->
     </define-assembly>
 
-    <!-- ===============================  -->
-    <!-- ======= END NEW CONTENT =======  -->
-    <!-- ===============================  -->
 </METASCHEMA>
diff --git a/src/metaschema/oscal_assessment-results_metaschema.xml b/src/metaschema/oscal_assessment-results_metaschema.xml
index 0df106e30b..35ab85a3f9 100644
--- a/src/metaschema/oscal_assessment-results_metaschema.xml
+++ b/src/metaschema/oscal_assessment-results_metaschema.xml
@@ -60,15 +60,6 @@
     </model>
   </define-assembly>
 
-  <!-- ===============================  -->
-  <!-- ========= NEW CONTENT =========  -->
-  <!-- ===============================  -->
-
-
-  <!-- ===============================  -->
-  <!-- ======= END NEW CONTENT =======  -->
-  <!-- ===============================  -->
-
   <!-- ********** RESULTS Assembly ********** -->
   <define-assembly name="result">
     <formal-name>Assessment Result</formal-name>