diff --git a/v3_28_0/CDT-AE-v3_28_0.xsd.bu b/v3_28_0/CDT-AE-v3_28_0.xsd.bu
deleted file mode 100644
index 7026d6150117722ebbab17ded75f6c87c2b7bd21..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-AE-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd" />
-	
-	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="appName" type="xs:string" minOccurs="0" />
-						<xs:element name="App-ID" type="xs:string" />
-						<xs:element name="AE-ID" type="m2m:ID" />
-						<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" />
-						<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
-						<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-						<xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
-						<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
-						<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
-						<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
-						<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:group" />
-								<xs:element ref="m2m:accessControlPolicy" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:pollingChannel" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:timeSeries" />
-								<xs:element ref="m2m:sg_flexContainerResource" />
-								<xs:element ref="m2m:semanticMashupInstance" />    
-								<xs:element ref="m2m:multimediaSession" />
-								<xs:element ref="m2m:crossResourceSubscription" />
-								<xs:element ref="m2m:triggerRequest" />
-								<xs:element ref="m2m:transactionMgmt" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="AEAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="appName" type="xs:string" minOccurs="0" />
-						<xs:element name="App-ID" type="xs:string" minOccurs="0" />
-						<xs:element name="AE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
-						<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
-						<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-						<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
-						<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
-						<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
-						<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
-						<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:containerAnnc" />
-								<xs:element ref="m2m:group" />
-								<xs:element ref="m2m:groupAnnc" />
-								<xs:element ref="m2m:accessControlPolicy" />
-								<xs:element ref="m2m:accessControlPolicyAnnc" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:timeSeries" />
-								<xs:element ref="m2m:timeSeriesAnnc" />
-								<xs:element ref="m2m:sg_flexContainerResource" />
-								<xs:element ref="m2m:sg_announcedFlexContainerResource" />
-								<xs:element ref="m2m:semanticMashupInstance" />
-								<xs:element ref="m2m:semanticMashupInstanceAnnc" />
-								<xs:element ref="m2m:multimediaSession" />
-								<xs:element ref="m2m:multimediaSessionAnnc" />
-								<xs:element ref="m2m:crossResourceSubscription" />
-								<xs:element ref="m2m:triggerRequest" />
-								<xs:element ref="m2m:transactionMgmt" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-AEContactList-v3_28_0.xsd.bu b/v3_28_0/CDT-AEContactList-v3_28_0.xsd.bu
deleted file mode 100644
index 73bbe3b97bed586f334fe2c0211e8e239a4f9a00..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-AEContactList-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="numberImpactedCSEs" type="xs:nonNegativeInteger" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:AEContactListPerCSE" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-AEContactListPerCSE-v3_28_0.xsd.bu b/v3_28_0/CDT-AEContactListPerCSE-v3_28_0.xsd.bu
deleted file mode 100644
index 0a5fbc4a0326413a383cc8f13e0ee18f088f3f15..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-AEContactListPerCSE-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-
-	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="CSE-ID" type="xs:nonNegativeInteger" />
-						<xs:element name="AE-IDList" type="m2m:listOfM2MID" minOccurs="0"/>
-
-						<!-- This resource type has no child Resources -->
-
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-CSEBase-v3_28_0.xsd.bu b/v3_28_0/CDT-CSEBase-v3_28_0.xsd.bu
deleted file mode 100644
index 2343d4c9a18fe77c6dc13c8a14dab23587871db5..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-CSEBase-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_27_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_27_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_27_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_27_0.xsd" />
-    
-	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit just the universal resource attributes -->
-				<xs:extension base="m2m:resource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="CSE-ID" type="m2m:ID" />
-						<xs:element name="supportedResourceType">
-							<xs:simpleType>
-								<xs:list itemType="m2m:resourceType" />
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="pointOfAccess" type="m2m:poaList" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-					    <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
-					    <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
-					    <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-					    <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
-					    
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:remoteCSE" />
-                                <xs:element ref="m2m:remoteCSEAnnc" />
-                                <xs:element ref="m2m:node" />
-                                <xs:element ref="m2m:AE" />
-                                <xs:element ref="m2m:container" />
-                                <xs:element ref="m2m:group" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:mgmtCmd" />
-                                <xs:element ref="m2m:locationPolicy" />
-                                <xs:element ref="m2m:statsConfig" />
-                                <xs:element ref="m2m:statsCollect" />
-                                <xs:element ref="m2m:request" />
-                                <xs:element ref="m2m:delivery" />
-                                <xs:element ref="m2m:schedule" />
-                                <xs:element ref="m2m:m2mServiceSubscriptionProfile" />
-                                <xs:element ref="m2m:serviceSubscribedAppRule" />
-                                <xs:element ref="m2m:role" />
-                                <xs:element ref="m2m:token" />
-                                <xs:element ref="m2m:sg_flexContainerResource" />
-                                <xs:element ref="m2m:authorizationDecision" />
-                                <xs:element ref="m2m:authorizationPolicy" />
-                                <xs:element ref="m2m:authorizationInformation" />                                
-                                <xs:element ref="m2m:ontologyRepository" />
-                                <xs:element ref="m2m:semanticMashupJobProfile" />
-                                <xs:element ref="m2m:semanticMashupInstance" />    
-                                <xs:element ref="m2m:AEContactList" />
-                                <xs:element ref="m2m:localMulticastGroup" />
-                                <xs:element ref="m2m:crossResourceSubscription" />
-                                <xs:element ref="m2m:backgroundDataTransfer" />
-                                <xs:element ref="m2m:transactionMgmt" />
-                                <xs:element ref="m2m:transaction" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-accessControlPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-accessControlPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index deacd674bb59fb9af31b8f50408e1b70e1fa73bd..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-accessControlPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="unqualified">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="privileges" type="m2m:setOfAcrs"/>
-						<xs:element name="selfPrivileges" type="m2m:setOfAcrs"/>
-						<xs:element name="authorizationDecisionResourceIDs" type="m2m:listOfURIs"/>
-						<xs:element name="authorizationPolicyResourceIDs" type="m2m:listOfURIs"/>
-						<xs:element name="authorizationInformationResourceIDs" type="m2m:listOfURIs"/>
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="accessControlPolicyAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="privileges" type="m2m:setOfAcrs"/>
-						<xs:element name="selfPrivileges" type="m2m:setOfAcrs"/>
-						<xs:element name="authorizationDecisionResourceIDs" type="m2m:listOfURIs"/>
-						<xs:element name="authorizationPolicyResourceIDs" type="m2m:listOfURIs"/>
-						<xs:element name="authorizationInformationResourceIDs" type="m2m:listOfURIs"/>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-					
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<!-- m2m:setOfAcrs and m2m:accessControlRule are defined in commonTypes -->
-
-	<!-- locationRegion is defined in commonTypes -->
-	
-	<!-- countryCode is defined in commonTypes -->
-	
-</xs:schema>
diff --git a/v3_28_0/CDT-activeCmdhPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-activeCmdhPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index 15e990da8b23abf3db495ebafffee0d436d499ba..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-activeCmdhPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-    <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-
-  <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from regularResourceType  -->
-          <xs:extension base="m2m:mgmtResource">
-	           <xs:sequence>
-              <!-- Resource Specific Attributes -->
-	            <xs:element name="activeCmdhPolicyLink" type="m2m:ID" />	
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-allJoynApp-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynApp-v3_28_0.xsd.bu
deleted file mode 100644
index 5ac40fcddd05202ec3a3f91432bfa9871f9145d3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynApp-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_27_0.xsd" />
-	
-	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="direction" type="m2m:allJoynDirection" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynSvcObject"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynAppAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="direction" type="m2m:allJoynDirection"  />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynSvcObject"  />
-								<xs:element ref="m2m:allJoynSvcObjectAnnc"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-allJoynInterface-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynInterface-v3_28_0.xsd.bu
deleted file mode 100644
index aad26508676846bacfbfeec5c9f6ccaa1cb081de..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynInterface-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_27_0.xsd" />
-	
-	
-	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="interfaceIntrospectXmlRef" type="xs:anyURI" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:allJoynMethod" />
-								<xs:element ref="m2m:allJoynProperty" />
-								<xs:element ref="m2m:container" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynInterfaceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="interfaceIntrospectXmlRef" type="xs:anyURI" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynMethod" />
-								<xs:element ref="m2m:allJoynMethodAnnc" />
-								<xs:element ref="m2m:allJoynProperty" />
-								<xs:element ref="m2m:allJoynPropertyAnnc" />
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:containerAnnc" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-allJoynMethod-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynMethod-v3_28_0.xsd.bu
deleted file mode 100644
index 1ddaeafc28d036c845664694edd2a81af6b4a63d..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynMethod-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_27_0.xsd" />
-
-	
-	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:allJoynMethodCall" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynMethodAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynMethodCall" />
-								<xs:element ref="m2m:allJoynMethodCallAnnc" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-allJoynMethodCall-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynMethodCall-v3_28_0.xsd.bu
deleted file mode 100644
index 6f59777bb3d720f86705591d7431ee23db75cf96..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynMethodCall-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="input" type="xs:string" minOccurs="0" />
-						<xs:element name="callStatus" type="xs:string" minOccurs="0" />
-						<xs:element name="output" type="xs:string" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynMethodCallAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-allJoynProperty-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynProperty-v3_28_0.xsd.bu
deleted file mode 100644
index 5c8d79c350498e5391f7dc57b09f42a177b28cb2..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynProperty-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="currentValue" type="xs:string" />
-						<xs:element name="requestedValue" type="xs:string" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynPropertyAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-allJoynSvcObject-v3_28_0.xsd.bu b/v3_28_0/CDT-allJoynSvcObject-v3_28_0.xsd.bu
deleted file mode 100644
index a0eae781418377478afda826c9df41b37cb72456..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-allJoynSvcObject-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_27_0.xsd" />
-	
-	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="objectPath" type="xs:string" />
-						<xs:element name="enable" type="xs:boolean" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynInterface"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="allJoynSvcObjectAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="objectPath" type="xs:string" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynInterface"  />
-								<xs:element ref="m2m:allJoynInterfaceAnnc"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-areaNwkDeviceInfo-v3_28_0.xsd.bu b/v3_28_0/CDT-areaNwkDeviceInfo-v3_28_0.xsd.bu
deleted file mode 100644
index 116c8380d6e0a82c0613770cb2eba97833a02182..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-areaNwkDeviceInfo-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"  
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" />
-						<xs:element name="devType" type="xs:string" />
-						<xs:element name="areaNwkId" type="xs:anyURI" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="devStatus" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkDeviceInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" minOccurs="0" />
-						<xs:element name="devType" type="xs:string" minOccurs="0" />
-						<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="devStatus" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-areaNwkInfo-v3_28_0.xsd.bu b/v3_28_0/CDT-areaNwkInfo-v3_28_0.xsd.bu
deleted file mode 100644
index aa809bddbc06256b2edeb5690b95422e420ac75c..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-areaNwkInfo-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"  
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" minOccurs="0" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-authorizationDecision-v3_28_0.xsd.bu b/v3_28_0/CDT-authorizationDecision-v3_28_0.xsd.bu
deleted file mode 100644
index 207b490da85fac0044f4a38da048a9f7dd321deb..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-authorizationDecision-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="decision" type="m2m:authorizationDecision" minOccurs="0"/>
-						<xs:element name="status" type="m2m:authorizationStatus" minOccurs="0"/>
-						<xs:element name="to" type="xs:anyURI" minOccurs="0" />	
-						<xs:element name="from" type="m2m:ID" minOccurs="0" />	
-						<xs:element name="operation" type="m2m:operation" minOccurs="0" />	
-						<xs:element name="requestedResourceType" type="m2m:resourceType" minOccurs="0" />
-						<xs:element name="filterUsage" type="m2m:filterCriteria" minOccurs="0" />
-						<xs:element name="roleIDs" minOccurs="0">      
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:roleID" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element>	
-						<xs:element name="tokenIDs" minOccurs="0">
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:tokenID" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element>    
-						<xs:element name="tokens" minOccurs="0">
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:dynAuthJWT" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element> 
-						<xs:element name="requestTime" type="m2m:timestamp" minOccurs="0" />	
-						<xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />	
-						<xs:element name="originatorIP" type="m2m:ipAddress" minOccurs="0" />	
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
-
-
diff --git a/v3_28_0/CDT-authorizationInformation-v3_28_0.xsd.bu b/v3_28_0/CDT-authorizationInformation-v3_28_0.xsd.bu
deleted file mode 100644
index 0093f4d2b0b3fa6ad6533b982c48f56c2d284e7a..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-authorizationInformation-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="status" type="m2m:authorizationStatus" minOccurs="0"/>
-						<xs:element name="from" type="m2m:ID" minOccurs="0"/>
-						<xs:element name="roleIDs" minOccurs="0">      
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:roleID" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element>	
-						<xs:element name="tokenIDs" minOccurs="0">
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:tokenID" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element>  
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:role" />
-								<xs:element ref="m2m:token" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
-
-
diff --git a/v3_28_0/CDT-authorizationPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-authorizationPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index 80dee4a9472f398f54af8438653e9a9fc97daf96..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-authorizationPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="policies" type="m2m:setOfPermissions" minOccurs="0"/>
-						<xs:element name="combiningAlgorithm" type="m2m:acpCombiningAlgorithm" minOccurs="0"/>
-						<xs:element name="status" type="m2m:authorizationStatus" minOccurs="0" />
-						<xs:element name="to" type="xs:anyURI" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
-
diff --git a/v3_28_0/CDT-backgroundDataTransfer-v3_28_0.xsd.bu b/v3_28_0/CDT-backgroundDataTransfer-v3_28_0.xsd.bu
deleted file mode 100644
index 72cccae20f7e64f09e718f309c4c3f07db4fd8e0..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-backgroundDataTransfer-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-
-	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="volumePerNode" type="xs:positiveInteger" />
-						<xs:element name="numberOfNodes" type="xs:positiveInteger" />
-						<xs:element name="desiredTimeWindow" type="m2m:scheduleEntry" minOccurs="0" />
-						<xs:element name="transferSelectionGuidance" type="m2m:transferSelectionGuidance" minOccurs="0" />
-						<xs:element name="geographicInformation" type="m2m:locationRegion" minOccurs="0" />
-						<xs:element name="groupLink" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="memberIDs" minOccurs="0" >
-							<xs:simpleType>
-								<xs:list itemType="xs:anyURI"/>
-							</xs:simpleType>
-						</xs:element>						
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-battery-v3_28_0.xsd.bu b/v3_28_0/CDT-battery-v3_28_0.xsd.bu
deleted file mode 100644
index dd34be14072a2e1f2d0514df39364371f023d232..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-battery-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt"/>
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="batteryAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt" minOccurs="0" />
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" minOccurs="0" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-cmdhBuffer-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhBuffer-v3_28_0.xsd.bu
deleted file mode 100644
index f8b1bfc81bafd449f0f1222484389a60446112e8..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhBuffer-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes --> 
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="maxBufferSize" type="xs:nonNegativeInteger" />  <!-- unit in bytes -->
-            <xs:element name="storagePriority">
-               <xs:simpleType>
-                 <xs:restriction base="xs:positiveInteger">
-                   <xs:maxExclusive value="11"/>
-                 </xs:restriction>
-               </xs:simpleType>
-            </xs:element>       
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-cmdhDefEcValue-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhDefEcValue-v3_28_0.xsd.bu
deleted file mode 100644
index a2eaf82b5ec0fe06b0044e73eaba8878a57a615c..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhDefEcValue-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="defEcValue" type="m2m:eventCat" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <xs:element name="requestContext" type="xs:anyType" minOccurs="0" />
-            <xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
-            <xs:element name="requestCharacteristics" type="xs:anyType" minOccurs="0" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	      
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v3_28_0/CDT-cmdhDefaults-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhDefaults-v3_28_0.xsd.bu
deleted file mode 100644
index 3b9088788b6605546a1e19097ccec6be7cea388d..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhDefaults-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	          <xs:sequence>
-	            <!-- this resource type has no mgmtObj specialization-specific Attributes -->
-	            <!-- Instantiations of this [cmdhDefaults] resource type shall include mgmntLink's to
-	               the following children:
-              1 or more mgmtLink to instance(s) of resource type [cmdhDefEcValue]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhEcDefParamValues]              -->	    
-	            <!-- TODO: text in Table D.12.2-2 column "Default Value and Constraints" needs to be updated
-	                       ref to [cmdhEcDefParamValues] is missing  -->
-              <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="2" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent>
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-cmdhEcDefParamValues-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhEcDefParamValues-v3_28_0.xsd.bu
deleted file mode 100644
index d57df9bd9f5bc23cb12f53151816ab9c39e8f6fb..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhEcDefParamValues-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
-    <xs:complexType>     
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="defaultRequestExpTime" type="xs:long" />  <!-- units in milliseconds -->
-            <xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultRespPersistence" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultDelAggregation" type="xs:boolean" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v3_28_0/CDT-cmdhLimits-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhLimits-v3_28_0.xsd.bu
deleted file mode 100644
index ef99b4f7aa05912598221821448c72cf34870abf..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhLimits-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <xs:element name="requestContext" type="xs:anyType" />
-            <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
-            <xs:element name="requestCharacteristics" type="xs:anyType"  />
-            <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
-            <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
-            <xs:element name="limitsDelAggregation" >
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                    <xs:annotation>
-                        <xs:documentation>defines data type denoted "restricted list of xs:boolean" in TS-0004 D.12.5
-                        </xs:documentation>
-                    </xs:annotation>
-                    <!-- False -->
-                    <xs:enumeration value="0" />
-                    <!-- True -->
-                    <xs:enumeration value="1" />
-                    <!-- True and False -->
-                    <xs:enumeration value="0 1" />
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:element>         
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-  
-</xs:schema> 
diff --git a/v3_28_0/CDT-cmdhNetworkAccessRules-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhNetworkAccessRules-v3_28_0.xsd.bu
deleted file mode 100644
index 4c2f9a0dc902c0a6b18ed9b1d699111bb589addd..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhNetworkAccessRules-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-             <xs:element name="applicableEventCategories" type="m2m:listOfEventCatWithDef" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type [cmdhNwAccessRule]       -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	     
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v3_28_0/CDT-cmdhNwAccessRule-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhNwAccessRule-v3_28_0.xsd.bu
deleted file mode 100644
index 109e83a673f54fe264fc30439f5d680ed1d4a989..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhNwAccessRule-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  
-  <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
-            <xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
-            <xs:element name="spreadingWaitTime" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
-            <xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
-            <xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type schedule       -->
-            <!-- TODO: clarify if multiple schedule elements shall be included rather than a link to non-mgmtObj specialization -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	       
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v3_28_0/CDT-cmdhPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-cmdhPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index 37aa9b7c30c8c97f9e0fefc300ffd8956186bf08..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-cmdhPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-
-  <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	        <xs:sequence>
-           <!-- mgmtObj specialization-specific Attributes -->
-              <xs:element name="cmdhPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" />
-	          <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	            1 mgmtLink to an instance of resource type [cmdhDefaults], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhLimits], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhBuffer]              -->
-	          <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="4" maxOccurs="unbounded"/>
-
-            </xs:sequence>
-          </xs:extension> 
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-commonTypes-v3_28_0.xsd.bu b/v3_28_0/CDT-commonTypes-v3_28_0.xsd.bu
deleted file mode 100644
index 53206a7e8efe65ff4149b294e40f682fdd333dd5..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-commonTypes-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,1568 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_27_0.xsd" />
-
-	<!--********************** -->
-	<!-- oneM2M Simple Types   -->
-	<!--********************** -->
-
-	<xs:simpleType name="ID">
-		<xs:restriction base="xs:anyURI" />
-	</xs:simpleType>
-
-	<xs:simpleType name="nodeID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-
-	<xs:simpleType name="deviceID">
-		<xs:restriction base="xs:token">
-			<xs:pattern value="urn:dev:ops:[\dABCDEFabcdef]{6}-[\w_%]+-[\w_%]+" />
-			<xs:pattern value="urn:dev:os:[\dABCDEFabcdef]{6}-[\w_%]+" />
-			<xs:pattern value="urn:imei:\d{15}" />
-			<xs:pattern value="urn:esn:[\dABCDEFabcdef]{8}" />
-			<xs:pattern value="urn:meid:[\dABCDEFabcdef]{14}" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="externalID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-
-	<xs:simpleType name="requestID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-	
-	<xs:simpleType name="roleID">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-zA-Z0-9\.\-,_]*)@([A-Za-z0-9\-_]*)(\.([A-Za-z0-9\-_])*)*" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="tokenID">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-zA-Z0-9\.\-,_]*)@([A-Za-z0-9\-_]*)(\.([A-Za-z0-9\-_])*)*" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="nhURI">
-		<xs:restriction base="xs:anyURI" />
-	</xs:simpleType>
-	
-	 <xs:simpleType name="acpType">
-	 	<xs:restriction> 
-	 		<xs:simpleType> 
-	 			<xs:list itemType="m2m:ID" /> 
-	 		</xs:simpleType> 	
-	 		<xs:minLength value="1" /> 
-	 	</xs:restriction> 
-    </xs:simpleType>
-
-	<xs:simpleType name="labels">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="xs:token" />
-			</xs:simpleType> 	
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-    <xs:simpleType name="triggerRecipientID">
-        <xs:restriction base="xs:unsignedInt">
-            <xs:minInclusive value="0"></xs:minInclusive>
-            <xs:maxInclusive value="65535"></xs:maxInclusive>
-        </xs:restriction>
-    </xs:simpleType>
-
-	<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID") -->
-	<xs:simpleType name="listOfM2MID">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="m2m:ID" /> 
-			</xs:simpleType> 				
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-	<!-- auxiliary data type required to define "listOflongMin-1" below -->
-	<xs:simpleType name="longMin-1">
-		<xs:restriction base="xs:long">
-			<xs:minInclusive value="-1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on  
-		type xs:long in the range -1, 0, 1, 2 ... . Unit is milliseconds. Value setting of -1 expresses infinity -->
-	<xs:simpleType name="listOfMinMax">
-		<xs:restriction>
-			<xs:simpleType>
-				<xs:list itemType="m2m:longMin-1" />
-			</xs:simpleType>			
-			<xs:length value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<!-- "signatureList" is a space separated list of base64url encoded elements which includes at lease one element -->
-	<xs:simpleType name="signatureList">
-		<xs:restriction>
-			<xs:simpleType>
-				<xs:list itemType="m2m:base64url"/>
-			</xs:simpleType>
-			<xs:minLength value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<!-- data type required to define "signatureList" above -->
-	<xs:simpleType name="base64url">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-zA-Z0-9\-_=]+)" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	 
-	<!-- ipv4 and ipv6 are defined in commonTypes -->
-	<!-- Initial IPv4 and IPv6 address representation types were found here:
-     http://lists.w3.org/Archives/Public/www-xml-schema-comments/2005OctDec/0138.html, CIDR suffix has been added  -->
-	
-	<xs:simpleType name="ipv4">
-		<xs:annotation>
-			<xs:documentation> An IP version 4 address, with optional CIDR suffix in the range /0
-				... /32. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:pattern
-				value="(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
-			<xs:pattern value="[0-9A-Fa-f]{8}(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="ipv6">
-		<xs:annotation>
-			<xs:documentation> An IP version 6 address, based on RFC 1884, with optional CIDR suffix
-				in the range /0 ... /128. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<!-- Fully specified address -->
-			<xs:pattern
-				value="[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Double colon start -->
-			<xs:pattern value=":(:[0-9A-Fa-f]{1,4}){1,7}"/>
-			<!-- Double colon middle -->
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,6}(:[0-9A-Fa-f]{1,4}){1}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,5}(:[0-9A-Fa-f]{1,4}){1,2}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,4}(:[0-9A-Fa-f]{1,4}){1,3}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,3}(:[0-9A-Fa-f]{1,4}){1,4}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,2}(:[0-9A-Fa-f]{1,4}){1,5}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1}(:[0-9A-Fa-f]{1,4}){1,6}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Double colon end -->
-			<xs:pattern value="([0-9A-Fa-f]{1,4}:){1,7}:(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added?-->
-			<xs:pattern
-				value="((:(:0{1,4}){0,3}(:(0{1,4}|[fF]{4}))?)|(0{1,4}:(:0{1,4}){0,2}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){2}(:0{1,4})?(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){3}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){4}(0{1,4}|[fF]{4})?)):(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])"/>
-			<!-- The unspecified address -->
-			<xs:pattern value="::(/0)?"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="pointOfAccess">
-		<xs:restriction base="xs:anyURI">
-			<xs:pattern value="(http|HTTP|coap|COAP|mqtt|MQTT|ws|WS)(s|S)?://[\w/!#$^_\.+&amp;\-:;=]+" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="poaList">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="m2m:pointOfAccess" />
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-	<!--Format is YYYYMMDDThhmmss,ssssss with optional up to 6 digits of fractional seconds -->
-	<xs:simpleType name="timestamp">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d(,\d{1,6})?"></xs:pattern>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	
-	<xs:simpleType name="absRelTimestamp">
-		<xs:union>
-			<!-- absolute Time -->
-			<xs:simpleType>
-				<xs:restriction base='m2m:timestamp' />
-			</xs:simpleType>
-			<!-- relative Time -->
-			<xs:simpleType>
-				<xs:restriction base='xs:long' />
-			</xs:simpleType>
-		</xs:union>
-	</xs:simpleType>
-	
-	<xs:simpleType name="missingDataList">	
-	    <xs:union>
-	    	<simpleType>
-	    		<restriction base='m2m:listOfTimeStamp' />
-	    	</simpleType>
-	    	<simpleType>
-	    		<restriction base='m2m:listOfRelTimeStamp' />
-	    	</simpleType>
-	    </xs:union>
-	</xs:simpleType>
-	
-	<!-- auxiliary data type required for definition of m2m:missingDataList -->
-	<xs:simpleType name="listOfTimeStamp">
-		<xs:restriction>
-			<xs:simpleType> 
-				<xs:list itemType="m2m:timestamp" /> 
-			</xs:simpleType> 			
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<!-- auxiliary data type required for definition of m2m:missingDataList -->
-	<xs:simpleType name="listOfRelTimeStamp">
-		<xs:restriction>
-			<xs:simpleType> 
-				<xs:list itemType="xs:long" /> 
-			</xs:simpleType> 			
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-	<xs:simpleType name="typeOfContent">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[\w/!#$^_.+&amp;\-]+" />
-        </xs:restriction>
-    </xs:simpleType>
-	
-	
-	<!-- auxiliary data type required to define "serializations" below -->
-	<xs:simpleType name="permittedMediaTypes"> 
-		<xs:restriction base="m2m:typeOfContent">
-			<xs:enumeration value="xml" />
-			<xs:enumeration value="json" />
-			<xs:enumeration value="cbor" />
-		</xs:restriction>
-	</xs:simpleType> 
-	
-	<!-- "serializations" data type is a list of permitted media types as defined above -->
-	<xs:simpleType name="serializations"> 
-		<xs:restriction>
-			<xs:simpleType>
-				<xs:list itemType="m2m:permittedMediaTypes" />
-			</xs:simpleType>
-			<xs:minLength value="1" />
-		</xs:restriction>
-	</xs:simpleType> 
-	
-
-	<xs:simpleType name="contentInfo">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w/!#$^_.+&amp;\-]+(:[0-2])?" />
-			<xs:pattern value="[\w/!#$^_.+&amp;\-]+((:[0-2])?)+((:[0-5])?)" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="mediaType">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w/!#$^_\.+&amp;\-;=]+" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="protocolList">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="m2m:mediaType" /> 
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:simpleType name="eventCat">
-        <union>
-            <simpleType>
-                <restriction base='m2m:stdEventCats' />
-            </simpleType>
-            <!-- User-defined range -->
-            <simpleType>
-                <restriction base='xs:integer'>
-                    <xs:minInclusive value="100" />
-                    <xs:maxInclusive value="999" />
-                </restriction>
-            </simpleType>
-        </union>
-    </xs:simpleType>
-
-    <xs:simpleType name="eventCatWithDef">
-        <union>
-            <simpleType>
-                <restriction base='m2m:eventCat' />
-            </simpleType>
-            <!-- User-defined range -->
-            <simpleType>
-                <restriction base='xs:integer'>
-                    <xs:enumeration value="0" />
-                </restriction>
-            </simpleType>
-        </union>
-    </xs:simpleType>
-	
-    <xs:simpleType name="listOfEventCat">
-    	<xs:restriction>
-    		<xs:simpleType> 
-    			<xs:list itemType="m2m:eventCat" /> 
-    		</xs:simpleType> 			
-    		<xs:minLength value="1" /> 
-    	</xs:restriction> 
-    </xs:simpleType>
-
-    <xs:simpleType name="listOfEventCatWithDef">
-    	<xs:restriction>
-    		<xs:simpleType> 
-    			<xs:list itemType="m2m:eventCatWithDef" /> 
-    		</xs:simpleType> 	    		
-    		<xs:minLength value="1" /> 
-    	</xs:restriction> 
-    </xs:simpleType>
-
-	<xs:simpleType name="scheduleEntry">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="(((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?|([1-5]?\d))\,)*((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?)|([1-5]?\d))\s+){2}((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?|(1?\d|2[0-3]))\,)*((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?)|(1?\d|2[0-3]))\s+((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?|([1-9]|1\d|2\d|3[01]))\,)*((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?)|([1-9]|1\d|2\d|3[01]))\s+((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?|([1-9]|1[0-2]))\,)*((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?)|([1-9]|1[0-2]))\s+((([*]|(([0-6])\-([0-6])))(\/[0-6])?|([0-6]))\,)*((([*]|(([0-6])\-([0-6])))(\/[0-6])?)|([0-6]))\s+((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?|([2-9]\d\d\d))\,)*((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?)|([2-9]\d\d\d))" />		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="listOfURIs">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="xs:anyURI" /> 
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-	<xs:simpleType name="listOfDuration">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="xs:duration" /> 
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:simpleType name="attributeList">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="xs:NCName" /> 
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:simpleType name="resourceTypeList">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="m2m:resourceType" />
-			</xs:simpleType> 	
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-
-	<xs:simpleType name="sparql">
-		<xs:restriction base="xs:string" />
-	</xs:simpleType>
-	
-	<xs:simpleType name="e2eCompactJWS">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-zA-Z0-9\-_=]+)\.([a-zA-Z0-9\-_=]*)\.([A-Za-z0-9\-_=])+" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="e2eCompactJWE">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-zA-Z0-9\-_=]+)\.([a-zA-Z0-9\-_=]*)\.([a-zA-Z0-9\-_=]*)\.([a-zA-Z0-9\-_=]*)\.([A-Za-z0-9\-_=])+" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="dynAuthJWT">
-		<xs:union>
-			<xs:simpleType>
-				<xs:restriction base='m2m:e2eCompactJWS' />
-			</xs:simpleType>
-			<xs:simpleType>
-				<xs:restriction base='m2m:e2eCompactJWE' />
-			</xs:simpleType>
-		</xs:union>
-	</xs:simpleType>
-	
-	<xs:simpleType name="resourceName">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="[a-zA-Z0-9]([a-zA-Z0-9\.\-,_]*)" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="locationTargetID">
-		<xs:union>
-			<xs:simpleType>
-				<xs:restriction base='m2m:nodeID' />
-			</xs:simpleType>
-			<xs:simpleType>
-				<xs:restriction base='m2m:externalID' />
-			</xs:simpleType>
-			<xs:simpleType>
-				<xs:restriction base="xs:string" >
-					<xs:pattern value="([0-9]*)" />
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:union>
-	</xs:simpleType>
-
-	<xs:simpleType name="releaseVersion">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="2"/>
-			<xs:pattern value="2a"/>
-			<xs:pattern value="3"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="applicableReleaseVersion">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="1"/>
-			<xs:pattern value="2"/>
-			<xs:pattern value="2a"/>
-			<xs:pattern value="3"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="supportedReleaseVersions">
-		<xs:restriction>
-			<xs:simpleType> 
-				<xs:list itemType="m2m:applicableReleaseVersion" /> 
-			</xs:simpleType> 	    		
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:simpleType name="TMGI">
-		<xs:restriction base="xs:string" >
-			<xs:pattern value="([a-fA-F0-9]{6})[\d]{5}[\d]?" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="sessionDescription">
-		<xs:restriction base="xs:string" />
-	</xs:simpleType>
-	
-	<xs:simpleType name="sessionCapabilities">
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="m2m:mediaType" /> 
-			</xs:simpleType> 
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:simpleType name="resourceList" >
-		<xs:list itemType="xs:anyURI" /> 			
-	</xs:simpleType>
-
-
-	<!--********************** -->
-	<!-- oneM2M Complex Types -->
-	<!--********************** -->
-
-	<xs:complexType name="deliveryMetaData">
-		<xs:sequence>
-			<xs:sequence>
-				<xs:element name="tracingOption" type="xs:boolean" />
-				<xs:element name="tracingInfo" type="m2m:listOfM2MID" minOccurs="0"/>
-				<!-- should tracing Info be list of anyURI? -->
-			</xs:sequence>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="aggregatedRequest">
-		<xs:sequence>
-			<xs:element name="request" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="operation" type="m2m:operation" />
-						<xs:element name="to" type="xs:anyURI" />
-						<xs:element name="from" type="m2m:ID" />
-						<xs:element name="requestIdentifier" type="m2m:requestID" />
-						<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
-						<xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="metaInformation">
-		<xs:sequence>
-			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0" />
-			<xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
-			<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
-			<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
-			<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
-			<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
-			<xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
-			<xs:element name="roleIDs" minOccurs="0">      
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:roleID" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0" />
-			<xs:element name="tokens" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:dynAuthJWT" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element> 
-			<xs:element name="tokenIDs" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:tokenID" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>                   
-			<xs:element name="localTokenIDs" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="xs:NCName" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="groupRequestTargetMembers" type="m2m:listOfURIs" minOccurs="0"/>			
-			<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
-			<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
-			<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-
-    <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive -->
-	<xs:complexType name="primitiveContent">
-		<xs:choice minOccurs="0" >
-			<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
-			<xs:any namespace="##other" processContents="lax"  />
-		</xs:choice>
-	</xs:complexType>
-	
-	<xs:complexType name="eventNotificationCriteria">
-		<xs:sequence>
-			<xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
-			<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
-			<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:resourceType" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
-			<xs:element name="filterOperation" type="m2m:filterOperation" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- m2m:batchNotify is defined in the subscription resource file --> 
-
-	<xs:complexType name="filterCriteria">
-		<xs:sequence>
-			<xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="childLabels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="parentLabels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="labelsQuery" type="xs:string" minOccurs="0" />			
-			<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />			
-			<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:resourceType" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="parentResourceType" minOccurs="0" maxOccurs="1" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:resourceType" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="childAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="parentAttribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
-			<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="semanticsFilter" type="m2m:sparql" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="filterOperation" type="m2m:filterOperation" minOccurs="0" />		
-			<xs:element name="contentFilterSyntax" type="m2m:contentFilterSyntax" minOccurs="0" />
-			<xs:element name="contentFilterQuery" type="xs:string" minOccurs="0" />
-			<xs:element name="level" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="offset" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="applyRelativePath" type="xs:anyURI" minOccurs="0" />
-			
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="attribute">
-		<xs:sequence>
-			<xs:element name="name" type="xs:NCName" />
-			<xs:element name="value" type="xs:anyType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="scheduleEntries">
-		<xs:sequence>
-			<xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- m2m:aggregatedNotification and m2m:notification are in the CDT-notification xsd file -->
-
-	<!-- "actionStatus" is used across mgmtObj resources -->
-	<xs:complexType name="actionStatus">
-		<xs:sequence>
-			<xs:element name="action" type="xs:anyURI" minOccurs="0" />
-			<xs:element name="status" type="m2m:status" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="anyArgType">
-		<xs:sequence>
-			<xs:element name="name" type="xs:NCName" />
-			<xs:element name="value" type="xs:anyType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="resetArgsType">
-		<xs:sequence>
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="rebootArgsType">
-		<xs:sequence>
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="uploadArgsType">
-		<xs:sequence>
-			<xs:element name="fileType" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="downloadArgsType">
-		<xs:sequence>
-			<xs:element name="fileType" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="filesize" type="xs:positiveInteger" />
-            <xs:element name="targetFile" type="xs:string" />
-            <xs:element name="delaySeconds" type="xs:positiveInteger" />
-			<xs:element name="successURL" type="xs:anyURI" />
-			<xs:element name="startTime" type="m2m:timestamp" />
-			<xs:element name="completeTime" type="m2m:timestamp" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareInstallArgsType">
-		<xs:sequence>
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareUpdateArgsType">
-		<xs:sequence>
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="version" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareUninstallArgsType">
-		<xs:sequence>
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="version" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="execReqArgsListType">
-		<xs:choice>
-            <xs:element name="reset" type="m2m:resetArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="reboot" type="m2m:rebootArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="upload" type="m2m:uploadArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="download" type="m2m:downloadArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" minOccurs="0" maxOccurs="unbounded" />
-        </xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="mgmtLinkRef">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="name" type="m2m:resourceName" use="required" />
-				<xs:attribute name="type" type="m2m:mgmtDefinition" use="required" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-	<!--  m2m:resourceWrapper is defined in the responsePrimitive xsd file -->
-
-	<xs:complexType name="setOfAcrs">
-		<xs:sequence>
-			<xs:element name="accessControlRule" type="m2m:accessControlRule" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="accessControlRule">
-		<xs:sequence>
-			<xs:element name="accessControlOriginators" type="m2m:listOfURIs" />
-			
-			<!-- accessControlOperations defined as enumerated list 1 ... 63 -->
-			<xs:element name="accessControlOperations" type="m2m:accessControlOperations" />
-			
-			<xs:element name="accessControlContexts" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="accessControlWindow" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
-						<xs:element name="accessControlIpAddresses" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element name="ipv4Addresses" minOccurs="0" maxOccurs="1">
-										<!-- space separated list of IPv4 addresses -->										
-										<xs:simpleType>
-											<xs:restriction>
-												<xs:simpleType>
-													<xs:list itemType="m2m:ipv4" />
-												</xs:simpleType>
-												<xs:minLength value="1"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:element>
-									<xs:element name="ipv6Addresses" minOccurs="0" maxOccurs="1">
-										<!-- space separated list of IPv6 addresses -->
-										<xs:simpleType>
-											<xs:restriction>
-												<xs:simpleType>
-													<xs:list itemType="m2m:ipv6" />
-												</xs:simpleType>
-												<xs:minLength value="1"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="accessControlAuthenticationFlag" type="xs:boolean" minOccurs="0" />
-			<xs:element name="accessControlObjectDetails" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-				    <xs:sequence>
-					    <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-				    	<xs:element name="specializationID" type="m2m:specializationType" minOccurs="0" />
-				    	<xs:element name="childResourceType"  minOccurs="1" maxOccurs="1">
-				    		<xs:simpleType>
-				    			<xs:restriction>
-				    				<xs:simpleType>
-				    					<xs:list itemType="m2m:resourceType" />
-				    				</xs:simpleType>
-				    				<xs:minLength value="1"/>
-				    			</xs:restriction>
-				    		</xs:simpleType>
-				    	</xs:element>
-				    </xs:sequence>
-			    </xs:complexType>
-			</xs:element>
-			
-		</xs:sequence>
-	</xs:complexType>   
-
-	<xs:complexType name="childResourceRef">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="name" type="m2m:resourceName" use="required" />
-				<xs:attribute name="type" type="m2m:resourceType" use="required" /> 
-				<xs:attribute name="specializationID" type="xs:anyURI" use="optional" /> 
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-	<xs:complexType name="responseTypeInfo">
-		<xs:sequence>
-			<xs:element name="responseTypeValue" type="m2m:responseType" />
-			<xs:element name="notificationURI" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="xs:anyURI" /> 
-						</xs:simpleType> 
-						<xs:minLength value="0" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-    
-    <!-- m2m:rateLimit is in the Subscription xsd file -->
-
-	<xs:complexType name="operationResult">
-		<xs:sequence>
-			<xs:element name="responseStatusCode" type="m2m:responseStatusCode" />
-			<xs:element name="requestIdentifier" type="m2m:requestID" />			
-			<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
-			<xs:element name="to" type="xs:anyURI" minOccurs="0" />
-			<xs:element name="from" type="m2m:ID" minOccurs="0" />
-			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
-			<xs:element name="contentStatus" type="m2m:contentStatus" minOccurs="0" />
-			<xs:element name="contentOffset" type="xs:positiveInteger" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-    <!-- m2m:aggregatedResponse is in the CDT-responsePrimitive xsd file -->
-	
-	<xs:complexType name="contentRef">
-		<xs:sequence>
-			<xs:element name="URIReference" minOccurs="1" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence> 
-						<xs:element name="name" type="xs:NCName"/>
-						<xs:element name="URI" type="xs:anyURI"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="deletionContexts">
-		<xs:sequence>
-			<xs:element name="timeOfDay" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="locationRegions" type="m2m:locationRegion" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="locationRegion">
-		<xs:choice>
-			<xs:element name="countryCode">
-				<!-- Space separated list of 2-digit country codes -->
-				<xs:simpleType>
-					<xs:restriction>
-						<xs:simpleType>
-							<xs:list itemType="m2m:countryCode" />
-						</xs:simpleType>
-						<xs:minLength value="1"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="circRegion">
-				<!-- "circularRegion" is an ordered list of following three parameters of data type float ´ 1) longitude in the range 
-					+/-180 degrees 2) latitude in the range +/-90 degrees, 3) radius in meters -->
-				<xs:simpleType>
-					<xs:restriction>
-						<xs:simpleType>
-							<xs:list itemType="xs:float" />
-						</xs:simpleType>
-						<xs:length value="3" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-	
-	<xs:simpleType name="countryCode">
-		<xs:annotation>
-			<xs:documentation>2-character country code as defined by ISO-3166</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[A-Z]{2}" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:complexType name="missingData">
-		<xs:sequence>
-			<xs:element name="number" type="xs:positiveInteger" minOccurs="1" />
-			<xs:element name="duration" type="xs:duration" minOccurs="1" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- m2m:securityInfo, m2m:dynAuthDasResponse and m2m:eSPrimObject are in the CDT-notification xsd file -->
-	
-	<!-- m2m:listOfChildResourceRef is defined in CDT-responsePrimitive xsd file -->
-	
-	<xs:complexType name="receiverESPrimRandObject">
-		<xs:sequence>
-			<xs:element name="esprimRandID" type="xs:NCName" />
-			<xs:element name="esprimRandValue" type="xs:NCName"  />
-			<xs:element name="esprimRandExpiry" type="m2m:absRelTimestamp"  />
-			<xs:element name="esprimKeyGenAlgIDs" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:esprimKeyGenAlgID" />
-						</xs:simpleType> 	
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="esprimProtocolAndAlgIDs" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:esprimProtocolAndAlgID" />
-						</xs:simpleType> 	
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>        
-	</xs:complexType>
-	
-	<!-- This data type is used for the originatorESPrimRandObject parameter in End-to-End Security of Primitives, see TS-0003 -->
-	<xs:complexType name="originatorESPrimRandObject">
-		<xs:sequence>
-			<xs:element name="esprimRandID" type="xs:NCName" />
-			<xs:element name="esprimRandValue" type="xs:NCName"  />
-			<xs:element name="esprimRandExpiry" type="m2m:absRelTimestamp"  />
-			<xs:element name="esprimKeyGenAlgIDs" type="m2m:esprimKeyGenAlgID" />
-			<xs:element name="esprimProtocolAndAlgIDs" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:esprimProtocolAndAlgID" />
-						</xs:simpleType> 	
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>        
-	</xs:complexType>
-		
-	
-	<xs:complexType name="e2eSecInfo">
-		<xs:sequence>
-			<xs:element name="supportedE2ESecFeatures" minOccurs="1" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:suid" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="certificates" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="xs:base64Binary" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="sharedReceiverESPrimRandObject" type="m2m:receiverESPrimRandObject" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-
-	<xs:complexType name="tokenPermission">
-		<xs:sequence>
-			<xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
-			<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
-			<xs:element name="roleIDs" minOccurs="0">      
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:roleID" /> 
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="tokenPermissions">
-		<xs:sequence>
-			<xs:element name="permission" type="m2m:tokenPermission" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="tokenClaimSet">
-		<xs:sequence>
-			<xs:element name="version" type="xs:string" />
-			<xs:element name="tokenID" type="m2m:tokenID" />
-			<xs:element name="holder" type="m2m:ID" />
-			<xs:element name="issuer" type="m2m:ID" />
-			<xs:element name="notBefore" type="m2m:timestamp" />
-			<xs:element name="notAfter" type="m2m:timestamp" />
-			<xs:element name="tokenName" type="xs:string" minOccurs="0" />
-			<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
-			<xs:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />
-			<xs:element name="extension" type="xs:string" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="dynAuthLocalTokenIdAssignments">
-		<xs:sequence>
-			<xs:element name="localTokenIdAssignment" minOccurs="1" maxOccurs="unbounded" >
-				<complexType>
-					<sequence>
-						<xs:element name="localTokenID" type="xs:NCName" />
-						<xs:element name="tokenID" type="m2m:tokenID" />
-					</sequence>
-				</complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="dynAuthTokenSummary">
-		<xs:sequence>
-			<xs:element name="tokenID" type="m2m:tokenID" />
-			<xs:element name="notBefore" type="m2m:timestamp" />
-			<xs:element name="notAfter" type="m2m:timestamp" />
-			<xs:element name="tokenName" type="xs:string" minOccurs="0" />
-			<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="dynAuthTokenReqInfo">
-		<xs:sequence>
-			<xs:element name="dasInfo" minOccurs="1" maxOccurs="unbounded" >
-				<complexType>
-					<sequence>
-						<xs:element name="URI" type="xs:anyURI" />
-						<xs:element name="dasRequest" type="m2m:dynAuthDasRequest" minOccurs="0"/>
-						<xs:element name="securedDasRequest" type="m2m:dynAuthJWT" minOccurs="0"/>
-					</sequence>
-				</complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="dynAuthDasRequest">
-		<xs:sequence>
-			<xs:element name="originator" type="m2m:ID" minOccurs="1" />
-			<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="operation" type="m2m:operation" minOccurs="1" />
-			<xs:element name="originatorIP" minOccurs="0" >
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" />
-						<xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" />         
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>            
-			<xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />
-			<xs:element name="originatorRoleIDs" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:roleID" />
-						</xs:simpleType> 
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>            
-			<xs:element name="requestTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="targetedResourceID" type="xs:anyURI" minOccurs="1" />
-			<xs:element name="proposedPrivilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
-			<xs:element name="roleIDsFromACPs"  minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:roleID" />
-						</xs:simpleType> 
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="tokenIDs" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:tokenID" />
-						</xs:simpleType> 
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- initialBackoffTime, additionalBackoffTime, maximumBackoffTime in units in milliseconds -->
-	<xs:complexType name="backOffParameters">
-		<xs:sequence>
-			<xs:element name="backOffParametersSet" minOccurs="1" maxOccurs="unbounded" >
-				<complexType>
-					<sequence>
-						<xs:element name="networkAction" type="m2m:networkAction" minOccurs="0"/>
-						<xs:element name="initialBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
-						<xs:element name="additionalBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
-						<xs:element name="maximumBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
-						<xs:element name="optionalRandomBackoffTime" type="xs:nonNegativeInteger" minOccurs="0"/>
-					</sequence>
-				</complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- a list of dataLinks to describe persistent input/output data (as in Input/OutputDataPoint)	-->
-	<!-- of services and operations, or transient data (as in operationInput/Output)of operations 	--> 	
-	<xs:complexType name="listOfDataLinks">
-		<xs:sequence>
-			<xs:element name="dataLinkEntry" type="m2m:dataLink" minOccurs="1" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- a dataLink links (simple or complex) data specified in an ontology to their oneM2M resource --> 
-	<xs:complexType name="dataLink">
-		<xs:sequence>
-			
-			<!-- the name of the Input/OutputDataPoint or OperationIn-/Output as specified by the ontology --> 
-			<xs:element name="name" type="xs:anyURI" />
-			
-			<!-- the URL of the container/flexContainer resource for the Input/OutputDataPoint or OperationIn-/Output --> 
-			<xs:element name="dataContainerID" type="m2m:ID" />
-			
-			<!-- if the dataLink references simple type data the element shall contain		-->
-			<!--	a)	the name of the customAttribute if URL points to a flexContainer or -->
-			<!-- 	b)	the string "latest" if URL points to a container					-->
-			<!-- if the dataLink references complex-type data (i.e. the complete resource	-->
-			<!-- including customAttributes and subresources) the element is empty			-->
-			<xs:element name="attributeName" type="xs:NCName" minOccurs="0" maxOccurs="1" />
-			
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="operationMonitor">
-		<xs:sequence>
-			<xs:element name="operations" type="m2m:accessControlOperations" minOccurs="0" />
-			<xs:element name="originator" type="m2m:ID" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="dynAuthRelMapRequest">
-		<xs:sequence>
-			<xs:element name="originator" type="m2m:ID" minOccurs="0" />
-			<xs:element name="tokenIDs" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:tokenID" />
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>		
-			<xs:element name="tokens" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:dynAuthJWT" />
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>		
-			<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0" />
-			<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="dynAuthRelMapResponse">
-		<xs:sequence>
-			<xs:element name="tokenIDs" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:tokenID" />
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>		
-			<xs:element name="tokens" minOccurs="0" >
-				<xs:simpleType>
-					<xs:restriction> 
-						<xs:simpleType> 
-							<xs:list itemType="m2m:dynAuthJWT" />
-						</xs:simpleType> 				
-						<xs:minLength value="1" /> 
-					</xs:restriction> 
-				</xs:simpleType>
-			</xs:element>		
-			<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
-			<xs:element name="signature" type="m2m:signatureList" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="ipAddress">
-		<xs:sequence>
-			<xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>	
-
-	<xs:complexType name="setOfPermissions">
-		<xs:sequence>
-			<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>	
-	
-	<xs:complexType name="sessionDescriptions">
-		<xs:sequence>
-			<xs:element name="sessionDescription" type="m2m:sessionDescription" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>	
-	
-	<xs:complexType name="activityPatternElements">
-		<xs:sequence>
-			<xs:element name="activityPatternElements" type="m2m:activityPattern" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="activityPattern">
-		<xs:sequence>
-			<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" />
-			<xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" />	
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="eventNotificationCriteriaSet">
-		<xs:sequence>
-			<xs:element name="eventNotificationCriteriaEntry" type="m2m:eventNotificationCriteria" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>	
-	
-	<xs:complexType name="specializationType">
-		<xs:sequence>
-			<xs:element name="containerDefinition" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" minOccurs="0" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>	
-
-	<xs:complexType name="mashupMembers">
-		<xs:sequence>
-			<xs:element name="mashupMember" minOccurs="1" maxOccurs="unbounded" >
-				<complexType>
-					<sequence>
-						<xs:element name="memberURI" type="xs:anyURI" />
-						<xs:element name="memberValue" type="xs:double" minOccurs="0"/>
-					</sequence>
-				</complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>	
-	
-		
-	<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M 
-		Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is 
-		defined below -->
-	
-	<xs:complexType name="resource">
-		<xs:sequence>
-			<xs:element name="resourceType" type="m2m:resourceType" />
-			<xs:element name="resourceID" type="m2m:ID" />
-			<xs:element name="parentID" type="m2m:nhURI" />
-			<xs:element name="creationTime" type="m2m:timestamp" />
-			<xs:element name="lastModifiedTime" type="m2m:timestamp" />
-			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-		</xs:sequence>
-		<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
-	</xs:complexType>
-
-	<xs:complexType name="regularResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announceableResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:regularResource">
-				<xs:sequence>
-					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="announcedAttribute" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction> 
-								<xs:simpleType> 
-									<xs:list itemType="xs:NCName" />
-								</xs:simpleType> 	
-								<xs:minLength value="1" /> 
-							</xs:restriction> 
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedResource">
-		<xs:complexContent>
-			<!-- AccessControlPolicyIDs is mandatory for announced resources but not for the original ones -->
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" />
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="link" type="xs:anyURI" />
-					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announceableSubordinateResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="announcedAttribute" minOccurs="0">
-						<xs:simpleType>
-							<xs:restriction> 
-								<xs:simpleType> 
-									<xs:list itemType="xs:NCName" />
-								</xs:simpleType>
-								<xs:minLength value="1" /> 
-							</xs:restriction> 
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<xs:complexType name="subordinateResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedSubordinateResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="link" type="xs:anyURI" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="mgmtResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:announceableResource">
-				<xs:sequence>
-					<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
-					<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="description" type="xs:string" minOccurs="0" />
-					<xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedMgmtResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:announcedResource">
-				<xs:sequence>
-					<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
-					<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="description" type="xs:string" minOccurs="0" />
-					<xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<!-- Auxiliary datatype used below -->
-	<xs:simpleType name="listOfNCNames" >
-		<xs:restriction> 
-			<xs:simpleType> 
-				<xs:list itemType="xs:NCName" />
-			</xs:simpleType> 	
-			<xs:minLength value="1" /> 
-		</xs:restriction> 
-	</xs:simpleType>
-	
-	<xs:complexType name="flexContainerResource">
-				<xs:sequence>
-					<xs:element name="resourceType" type="m2m:resourceType" />
-					<xs:element name="resourceID" type="m2m:ID" />
-					<xs:element name="parentID" type="m2m:nhURI" />
-					<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
-					<xs:element name="expirationTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />					
-					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="announcedAttribute" type="m2m:listOfNCNames" minOccurs="0" />
-					<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-					<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-					<xs:element name="containerDefinition" type="xs:anyURI" />					
-					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-					<xs:element name="contentSize" type="xs:nonNegativeInteger" />
-					<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>	
-				<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />				
-	</xs:complexType>
-	
-	<xs:complexType name="announcedFlexContainerResource">
-				<xs:sequence>
-					<xs:element name="resourceType" type="m2m:resourceType" />
-					<xs:element name="resourceID" type="m2m:ID" />
-					<xs:element name="parentID" type="m2m:nhURI" />
-					<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" />
-					<xs:element name="expirationTime" type="m2m:timestamp" minOccurs="0" />
-					<xs:element name="link" type="xs:anyURI" />
-					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />					
-					<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
-					<xs:element name="containerDefinition" type="xs:anyURI" />
-					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-					<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0"/>
-					<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>	
-		<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />									
-	</xs:complexType>
-	
-	<!-- The following Global Elements define substitution groups -->
-	<xs:element name="sg_resource" type="m2m:resource"  abstract="true" />
-	<xs:element name="sg_regularResource" type="m2m:regularResource"  abstract="true" />
-	<xs:element name="sg_announcedResource" type="m2m:announcedResource"  abstract="true" />
-	<xs:element name="sg_announceableResource" type="m2m:announceableResource"  abstract="true"/>
-	<xs:element name="sg_subordinateResource" type="m2m:subordinateResource"  abstract="true" />
-	<xs:element name="sg_announceableSubordinateResource" type="m2m:announceableSubordinateResource"  abstract="true" />
-	<xs:element name="sg_announcedSubordinateResource" type="m2m:announcedSubordinateResource"  abstract="true" />
-	<xs:element name="sg_mgmtResource" type="m2m:mgmtResource"  abstract="true" />
-	<xs:element name="sg_announcedMgmtResource" type="m2m:announcedMgmtResource" abstract="true" />
-	<xs:element name="sg_flexContainerResource" type="m2m:flexContainerResource"  abstract="true" />
-	<xs:element name="sg_announcedFlexContainerResource" type="m2m:announcedFlexContainerResource"  abstract="true" />
-
-</xs:schema>
diff --git a/v3_28_0/CDT-container-v3_28_0.xsd.bu b/v3_28_0/CDT-container-v3_28_0.xsd.bu
deleted file mode 100644
index d2e3799dd75e931b5489074694d30acbe7db80d1..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-container-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-	
-	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
-						<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> 
-						<xs:element name="disableRetrieval" type="xs:boolean" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:contentInstance" />
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:sg_flexContainerResource" />	
-								<xs:element ref="m2m:timeSeries" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="containerAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" minOccurs="0"  />
-						<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="disableRetrieval" type="xs:boolean" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:contentInstance" />
-								<xs:element ref="m2m:contentInstanceAnnc" />
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:containerAnnc" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:sg_flexContainerResource" />
-								<xs:element ref="m2m:sg_announcedFlexContainerResource" />
-								<xs:element ref="m2m:timeSeries" />
-								<xs:element ref="m2m:timeSeriesAnnc" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-contentInstance-v3_28_0.xsd.bu b/v3_28_0/CDT-contentInstance-v3_28_0.xsd.bu
deleted file mode 100644
index 7e8650049b3a7c9233c29c17bcdd760c79394d03..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-contentInstance-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
-						<xs:element name="contentRef" type="m2m:contentRef" minOccurs="0"/>
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="content" type="xs:anyType" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">			
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="contentInstanceAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="content" type="xs:anyType" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">			
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-crossResourceSubscription-v3_28_0.xsd.bu b/v3_28_0/CDT-crossResourceSubscription-v3_28_0.xsd.bu
deleted file mode 100644
index d204b73d03264b4bc90069ff3130b3275dd982e8..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-crossResourceSubscription-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="regularResourcesAsTarget" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="subscriptionResourcesAsTarget" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="regularResourcesAsTargetSubscriptions" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="timeWindowType" type="m2m:timeWindowType" />
-						<xs:element name="timeWindowSize" type="xs:duration" />
-						<xs:element name="eventNotificationCriteriaSet" type="m2m:eventNotificationCriteriaSet" minOccurs="0" />
-						<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
-						<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="notificationURI" >
-						    <xs:simpleType> 
-							    <xs:list itemType="xs:anyURI" /> 
-						    </xs:simpleType>
-						</xs:element>
-						<xs:element name="subscriberURI" type="m2m:ID" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:schedule" />
-								<xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-delivery-v3_28_0.xsd.bu b/v3_28_0/CDT-delivery-v3_28_0.xsd.bu
deleted file mode 100644
index 4335a3152e6398087df0248e739d8321d01e7287..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-delivery-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-
-
-	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="source" type="m2m:ID" />
-						<xs:element name="target" type="m2m:ID" />
-						<xs:element name="lifespan" type="m2m:timestamp" />
-						<xs:element name="eventCat" type="m2m:eventCat" />
-						<xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" />
-						<xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-deviceCapability-v3_28_0.xsd.bu b/v3_28_0/CDT-deviceCapability-v3_28_0.xsd.bu
deleted file mode 100644
index 1f7ddc0e7ae5931887cc2f8276a6547ddec3d4a2..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-deviceCapability-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" />
-						<xs:element name="attached" type="xs:boolean" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" />
-						<xs:element name="currentState" type="xs:boolean" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="disable" type="xs:boolean" minOccurs="0"/>
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceCapabilityAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" minOccurs="0" />
-						<xs:element name="attached" type="xs:boolean" minOccurs="0" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="currentState" type="xs:boolean" minOccurs="0" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="disable" type="xs:boolean" minOccurs="0" />
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-deviceInfo-v3_28_0.xsd.bu b/v3_28_0/CDT-deviceInfo-v3_28_0.xsd.bu
deleted file mode 100644
index fcac0ef756a03f004b3894964b1fd5a914eb344b..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-deviceInfo-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" />
-						<xs:element name="manufacturer" type="xs:string" />
-						<xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
-						<xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
-						<xs:element name="model" type="xs:string" />
-						<xs:element name="subModel" type="xs:string" minOccurs="0"/>
-						<xs:element name="deviceType" type="xs:string" />
-						<xs:element name="deviceName" type="xs:string" minOccurs="0"/>
-						<xs:element name="fwVersion" type="xs:string" minOccurs="0"/>
-						<xs:element name="swVersion" type="xs:string" minOccurs="0"/>
-						<xs:element name="hwVersion" type="xs:string" minOccurs="0"/>
-						<xs:element name="osVersion" type="xs:string" minOccurs="0"/>
-						<xs:element name="country" type="xs:string" minOccurs="0"/>
-						<xs:element name="location" type="xs:string" minOccurs="0"/>
-						<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
-						<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
-						<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
-						<xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
-			   
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
-						<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
-						<xs:element name="manufacturerDetailsLink" type="xs:string" minOccurs="0"/>
-						<xs:element name="manufacturingDate" type="m2m:timestamp" minOccurs="0"/>
-						<xs:element name="model" type="xs:string" minOccurs="0" />
-						<xs:element name="subModel" type="xs:string" minOccurs="0"/>
-						<xs:element name="deviceType" type="xs:string" minOccurs="0" />
-						<xs:element name="deviceName" type="xs:string" minOccurs="0"/>
-						<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="swVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="osVersion" type="xs:string" minOccurs="0"/>
-						<xs:element name="country" type="xs:string" minOccurs="0"/>
-						<xs:element name="location" type="xs:string" minOccurs="0"/>
-						<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
-						<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
-						<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
-						<xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-dynamicAuthorizationConsultation-v3_28_0.xsd.bu b/v3_28_0/CDT-dynamicAuthorizationConsultation-v3_28_0.xsd.bu
deleted file mode 100644
index f57654840440f2a1360693637778403e29b9cbf8..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-dynamicAuthorizationConsultation-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="dynamicAuthorizationEnabled" type="xs:boolean" />
-						<xs:element name="dynamicAuthorizationPoA" type="m2m:poaList" />
-						<xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd.bu b/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd.bu
deleted file mode 100644
index b2b2e0c89ad3d6e91c1195d1364c6207b39ae39a..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-enumerationTypes-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,1672 +0,0 @@
-<?xml version="1.0" ?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	targetNamespace="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified">
-
-	<xs:simpleType name="resourceType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- accessControlPolicy -->
-			<xs:enumeration value="1" />
-			<!-- AE -->
-			<xs:enumeration value="2" />
-			<!-- container -->
-			<xs:enumeration value="3" />
-			<!-- contentInstance -->
-			<xs:enumeration value="4" />
-			<!-- CSEBase -->
-			<xs:enumeration value="5" />
-			<!-- delivery -->
-			<xs:enumeration value="6" />
-			<!-- eventConfig -->
-			<xs:enumeration value="7" />
-			<!-- execInstance -->
-			<xs:enumeration value="8" />
-			<!-- group -->
-			<xs:enumeration value="9" />
-			<!-- locationPolicy -->
-			<xs:enumeration value="10" />
-			<!-- m2mServiceSubscriptionProfile -->
-			<xs:enumeration value="11" />
-			<!-- mgmtCmd -->
-			<xs:enumeration value="12" />
-			<!-- mgmtObj -->
-			<xs:enumeration value="13" />
-			<!-- node -->
-			<xs:enumeration value="14" />
-			<!-- pollingChannel -->
-			<xs:enumeration value="15" />
-			<!-- remoteCSE -->
-			<xs:enumeration value="16" />
-			<!-- request -->
-			<xs:enumeration value="17" />
-			<!-- schedule -->
-			<xs:enumeration value="18" />
-			<!-- serviceSubscribedAppRule -->
-            <xs:enumeration value="19" />
-            <!-- serviceSubscribedNode -->
-			<xs:enumeration value="20" />
-			<!-- statsCollect -->
-			<xs:enumeration value="21" />
-			<!-- statsConfig -->
-			<xs:enumeration value="22" />
-			<!-- subscription -->
-			<xs:enumeration value="23" />
-			<!-- semanticDescriptor -->
-			<xs:enumeration value="24" />
-			<!-- notificationTargetMgmtPolicyRef -->
-			<xs:enumeration value="25" />	
-			<!-- notificationTargetPolicy -->
-			<xs:enumeration value="26" />	
-			<!-- policyDeletionRules -->
-			<xs:enumeration value="27" />	
-			<!-- flexContainer -->
-			<xs:enumeration value="28" />
-			<!-- timeSeries -->
-			<xs:enumeration value="29" />
-			<!-- timeSeriesInstance -->
-			<xs:enumeration value="30" />
-			<!-- role -->
-			<xs:enumeration value="31" />
-			<!-- token -->
-			<xs:enumeration value="32" />
-			<!-- void: trafficPattern -->
-			<!-- dynamicAuthorizationConsultation -->
-			<xs:enumeration value="34" />			
-			<!-- authorizationDecision -->
-			<xs:enumeration value="35" />	
-			<!-- authorizationPolicy -->
-			<xs:enumeration value="36" />	
-			<!-- authorizationInformation -->
-			<xs:enumeration value="37" />			
-			<!-- ontologyRepository -->
-			<xs:enumeration value="38" />	
-			<!-- ontology -->
-			<xs:enumeration value="39" />	
-			<!-- semanticMashupJobProfile -->
-			<xs:enumeration value="40" />	
-			<!-- semanticMashupInstance -->
-			<xs:enumeration value="41" />	
-			<!-- semanticMashupResult -->
-			<xs:enumeration value="42" />	
-			<!-- AEContactList -->
-			<xs:enumeration value="43" />	
-			<!-- AEContactListPerCSE -->
-			<xs:enumeration value="44" />	
-			<!-- localMulticastGroup -->
-			<xs:enumeration value="45" />	
-			<!-- multimediaSession -->
-			<xs:enumeration value="46" />	
-			<!-- triggerRequest -->
-			<xs:enumeration value="47" />	
-			<!-- crossResourceSubscription -->
-			<xs:enumeration value="48" />			
-			<!-- backgroundDataTransfer -->
-			<xs:enumeration value="49" />	
-			<!-- transactionMgmt -->
-			<xs:enumeration value="50" />	
-			<!-- transaction -->
-			<xs:enumeration value="51" />			
-			<!-- accessControlPolicyAnnc -->
-			<xs:enumeration value="10001" />
-			<!-- AEAnnc -->
-			<xs:enumeration value="10002" />
-			<!-- containerAnnc -->
-			<xs:enumeration value="10003" />
-			<!-- contentInstanceAnnc -->
-			<xs:enumeration value="10004" />
-			<!-- groupAnnc -->
-			<xs:enumeration value="10009" />
-			<!-- locationPolicyAnnc -->
-			<xs:enumeration value="10010" />
-			<!-- mgmtObjAnnc -->
-			<xs:enumeration value="10013" />
-			<!-- nodeAnnc -->
-			<xs:enumeration value="10014" />
-			<!-- remoteCSEAnnc -->
-			<xs:enumeration value="10016" />
-			<!-- scheduleAnnc -->
-			<xs:enumeration value="10018" />
-			<!-- semanticDescriptorAnnc -->
-			<xs:enumeration value="10024" />
-			<!-- flexContainerAnnc -->
-			<xs:enumeration value="10028" />
-			<!-- timeSeriesAnnc -->
-			<xs:enumeration value="10029" />
-			<!-- timeSeriesInstanceAnnc -->
-			<xs:enumeration value="10030" />
-			<!-- void: trafficPatternAnnc -->
-			<!-- dynamicAuthorizationConsultationAnnc -->
-			<xs:enumeration value="10034" />			
-			<!-- ontologyRepositoryAnnc -->
-			<xs:enumeration value="10038" />
-			<!-- ontologyAnnc -->
-			<xs:enumeration value="10039" />
-			<!-- semanticMashupJobProfileAnnc -->
-			<xs:enumeration value="10040" />
-			<!-- semanticMashupInstanceAnnc -->
-			<xs:enumeration value="10041" />
-			<!-- semanticMashupResultAnnc -->
-			<xs:enumeration value="10042" />			
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="cseTypeID">
-		<xs:annotation>
-			<xs:documentation>Used for cseType attribute of &lt;CSEBase&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IN-CSE -->
-			<xs:enumeration value="1" />
-			<!-- MN-CSE -->
-			<xs:enumeration value="2" />
-			<!-- ASN-CSE -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="locationSource">
-		<xs:annotation>
-			<xs:documentation>Used for locationSource attribute of &lt;locationPolicy&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Network-based -->
-			<xs:enumeration value="1" />
-			<!-- Device-based -->
-			<xs:enumeration value="2" />
-			<!-- Sharing-based -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="stdEventCats">
-		<xs:annotation>
-			<xs:documentation>Used for ec parameter in request and eventCat attribute of &lt;delivery&gt; resource and cmdh
-				policy resource types.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Immediate -->
-			<xs:enumeration value="2" />
-			<!-- BestEffort -->
-			<xs:enumeration value="3" />
-			<!-- Latest -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="operation">
-		<xs:annotation>
-			<xs:documentation>Used for Operation parameter in request and operation attribute in &lt;request&gt; resource as well as resource as well as operationMonitor
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Create -->
-			<xs:enumeration value="1" />
-			<!-- Retrieve -->
-			<xs:enumeration value="2" />
-			<!-- Update -->
-			<xs:enumeration value="3" />
-			<!-- Delete -->
-			<xs:enumeration value="4" />
-			<!-- Notify -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="responseType">
-		<xs:annotation>
-			<xs:documentation>Used for rt parameter in request and operation attribute in &lt;request&gt; resource
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- nonBlockingRequestSynch -->
-			<xs:enumeration value="1" />
-			<!-- nonBlockingRequestAsynch -->
-			<xs:enumeration value="2" />
-			<!-- blockingRequest -->
-			<xs:enumeration value="3" />
-			<!-- flexBlocking -->
-			<xs:enumeration value="4" />
-			<!-- noResponse -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="resultContent">
-		<xs:annotation>
-			<xs:documentation>Used for Result Content parameter in request.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Nothing -->
-			<xs:enumeration value="0" />
-			<!-- Attributes -->
-			<xs:enumeration value="1" />
-			<!-- Hierarchical Address -->
-            <xs:enumeration value="2" />
-            <!-- Hierarchical Address + Attributes -->
-            <xs:enumeration value="3" />
-			<!-- Attributes + Child Resources -->
-			<xs:enumeration value="4" />
-			<!-- Attributes + Child Resource References -->
-            <xs:enumeration value="5" />
-			<!-- Child Resource References -->
-			<xs:enumeration value="6" />
-			<!-- Original Resource -->
-			<xs:enumeration value="7" />
-			<!-- Child Resources -->
-			<xs:enumeration value="8" />
-			<!-- Modified Attributes -->
-			<xs:enumeration value="9" />
-			<!-- semantic content -->
-			<xs:enumeration value="10" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="desIdResType">
-		<xs:annotation>
-			<xs:documentation>Used in &lt;request&gt; </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- structured -->
-			<xs:enumeration value="1" />
-			<!-- unstructured -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="responseStatusCode">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- ACCEPTED     -->
-			<xs:enumeration value="1000" />
-			<!-- ACCEPTED for nonBlockingRequestSynch -->
-			<xs:enumeration value="1001" />
-			<!-- ACCEPTED for nonBlockingRequestAsynch -->
-			<xs:enumeration value="1002" />
-			<!-- OK           -->
-			<xs:enumeration value="2000" />
-			<!-- CREATED      -->
-			<xs:enumeration value="2001" />
-			<!-- DELETED      -->
-			<xs:enumeration value="2002" />
-			<!-- UPDATED      -->
-			<xs:enumeration value="2004" />
-			
-			<!-- BAD_REQUEST  -->
-			<xs:enumeration value="4000" />
-			<!-- RELEASE_VERSION_NOT_SUPPORTED -->
-			<xs:enumeration value="4001" />
-			<!-- NOT_FOUND    -->
- 			<xs:enumeration value="4004" />
-			<!-- OPERATION_NOT_ALLOWED  -->
-			<xs:enumeration value="4005" />
-			<!-- REQUEST_TIMEOUT  -->
-			<xs:enumeration value="4008" /> 
-			<!-- UNSUPPORTED_MEDIA_TYPE  -->
-			<xs:enumeration value="4015" />
-			<!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
-			<xs:enumeration value="4101" /> 
-			<!-- CONTENTS_UNACCEPTABLE  -->
-			<xs:enumeration value="4102" />
-			<!-- ORIGINATOR_HAS_NO_PRIVILEGE -->
-			<xs:enumeration value="4103" />
-			<!-- GROUP_REQUEST_IDENTIFIER_EXISTS  -->
-			<xs:enumeration value="4104" />
-			<!-- CONFLICT  -->
-			<xs:enumeration value="4105" />
-			<!-- ORIGINATOR_HAS_NOT_REGISTERED -->
-			<xs:enumeration value="4106" /> 
-			<!-- SECURITY_ASSOCIATION_REQUIRED -->
-			<xs:enumeration value="4107" /> 
-			<!-- INVALID_CHILD_RESOURCE_TYPE -->
-			<xs:enumeration value="4108" /> 
-			<!-- NO_MEMBERS                -->
-			<xs:enumeration value="4109" /> 		
-			<!-- UNSUPPORTED_MEDIA_TYPE  -->
-			<xs:enumeration value="4015" />	
-			<!-- GROUP_MEMBER_TYPE_INCONSISTENT -->
-			<xs:enumeration value="4110" />   		
-			<!-- ESPRIM_UNSUPPORTED_OPTION -->
-			<xs:enumeration value="4111" />     
-			<!-- ESPRIM_UNKNOWN_KEY_ID -->
-			<xs:enumeration value="4112" />     
-			<!-- GESPRIM_UNKNOWN_ORIG_RAND_ID -->
-			<xs:enumeration value="4113" />     
-			<!-- ESPRIM_UNKNOWN_RECV_RAND_ID -->
-			<xs:enumeration value="4114" />     
-			<!-- ESPRIM_BAD_MAC -->
-			<xs:enumeration value="4115" />    
-			<!-- ESPRIM_IMPERSONATION_ERROR -->
-			<xs:enumeration value="4116" />    
-			<!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
-			<xs:enumeration value="4117" />    		
-			<!-- ONTOLOGY_NOT_AVAILABLE -->
-			<xs:enumeration value="4118" />    
-			<!-- LINKED_SEMANTICS_NOT_AVAILABLE -->
-			<xs:enumeration value="4119" />    
-			<!-- INVALID_SEMANTICS -->
-			<xs:enumeration value="4120" />    	
-			<!-- MASHUP_MEMBER_NOT_FOUND -->
-			<xs:enumeration value="4121" />    
-			<!-- INVALID_TRIGGER_PURPOSE -->
-			<xs:enumeration value="4122" />    
-			<!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
-			<xs:enumeration value="4123" />   
-			<!-- BLOCKING_SUBSCRIPTION_ALREADY_EXISTS -->
-			<xs:enumeration value="4124" /> 
-			<!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
-			<xs:enumeration value="4125" />    
-			<!-- APP_RULE_VALIDATION_FAILED -->
-			<xs:enumeration value="4126" /> 
-			<!-- OPERATION_DENIED_BY_REMOTE_ENTITY -->
-			<xs:enumeration value="4127" />    
-			<!-- SERVICE_SUBSCRIPTION_NOT_ESTABLISHED -->
-			<xs:enumeration value="4128" />
-			<!-- INVALID_SPARQL_QUERY -->
-			<xs:enumeration value="4143" />     
-			
-			<!-- INTERNAL_SERVER_ERROR     -->
-			<xs:enumeration value="5000" />              
-			<!-- NOT_IMPLEMENTED           -->
-			<xs:enumeration value="5001" />
-			<!-- TARGET_NOT_REACHABLE      -->
-			<xs:enumeration value="5103" />             
-			<!-- RECEIVER_HAS_NO_PRIVILEGE -->
-			<xs:enumeration value="5105" />
-			<!-- ALREADY_EXISTS            -->
-			<xs:enumeration value="5106" /> 
-			<!-- REMOTE_ENTITY_NOT_REACHABLE -->
-			<xs:enumeration value="5107" /> 
-			<!-- TARGET_NOT_SUBSCRIBABLE   -->
-			<xs:enumeration value="5203" />
-			<!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED   -->
-			<xs:enumeration value="5204" />
-			<!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE     -->
-			<xs:enumeration value="5205" />            
-			<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED     -->
-			<xs:enumeration value="5206" />    
-			<!-- NOT_ACCEPTABLE                         -->
-			<xs:enumeration value="5207" />
-			<!-- DISCOVERY_DENIED_BY_IPE                -->
-			<xs:enumeration value="5208" />    			
-			<!-- GROUP_MEMBERS_NOT_RESPONDED            -->
-			<xs:enumeration value="5209" />    
-			<!-- ESPRIM_DECRYPTION_ERROR                -->
-			<xs:enumeration value="5210" />    
-			<!-- ESPRIM_ENCRYPTION_ERROR                -->
-			<xs:enumeration value="5211" />    
-			<!-- SPARQL_UPDATE_ERROR                    -->
-			<xs:enumeration value="5212" />  
-			<!-- TARGET_HAS_NO_SESSION_CAPABILITY       -->
-			<xs:enumeration value="5214" />  
-			<!-- SESSION_IS_ONLINE                      -->
-			<xs:enumeration value="5215" />  			
-			<!-- JOIN_MULTICAST_GROUP_FAILED            -->
-			<xs:enumeration value="5216" />  			
-			<!-- LEAVE_MULTICAST_GROUP_FAILED           -->
-			<xs:enumeration value="5217" />  			
-			<!-- TRIGGERING_DISABLED_FOR_RECIPIENT      -->
-			<xs:enumeration value="5218" />  
-			<!-- UNABLE_TO_REPLACE_REQUEST              -->
-			<xs:enumeration value="5219" />  			
-			<!-- UNABLE_TO_RECALL_REQUEST               -->
-			<xs:enumeration value="5220" />  			
-			<!-- CROSS_RESOURCE_OPERATION_FAILURE       -->
-			<xs:enumeration value="5221" />  
-			<!-- TRANSACTION_PROCESSING_IS_INCOMPLETE   -->
-			<xs:enumeration value="5222" />  
-			
-			<!-- EXTERNAL_OBJECT_NOT_REACHABLE          -->
-			<xs:enumeration value="6003" />              
-			<!-- EXTERNAL_OBJECT_NOT_FOUND              -->
-			<xs:enumeration value="6005" />  
-			<!-- MAX_NUMBER_OF_MEMBER_EXCEEDED          -->
-			<xs:enumeration value="6010" />              
-			<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED     -->
-			<xs:enumeration value="6020" />               
-			<!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT     -->
-			<xs:enumeration value="6021" />               
-			<!-- INVALID_CMDTYPE                        -->
-			<xs:enumeration value="6022" />               
-			<!-- INVALID_ARGUMENTS                      -->
-			<xs:enumeration value="6023" />               
-			<!-- INSUFFICIENT_ARGUMENTS                 -->
-			<xs:enumeration value="6024" />               
-			<!-- MGMT_ CONVERSION_ERROR                 -->
-			<xs:enumeration value="6025" />               
-			<!-- MGMT_ CANCELLATION_FAILED              -->
-			<xs:enumeration value="6026" />               
-			<!-- ALREADY_COMPLETE                       -->
-			<xs:enumeration value="6028" />               
-			<!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
-			<xs:enumeration value="6029" />   		
-			<!-- EXTERNAL_OBJECT_NOT_REACHABLE_BEFORE_RQET_TIMEOUT -->
-			<xs:enumeration value="6030" />   
-			<!-- EXTERNAL_OBJECT_NOT_REACHABLE_BEFORE_OET_TIMEOUT -->
-			<xs:enumeration value="6031" />   			
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="requestStatus">
-		<xs:annotation>
-			<xs:documentation>Used for request Status in the &lt;request&gt; resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- COMPLETED -->
-			<xs:enumeration value="1" />
-			<!-- FAILED -->
-			<xs:enumeration value="2" />
-			<!-- PENDING -->
-			<xs:enumeration value="3" />
-			<!-- FORWARDED -->
-			<xs:enumeration value="4" />
-			<!-- PARTIALLY_COMPLETED -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="memberType">
-		<xs:annotation>
-			<xs:documentation>Used for memberType attribute in &lt;group&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- mixed -->
-			<xs:enumeration value="0" />
-			<!-- accessControlPolicy -->
-			<xs:enumeration value="1" />
-			<!-- AE -->
-			<xs:enumeration value="2" />
-			<!-- container -->
-			<xs:enumeration value="3" />
-			<!-- contentInstance -->
-			<xs:enumeration value="4" />
-			<!-- CSEBase -->
-			<xs:enumeration value="5" />
-			<!-- delivery -->
-			<xs:enumeration value="6" />
-			<!-- eventConfig -->
-			<xs:enumeration value="7" />
-			<!-- execInstance -->
-			<xs:enumeration value="8" />
-			<!-- group -->
-			<xs:enumeration value="9" />
-			<!-- locationPolicy --> 
-			<xs:enumeration value="10" />
-			<!-- m2mServiceSubscription -->
-			<xs:enumeration value="11" />
-			<!-- mgmtCmd -->
-			<xs:enumeration value="12" />
-			<!-- mgmtObj -->
-			<xs:enumeration value="13" />
-			<!-- node -->
-			<xs:enumeration value="14" />
-			<!-- pollingChannel -->
-			<xs:enumeration value="15" />
-			<!-- remoteCSE -->
-			<xs:enumeration value="16" />
-			<!-- request -->
-			<xs:enumeration value="17" />
-			<!-- schedule -->
-			<xs:enumeration value="18" />
-			<!-- serviceSubscribedAppRule -->
-			<xs:enumeration value="19" />
-			<!-- serviceSubscribedNode -->
-			<xs:enumeration value="20" />
-			<!-- statsCollect -->
-			<xs:enumeration value="21" />
-			<!-- statsConfig -->
-			<xs:enumeration value="22" />
-			<!-- subscription -->
-			<xs:enumeration value="23" />
-			<!-- semanticDescriptor -->
-			<xs:enumeration value="24" />
-			<!-- notificationTargetMgmtPolicyRef -->
-			<xs:enumeration value="25" />	
-			<!-- notificationTargetPolicy -->
-			<xs:enumeration value="26" />	
-			<!-- policyDeletionRules -->
-			<xs:enumeration value="27" />	
-			<!-- flexContainer -->
-			<xs:enumeration value="28" />
-			<!-- timeSeries -->
-			<xs:enumeration value="29" />
-			<!-- timeSeriesInstance -->
-			<xs:enumeration value="30" />
-			<!-- role -->
-			<xs:enumeration value="31" />
-			<!-- token -->
-			<xs:enumeration value="32" />
-			<!-- void: trafficPattern -->
-			<!-- dynamicAuthorizationConsultation -->
-			<xs:enumeration value="34" />	
-			<!-- authorizationDecision -->
-			<xs:enumeration value="35" />	
-			<!-- authorizationPolicy -->
-			<xs:enumeration value="36" />	
-			<!-- authorizationInformation -->
-			<xs:enumeration value="37" />				
-			<!-- ontologyRepository -->
-			<xs:enumeration value="38" />	
-			<!-- ontology -->
-			<xs:enumeration value="39" />	
-			<!-- semanticMashupJobProfile -->
-			<xs:enumeration value="40" />	
-			<!-- semanticMashupInstance -->
-			<xs:enumeration value="41" />	
-			<!-- semanticMashupResult -->
-			<xs:enumeration value="42" />	
-			<!-- AEContactList -->
-			<xs:enumeration value="43" />	
-			<!-- AEContactListPerCSE -->
-			<xs:enumeration value="44" />	
-			<!-- multimediaSession -->
-			<xs:enumeration value="46" />	
-			<!-- triggerRequest -->
-			<xs:enumeration value="47" />	
-			<!-- crossResourceSubscription -->
-			<xs:enumeration value="48" />	
-			<!-- backgroundDataTransfer -->
-			<xs:enumeration value="49" />	
-			<!-- transactionMgmt -->
-			<xs:enumeration value="50" />	
-			<!-- transaction -->
-			<xs:enumeration value="51" />	
-			<!-- accessControlPolicyAnnc -->
-			<xs:enumeration value="10001" />
-			<!-- AEAnnc -->
-			<xs:enumeration value="10002" />
-			<!-- containerAnnc -->
-			<xs:enumeration value="10003" />
-			<!-- contentInstanceAnnc -->
-			<xs:enumeration value="10004" />
-			<!-- groupAnnc -->
-			<xs:enumeration value="10009" />
-			<!-- locationPolicyAnnc -->
-			<xs:enumeration value="10010" />
-			<!-- mgmtObjAnnc -->
-			<xs:enumeration value="10013" />
-			<!-- nodeAnnc -->
-			<xs:enumeration value="10014" />
-			<!-- remoteCSEAnnc -->
-			<xs:enumeration value="10016" />
-			<!-- scheduleAnnc -->
-			<xs:enumeration value="10018" />
-			<!-- semanticDescriptorAnnc -->
-			<xs:enumeration value="10024" />
-			<!-- flexContainerAnnc -->
-			<xs:enumeration value="10028" />
-			<!-- timeSeriesAnnc -->
-			<xs:enumeration value="10029" />
-			<!-- timeSeriesInstanceAnnc -->
-			<xs:enumeration value="10030" />
-			<!-- void: trafficPatternAnnc -->
-			<!-- dynamicAuthorizationConsultationAnnc -->
-			<xs:enumeration value="10034" />			
-			<!-- ontologyRepositoryAnnc -->
-			<xs:enumeration value="10038" />
-			<!-- ontologyAnnc -->
-			<xs:enumeration value="10039" />
-			<!-- semanticMashupJobProfileAnnc -->
-			<xs:enumeration value="10040" />
-			<!-- semanticMashupInstanceAnnc -->
-			<xs:enumeration value="10041" />
-			<!-- semanticMashupResultAnnc -->
-			<xs:enumeration value="10042" />
-			<!-- multimediaSessionAnnc -->
-			<xs:enumeration value="10046" />	
-			<!-- oldest -->
-			<xs:enumeration value="20001" />
-			<!-- latest -->
-			<xs:enumeration value="20002" />
-			<!-- mashup -->
-			<xs:enumeration value="20003" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="consistencyStrategy">
-		<xs:annotation>
-			<xs:documentation>Used for consistencyStrategy attribute in &lt;group&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- ABANDON_MEMBER -->
-			<xs:enumeration value="1" />
-			<!-- ABANDON_GROUP -->
-			<xs:enumeration value="2" />
-			<!-- SET_MIXED -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="cmdType">
-		<xs:annotation>
-			<xs:documentation>Used for cmdType attribute in &lt;mgmtCmd&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- RESET -->
-			<xs:enumeration value="1" />
-			<!-- REBOOT -->
-			<xs:enumeration value="2" />
-			<!-- UPLOAD -->
-			<xs:enumeration value="3" />
-			<!-- DOWNLOAD -->
-			<xs:enumeration value="4" />
-			<!-- SOFTWAREINSTALL -->
-			<xs:enumeration value="5" />
-			<!-- SOFTWAREUNINSTALL -->
-			<xs:enumeration value="6" />
-			<!-- SOFTWAREUPDATE -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="execModeType">
-		<xs:annotation>
-			<xs:documentation>Used for execModeType attribute in &lt;mgmtCmd&gt; and &lt;execInstance&gt; resource.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IMMEDIATEONCE -->
-			<xs:enumeration value="1" />
-			<!-- IMMEDIATEREPEAT -->
-			<xs:enumeration value="2" />
-			<!-- RANDOMONCE -->
-			<xs:enumeration value="3" />
-			<!-- RANDOMREPEAT -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="execStatusType">
-		<xs:annotation>
-			<xs:documentation>Used for execStatusType attribute in &lt;execInstance&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- INITIATED -->
-			<xs:enumeration value="1" />
-			<!-- PENDING  -->
-			<xs:enumeration value="2" />
-			<!-- FINISHED -->
-			<xs:enumeration value="3" />
-			<!-- CANCELLING -->
-			<xs:enumeration value="4" />
-			<!-- CANCELLED -->
-			<xs:enumeration value="5" />
-			<!-- STATUS_ NON_CANCELLABLE -->
-			<xs:enumeration value="6" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-	<xs:simpleType name="execResultType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- STATUS_SUCCESS -->
-			<xs:enumeration value="0" />
-			<!-- STATUS_REQUEST_UNSUPPORTED -->
-			<xs:enumeration value="1" />
-			<!-- STATUS_REQUEST DENIED -->
-			<xs:enumeration value="2" />
-			<!-- STATUS_CANCELLATION_DENIED -->
-			<xs:enumeration value="3" />
-			<!-- STATUS_INTERNAL_ERROR -->
-			<xs:enumeration value="4" />
-			<!-- STATUS_INVALID_ARGUMENTS -->
-			<xs:enumeration value="5" />
-			<!-- STATUS_RESOURCES_EXCEEDED -->
-			<xs:enumeration value="6" />
-			<!-- STATUS_FILE_TRANSFER_FAILED -->
-			<xs:enumeration value="7" />
-			<!-- STATUS_FILE_TRANSFER_SERVER_AUTHENTICATION_FAILURE -->
-			<xs:enumeration value="8" />
-			<!-- STATUS_UNSUPPORTED_PROTOCOL -->
-			<xs:enumeration value="9" />
-			<!-- STATUS_UPLOAD_FAILED -->
-			<xs:enumeration value="10" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_MULTICAST_GROUP_UNABLE_JOIN -->
-			<xs:enumeration value="11" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_SERVER_CONTACT_FAILED -->
-			<xs:enumeration value="12" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_FILE_ACCESS_FAILED -->
-			<xs:enumeration value="13" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_DOWNLOAD_INCOMPLETE -->
-			<xs:enumeration value="14" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_FILE_CORRUPTED -->
-			<xs:enumeration value="15" />
-			<!-- STATUS_FILE_TRANSFER_FILE_AUTHENTICATION_FAILURE -->
-			<xs:enumeration value="16" />
-			<!-- STATUS_FILE_TRANSFER_WINDOW_EXCEEDED -->
-			<xs:enumeration value="19" />
-			<!-- STATUS_INVALID_UUID_FORMAT -->
-			<xs:enumeration value="20" />
-			<!-- STATUS_UNKNOWN_EXECUTION_ENVIRONMENT -->
-			<xs:enumeration value="21" />
-			<!-- STATUS_DISABLED_EXECUTION_ENVIRONMENT -->
-			<xs:enumeration value="22" />
-			<!-- STATUS_EXECUTION_ENVIRONMENT_MISMATCH -->
-			<xs:enumeration value="23" />
-			<!-- STATUS_DUPLICATE_DEPLOYMENT_UNIT -->
-			<xs:enumeration value="24" />
-			<!-- STATUS_SYSTEM_RESOURCES_EXCEEDED -->
-			<xs:enumeration value="25" />
-			<!-- STATUS_UNKNOWN_DEPLOYMENT_UNIT -->
-			<xs:enumeration value="26" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_STATE -->
-			<xs:enumeration value="27" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_DOWNGRADE_DISALLOWED -->
-			<xs:enumeration value="28" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_UPGRADE_DISALLOWED -->
-			<xs:enumeration value="29" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_VERSION_EXISTS -->
-			<xs:enumeration value="30" />
-			<!-- STATUS_NOT_FINISHED -->
-			<xs:enumeration value="31" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="pendingNotification">
-		<xs:annotation>
-			<xs:documentation>This is used for pendingNotification attribute in &lt;subscription&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- sendLatest -->
-			<xs:enumeration value="1" />
-			<!-- sendAllPending -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="notificationContentType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- All attributes -->
-			<xs:enumeration value="1" />
-			<!-- Modified attributes -->
-			<xs:enumeration value="2" />
-			<!-- ResourceID -->
-			<xs:enumeration value="3" />
-			<!-- Trigger Payload -->
-			<xs:enumeration value="4" />
-			<!-- Timeseries notification -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-	<xs:simpleType name="notificationEventType">
-		<xs:annotation>
-			<xs:documentation>Used in the notificationEventType element of eventNotificationCriteria attribute of subscription resource 
-				and in the Notification data object</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Update_of_Resource -->
-			<xs:enumeration value="1" />
-			<!-- Delete_of_Resource -->
-			<xs:enumeration value="2" />
-			<!-- Create_of_Direct_Child_Resource -->
-			<xs:enumeration value="3" />
-			<!-- Delete_of_Direct_Child_Resource -->
-			<xs:enumeration value="4" />
-			<!-- Retrieve_of_Container_Resource_With_No_Child_Resource -->
-			<xs:enumeration value="5" />
-			<!-- Trigger_Received_For_AE_Resource -->
-			<xs:enumeration value="6" />
-			<!-- Blocking_Update -->
-			<xs:enumeration value="7" />
-			<!-- Report_on_Missing_Data_Points -->
-			<xs:enumeration value="8" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	
-	<xs:simpleType name="status">
-		<xs:annotation>
-			<xs:documentation>This is used for [software], [firmware] resources.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Uninitialzed -->
-			<xs:enumeration value="0" />
-			<!-- Successful -->
-			<xs:enumeration value="1" />
-			<!-- Failure -->
-			<xs:enumeration value="2" />
-			<!-- In-Process -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="batteryStatus">
-		<xs:annotation>
-			<xs:documentation>This is used for [battery] resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- NORMAL -->
-			<xs:enumeration value="1" />
-			<!-- CHARGING -->
-			<xs:enumeration value="2" />
-			<!-- CHARGING-COMPLETE -->
-			<xs:enumeration value="3" />
-			<!-- DAMAGED -->
-			<xs:enumeration value="4" />
-			<!-- LOW-BATTERY -->
-			<xs:enumeration value="5" />
-			<!-- NOT-INSTALLED -->
-			<xs:enumeration value="6" />
-			<!-- UNKNOWN -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="mgmtDefinition">
-		<xs:annotation>
-			<xs:documentation>This is used for mgmtObj resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- self-defined -->
-			<xs:enumeration value="0" />
-			<!-- firmware -->
-			<xs:enumeration value="1001" />
-			<!-- software -->
-			<xs:enumeration value="1002" />
-			<!-- memory -->
-			<xs:enumeration value="1003" />
-			<!-- areaNwkInfo -->
-			<xs:enumeration value="1004" />
-			<!-- areaNwkDeviceInfo -->
-			<xs:enumeration value="1005" />
-			<!-- battery -->
-			<xs:enumeration value="1006" />
-			<!-- deviceInfo -->
-			<xs:enumeration value="1007" />
-			<!-- deviceCapability -->
-			<xs:enumeration value="1008" />
-			<!-- reboot -->
-			<xs:enumeration value="1009" />
-			<!-- eventLog -->
-			<xs:enumeration value="1010" />
-			<!-- cmdhPolicy -->
-			<xs:enumeration value="1011" />
-			<!-- activeCmdhPolicy -->
-			<xs:enumeration value="1012" />
-			<!-- cmdhDefaults -->
-			<xs:enumeration value="1013" />
-			<!-- cmdhDefEcValue -->
-			<xs:enumeration value="1014" />
-			<!-- cmdhEcDefParamValues -->
-			<xs:enumeration value="1015" />
-			<!-- cmdhLimits -->
-			<xs:enumeration value="1016" />
-			<!-- cmdhNetworkAccessRules -->
-			<xs:enumeration value="1017" />
-			<!-- cmdhNwAccessRule -->
-			<xs:enumeration value="1018" />
-			<!-- cmdhBuffer -->
-			<xs:enumeration value="1019" />
-			<!-- registration -->
-			<xs:enumeration value="1020" />
-			<!-- dataCollection -->
-			<xs:enumeration value="1021" />
-			<!-- authenticationProfile -->
-			<xs:enumeration value="1022" />
-			<!-- myCertFileCred -->
-			<xs:enumeration value="1023" />
-			<!-- trustAnchorCred -->
-			<xs:enumeration value="1024" />
-			<!-- MAFClientRegCfg -->
-			<xs:enumeration value="1025" />
-			<!-- MEFClientRegCfg -->
-			<xs:enumeration value="1026" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="logTypeId">
-		<xs:annotation>
-			<xs:documentation>Used for the logTypeId attribute of [eventLog] Management Resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- system -->
-			<xs:enumeration value="1" />
-			<!-- security -->
-			<xs:enumeration value="2" />
-			<!-- event -->
-			<xs:enumeration value="3" />
-			<!-- trace -->
-			<xs:enumeration value="4" />
-			<!-- panic -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="logStatus">
-		<xs:annotation>
-			<xs:documentation>Used for the logStatus attribute of [eventLog] Management Resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Started -->
-			<xs:enumeration value="1" />
-			<!-- Stopped -->
-			<xs:enumeration value="2" />
-			<!-- Unknown -->
-			<xs:enumeration value="3" />
-			<!-- NotPresent -->
-			<xs:enumeration value="4" />
-			<!-- Error -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="eventType">
-		<xs:restriction base="xs:integer">
-			<!-- Data Operation -->
-			<xs:enumeration value="1" />
-			<!-- Storage based -->
-			<xs:enumeration value="2" />
-			<!-- Timer Based -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="statsRuleStatusType">
-		<xs:restriction base="xs:integer">
-			<!-- Active -->
-			<xs:enumeration value="1" />
-			<!-- Inactive -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="statModelType">
-		<xs:restriction base="xs:integer">
-			<!-- Event Based -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="encodingType">
-		<xs:restriction base="xs:integer">
-			<!-- Plain -->
-			<xs:enumeration value="0" />
-			<!-- base64String -->
-			<xs:enumeration value="1" />
-			<!-- base64Binary -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<!-- access control operations -->
-    <xs:simpleType name="accessControlOperations">
-        <xs:annotation>
-            <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- Create -->
-            <xs:enumeration value="1"/>
-            <!-- Retrieve -->
-            <xs:enumeration value="2"/>
-            <!-- Create + Retrieve -->
-            <xs:enumeration value="3"/>
-            <!-- Update -->
-            <xs:enumeration value="4"/>
-            <!-- Create + Update -->
-            <xs:enumeration value="5"/>
-            <!-- Retrieve + Update -->
-            <xs:enumeration value="6"/>
-            <!-- Create + Retrieve + Update -->
-            <xs:enumeration value="7"/>
-            <!-- Delete -->
-            <xs:enumeration value="8"/>
-            <!-- Create + Delete -->
-            <xs:enumeration value="9"/>
-            <!-- Retrieve + Delete -->
-            <xs:enumeration value="10"/>
-            <!-- Create + Retrieve + Delete -->
-            <xs:enumeration value="11"/>
-            <!-- Update + Delete -->
-            <xs:enumeration value="12"/>
-            <!-- Create + Update + Delete -->
-            <xs:enumeration value="13"/>
-            <!-- Retrieve + Update + Delete -->
-            <xs:enumeration value="14"/>
-            <!-- Create + Retrieve + Update + Delete -->
-            <xs:enumeration value="15"/>
-            <!-- Notify -->
-            <xs:enumeration value="16"/>
-            <!-- Create + Notify -->
-            <xs:enumeration value="17"/>
-            <!-- Retrieve + Notify -->
-            <xs:enumeration value="18"/>
-            <!-- Create + Retrieve + Notify -->
-            <xs:enumeration value="19"/>
-            <!-- Update + Notify -->
-            <xs:enumeration value="20"/>
-            <!-- Create + Update + Notify -->
-            <xs:enumeration value="21"/>
-            <!-- Retrieve + Update + Notify -->
-            <xs:enumeration value="22"/>
-            <!-- Create + Retrieve + Update -->
-            <xs:enumeration value="23"/>
-            <!-- Delete + Notify -->
-            <xs:enumeration value="24"/>
-            <!-- Create + Delete + Notify -->
-            <xs:enumeration value="25"/>
-            <!-- Retrieve + Delete + Notify -->
-            <xs:enumeration value="26"/>
-            <!-- Create + Retrieve + Delete + Notify -->
-            <xs:enumeration value="27"/>
-            <!-- Update + Delete + Notify -->
-            <xs:enumeration value="28"/>
-            <!-- Create + Update + Delete + Notify -->
-            <xs:enumeration value="29"/>
-            <!-- Retrieve + Update + Delete + Notify -->
-            <xs:enumeration value="30"/>
-            <!-- Create + Retrieve + Update + Delete + Notify -->
-            <xs:enumeration value="31"/>
-            <!-- Discover -->
-            <xs:enumeration value="32"/>
-            <!-- Create + Discover -->
-            <xs:enumeration value="33"/>
-            <!-- Retrieve + Discover -->
-            <xs:enumeration value="34"/>
-            <!-- Create + Retrieve + Discover -->
-            <xs:enumeration value="35"/>
-            <!-- Update + Discover -->
-            <xs:enumeration value="36"/>
-            <!-- Create + Update + Discover -->
-            <xs:enumeration value="37"/>
-            <!-- Retrieve + Update + Discover -->
-            <xs:enumeration value="38"/>
-            <!-- Create + Retrieve + Update + Discover -->
-            <xs:enumeration value="39"/>
-            <!-- Delete + Discover -->
-            <xs:enumeration value="40"/>
-            <!-- Create + Delete + Discover -->
-            <xs:enumeration value="41"/>
-            <!-- Retrieve + Delete + Discover -->
-            <xs:enumeration value="42"/>
-            <!-- Create + Retrieve + Delete + Discover -->
-            <xs:enumeration value="43"/>
-            <!-- Update + Delete + Discover -->
-            <xs:enumeration value="44"/>
-            <!-- Create + Update + Delete + Discover -->
-            <xs:enumeration value="45"/>
-            <!-- Retrieve + Update + Delete + Discover -->
-            <xs:enumeration value="46"/>
-            <!-- Create + Retrieve + Update + Delete + Discover -->
-            <xs:enumeration value="47"/>
-            <!-- Notify + Discover -->
-            <xs:enumeration value="48"/>
-            <!-- Create + Notify + Discover -->
-            <xs:enumeration value="49"/>
-            <!-- Retrieve + Notify + Discover -->
-            <xs:enumeration value="50"/>
-            <!-- Create + Retrieve + Notify + Discover -->
-            <xs:enumeration value="51"/>
-            <!-- Update + Notify + Discover -->
-            <xs:enumeration value="52"/>
-            <!-- Create + Update + Notify + Discover -->
-            <xs:enumeration value="53"/>
-            <!-- Retrieve + Update + Notify + Discover -->
-            <xs:enumeration value="54"/>
-            <!-- Create + Retrieve + Update + Discover -->
-            <xs:enumeration value="55"/>
-            <!-- Delete + Notify + Discover -->
-            <xs:enumeration value="56"/>
-            <!-- Create + Delete + Notify + Discover -->
-            <xs:enumeration value="57"/>
-            <!-- Retrieve + Delete + Notify + Discover -->
-            <xs:enumeration value="58"/>
-            <!-- Create + Retrieve + Delete + Notify + Discover -->
-            <xs:enumeration value="59"/>
-            <!-- Update + Delete + Notify + Discover -->
-            <xs:enumeration value="60"/>
-            <!-- Create + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="61"/>
-            <!-- Retrieve + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="62"/>
-            <!-- Create + Retrieve + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="63"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="filterUsage">
-        <xs:annotation>
-            <xs:documentation>Used in filterCriteria</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- Discovery -->
-            <xs:enumeration value="1" />
-            <!-- Conditional Retrieval -->
-            <xs:enumeration value="2" />
-        	<!-- IPE On-demand Discovery -->
-        	<xs:enumeration value="3" />
-        </xs:restriction>
-    </xs:simpleType>
-	
-	<xs:simpleType name="notificationTargetPolicyAction">
-		<xs:annotation>
-			<xs:documentation>Used in filterCriteria</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- accept request -->
-			<xs:enumeration value="1" />
-			<!-- reject request -->
-			<xs:enumeration value="2" />
-			<!-- seek authorization from subscription originator before responding -->
-			<xs:enumeration value="3" />
-			<!-- inform the subscription originator without taking any action -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="logicalOperator">
-		<xs:restriction base="xs:integer">
-			<!-- AND Operation -->
-			<xs:enumeration value="1" />
-			<!-- OR Operation -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="filterOperation">
-		<xs:restriction base="xs:integer">
-			<!-- Logical AND -->
-			<xs:enumeration value="1" />
-			<!-- Logical OR -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<!-- m2m:securityInfoType is defined in the CDT-notification xsd file -->
-	
-	
-	<xs:simpleType name="allJoynDirection">
-		<xs:annotation>
-			<xs:documentation>Used for direction attribute of allJoynApp resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- AllJoyn_to_oneM2M -->
-			<xs:enumeration value="1" />
-			<!-- oneM2M_to_AllJoyn -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	
-	<xs:simpleType name="contentFilterSyntax">
-		<xs:annotation>
-			<xs:documentation>Used for contentFilterSyntax element in Filter Criteria primitive parameter</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- JSON_PATH_SYNTAX -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="contentSecurity">
-		<xs:annotation>
-			<xs:documentation>Used in m2m:contentInfo</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- ESData has not been applied to the content data -->
-			<xs:enumeration value="0" />
-			<!-- ESData using JWE and/or JWS with Compact Serialization has been applied to the content data with no subsequent transfer encoding -->
-			<xs:enumeration value="1" />
-			<!-- ESData using JWE and/or JWS with JSON Serialization has been applied to the content data with no subsequent transfer encoding -->
-			<xs:enumeration value="2" />
-			<!-- ESData using JWE and/or JWS with JSON Serialization has been applied to the content data and subsequent base64 encoding (see [9]) has been applied -->
-			<xs:enumeration value="3" />
-			<!-- XML encryption and/or XML-Signature has been applied to the content data has been applied with no subsequent transfer encoding -->
-			<xs:enumeration value="4" />
-			<!-- XML encryption and/or XML-Signature has been applied to the content data and subsequent base64 encoding (see [9]) has been applied -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-
-	<xs:simpleType name="suid">
-		<xs:annotation>
-			<xs:documentation>Used for m2m:e2eSecInfo and other security features in TS-0003</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- pre-provisioned symmetric key intended to be shared with a MEF -->
-			<xs:enumeration value="10" />
-			<!-- pre-provisioned symmetric key intended to be shared with a MAF -->
-			<xs:enumeration value="11" />
-			<!-- pre-provisioned symmetric key intended for use in a Security Associated Establishment Framework (SAEF) -->
-			<xs:enumeration value="12" />
-			<!-- pre-provisioned symmetric key intended for use in End-to-End Security of Primitives (ESPrim) -->
-			<xs:enumeration value="13" />
-			<!-- pre-provisioned symmetric key intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt End-to-End Security of Data (ESData) Data classes -->
-			<xs:enumeration value="14" />
-			<!-- pre-provisioned symmetric key intended for use in Signature-only ESData Security Class -->
-			<xs:enumeration value="15" />
-			<!-- symmetric key, provisioned via a Remote Security Provisioning Framework (RSPF), and intended to be shared with a MAF -->
-			<xs:enumeration value="21" />
-			<!-- symmetric key, provisioned via a RSPF, and intended for use in a SAEF -->
-			<xs:enumeration value="22" />
-			<!-- symmetric key, provisioned via a RSPF, and intended for use in ESPrim -->
-			<xs:enumeration value="23" />
-			<!-- symmetric key, provisioned via a RSPF, and intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt ESData) Data classes -->
-			<xs:enumeration value="24" />
-			<!-- symmetric key, provisioned via a RSPF, and intended for use in Signature-only ESData Security Class -->
-			<xs:enumeration value="25" />
-			<!-- MAF-distributed symmetric key intended for use in a SAEF -->
-			<xs:enumeration value="32" />
-			<!-- MAF-distributed symmetric key intended for use in ESPrim -->
-			<xs:enumeration value="33" />
-			<!-- MAF-distributed symmetric key intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt ESData Data classes -->
-			<xs:enumeration value="34" />
-			<!-- MAF-distributed symmetric key intended for use in Signature-only ESData Security Class -->
-			<xs:enumeration value="35" />
-			<!-- certificate intended to be shared with a MEF -->
-			<xs:enumeration value="40" />
-			<!-- certificate intended to be shared with a MAF  -->
-			<xs:enumeration value="41" />
-			<!-- certificate intended for use in a Security Associated Establishment Framework (SAEF) -->
-			<xs:enumeration value="42" />
-			<!-- certificate intended for use in End-to-End Security of Primitives (ESPrim) -->
-			<xs:enumeration value="43" />
-			<!-- certificate intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt End-to-End Security of Data (ESData) Data classes -->
-			<xs:enumeration value="44" />
-			<!-- certificate intended for use in Signature-only ESData Security Class -->
-			<xs:enumeration value="45" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="esprimKeyGenAlgID">
-		<xs:annotation>
-			<xs:documentation>Used in m2msec:receiverESPrimRandObject and m2m:originatorESPrimRandObject</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- HMAC-SHA256 -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="esprimProtocolAndAlgID">
-		<xs:annotation>
-			<xs:documentation>Used in m2m:receiveEr2ERandObject and m2msec:originatorESPrimRandObject</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- JWE Compact Serialization with “enc” = “A128GCM”	 (AES GCM using 128-bit key) -->
-			<xs:enumeration value="10" />
-			<!-- JWE Compact Serialization with “enc” = “A192GCM” (AES GCM using 192-bit key} -->
-			<xs:enumeration value="11" />
-			<!-- JWE Compact Serialization with “enc” = “A256GCM”	 (AES GCM using 256-bit key) -->
-			<xs:enumeration value="12" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="stationaryIndication">
-		<xs:annotation>
-			<xs:documentation>Used for stationaryIndication element attribute of m2m:activityPattern</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Stationary -->
-			<xs:enumeration value="1" />
-			<!-- Mobile (Moving) -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="contentStatus">
-		<xs:annotation>
-			<xs:documentation>Used for Content Status response parameter</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PARTIAL_CONTENT -->
-			<xs:enumeration value="1" />
-			<!-- FULL_CONTENT -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="networkAction">
-		<xs:annotation>
-			<xs:documentation>Used in the networkAction element in the backOffParameters</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- cellular-registration -->
-			<xs:enumeration value="1" />
-			<!-- cellular-attach -->
-			<xs:enumeration value="2" />
-			<!-- cellular-pdpctxact -->
-			<xs:enumeration value="3" />
-			<!-- cellular-sms -->
-			<xs:enumeration value="4" />
-			<!-- default -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="triggerPurpose">
-		<xs:annotation>
-			<xs:documentation>Used for the triggerPurpose field of trigger requests on Mcn and for triggerPurpose attribute of the triggerRequest resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- establishConnection -->
-			<xs:enumeration value="1" />
-			<!-- registrationRequest -->
-			<xs:enumeration value="2" />
-			<!-- executeCRUD -->
-			<xs:enumeration value="3" />
-			<!-- enrolmentRequest -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="authorizationDecision">
-		<xs:annotation>
-			<xs:documentation>Used for the decision attribute of the of authorizationDecision resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PERMIT -->
-			<xs:enumeration value="1" />
-			<!-- DENY -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="authorizationStatus">
-		<xs:annotation>
-			<xs:documentation>Used for status attribute of authorizationDecision resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PERMIT -->
-			<xs:enumeration value="1" />
-			<!-- NOT_APPLICABLE -->
-			<xs:enumeration value="2" />
-			<!-- MISSING_ATTRIBUTE -->
-			<xs:enumeration value="3" />
-			<!-- SYNTAX_ERROR -->
-			<xs:enumeration value="4" />
-			<!-- PROCESSING_ERROR -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>	
-	
-	<xs:simpleType name="acpCombiningAlgorithm">
-		<xs:annotation>
-			<xs:documentation>Used for combiningAlgorithm attribute of authorizationPolicy resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PERMIT_OVERRIDES -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>	
-
-	<xs:simpleType name="semanticFormat">
-		<xs:annotation>
-			<xs:documentation>Used in semanticDescriptor and ontology resources</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IRI -->
-			<xs:enumeration value="1" />
-			<!-- File format: Functional-style -->
-			<xs:enumeration value="2" />
-			<!-- File format: OWL/XML -->
-			<xs:enumeration value="3" />
-			<!-- File format: RDF/XML -->
-			<xs:enumeration value="4" />
-			<!-- File format: RDF/Turtle -->
-			<xs:enumeration value="5" />
-			<!-- File format: Manchester -->
-			<xs:enumeration value="6" />
-			<!-- File format: JSON-LD -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>	
-
-	<xs:simpleType name="mashupMemberStoreType">
-		<xs:annotation>
-			<xs:documentation>Used for memberStoreType attribute of semanticMashupInstance resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IRI -->
-			<xs:enumeration value="1" />
-			<!-- File format: Functional-style -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>	
-	
-	<xs:simpleType name="mashupResultGenType">
-		<xs:annotation>
-			<xs:documentation>Used for resultGenType attribute of semanticMashupInstance resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- WHEN_SMI_IS_CREATED -->
-			<xs:enumeration value="1" />
-			<!-- WHEN_MR_REQUESTS -->
-			<xs:enumeration value="2" />
-			<!-- PERIODICALLY -->
-			<xs:enumeration value="3" />
-			<!-- WHEN_A_MASHUP_MEMBER_IS_UPDATED -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>	
-	
-	<xs:simpleType name="locationUpdateEventCriteria">
-		<xs:annotation>
-			<xs:documentation>Used for locationUpdateEventCriteria attribute of locationPolicy resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Location_Change -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>	
-
-	
-	<xs:simpleType name="AERegistrationStatus">
-		<xs:annotation>
-			<xs:documentation>Used for registrationStatus attribute in AE resource</xs:documentation>				
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- ACTIVE -->
-			<xs:enumeration value="1" />
-			<!-- INACTIVE -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>	
-	
-	<xs:simpleType name="multicastCapability">
-		<xs:annotation>
-			<xs:documentation>Used for multicastCapability attribute in remoteCSE resource and multicastType element in Multicast Group Information Data Object</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- MBMS -->
-			<xs:enumeration value="1" />
-			<!-- IP   -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="sessionState">
-		<xs:annotation>
-			<xs:documentation>Used for sessionState attribute of multimediaSession resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- OFFLINE -->
-			<xs:enumeration value="1" />
-			<!-- ONLINE -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="triggerStatus">
-		<xs:annotation>
-			<xs:documentation>Used in definining trigger status in the triggerRequest resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PROCESSING -->
-			<xs:enumeration value="1" />
-			<!-- ERROR_NSE_NOT_FOUND -->
-			<xs:enumeration value="2" />
-			<!-- TRIGGER_SUBMITTED -->
-			<xs:enumeration value="3" />
-			<!-- TRIGGER_DELIVERED -->
-			<xs:enumeration value="4" />
-			<!-- TRIGGER_EXPIRED -->
-			<xs:enumeration value="5" />
-			<!-- TRIGGER_FAILED -->
-			<xs:enumeration value="6" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="timeWindowType">
-		<xs:annotation>
-			<xs:documentation>Used for timeWindowType attribute in crossResourceSubscription resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- PERIODICWINDOW -->
-			<xs:enumeration value="1" />
-			<!-- SLIDINGWINDOW -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="transferSelectionGuidance">
-		<xs:annotation>
-			<xs:documentation>Used for transferSelectionGuidance attribute in backgroundDataTransfer resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- lowestCost -->
-			<xs:enumeration value="1" />
-			<!-- bestDataRates -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="transactionMode">
-		<xs:annotation>
-			<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- CSE_CONTROLLED -->
-			<xs:enumeration value="1" />
-			<!-- CREATOR_CONTROLLED -->
-			<xs:enumeration value="2" />
-		</xs:restriction>	
-	</xs:simpleType>
-	<xs:simpleType name="transactionControl">
-		<xs:annotation>
-			<xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- INITIAL -->
-			<xs:enumeration value="1" />
-			<!-- LOCK -->
-			<xs:enumeration value="2" />
-			<!-- EXECUTE -->
-			<xs:enumeration value="3" />
-			<!-- COMMIT -->
-			<xs:enumeration value="4" />
-			<!-- ABORT -->
-			<xs:enumeration value="5" />
-		</xs:restriction>	
-	</xs:simpleType>
-	
-	<xs:simpleType name="transactionState">
-		<xs:annotation>
-			<xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- INITIAL -->
-			<xs:enumeration value="1" />
-			<!-- LOCKED -->
-			<xs:enumeration value="2" />
-			<!-- EXECUTED -->
-			<xs:enumeration value="3" />
-			<!-- COMMITTED -->
-			<xs:enumeration value="4" />
-			<!-- ERROR -->
-			<xs:enumeration value="5" />
-			<!-- ABORTED -->
-			<xs:enumeration value="6" />
-		</xs:restriction>	
-	</xs:simpleType>
-	
-	<xs:simpleType name="transactionLockType">
-		<xs:annotation>
-			<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- BLOCK_ALL -->
-			<xs:enumeration value="1" />
-			<!-- ALLOW_RETRIEVES -->
-			<xs:enumeration value="2" />
-		</xs:restriction>	
-	</xs:simpleType>
-	
-	<xs:simpleType name="transactionMgmtHandling">
-		<xs:annotation>
-			<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- DELETE -->
-			<xs:enumeration value="1" />
-			<!-- PERSIST -->
-			<xs:enumeration value="2" />
-		</xs:restriction>	
-	</xs:simpleType>
-	
-	<xs:simpleType name="locationInformationType">
-		<xs:annotation>
-			<xs:documentation>Used in the  locationInformationType attribute of the locationPolicy resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Position fix -->
-			<xs:enumeration value="1" />
-			<!-- Geofence event -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="geofenceEventCriteria">
-		<xs:annotation>
-			<xs:documentation>Used in the geofenceEventCriteria attribute of the locationPolicy resource</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Entering -->
-			<xs:enumeration value="1" />
-			<!-- Leaving -->
-			<xs:enumeration value="2" />
-			<!-- Inside -->
-			<xs:enumeration value="3" />
-			<!-- Outside -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-</xs:schema>
-
diff --git a/v3_28_0/CDT-eventConfig-v3_28_0.xsd.bu b/v3_28_0/CDT-eventConfig-v3_28_0.xsd.bu
deleted file mode 100644
index 6a7bb90059c6afbce75cda9fbd906c4f0c5acef4..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-eventConfig-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="eventID" type="xs:string" />
-						<xs:element name="eventType" type="m2m:eventType" />
-						<xs:element name="eventStart" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="eventEnd" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="operationType" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:operation" />
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="dataSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="eventResourceTypes" type="m2m:resourceTypeList" minOccurs="0" />
-						<xs:element name="eventResourceIDs" type="m2m:listOfURIs" minOccurs="0" />
-								
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-eventLog-v3_28_0.xsd.bu b/v3_28_0/CDT-eventLog-v3_28_0.xsd.bu
deleted file mode 100644
index 314f7cdde4d0092cccd402eb0bc20f52b5cc8ee3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-eventLog-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="logTypeId" type="m2m:logTypeId" />
-						<xs:element name="logData" type="xs:string" />
-						<xs:element name="logStatus" type="m2m:logStatus" />
-						<xs:element name="logStart" type="xs:boolean" />
-						<xs:element name="logStop" type="xs:boolean" />
-          
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element> 	
-	
-	<xs:element name="eventLogAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="logTypeId" type="m2m:logTypeId" minOccurs="0" />
-						<xs:element name="logData" type="xs:string" minOccurs="0" />
-						<xs:element name="logStatus" type="m2m:logStatus" minOccurs="0"  />
-						<xs:element name="logStart" type="xs:boolean" minOccurs="0" />
-						<xs:element name="logStop" type="xs:boolean" minOccurs="0" />
-          
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element> 	
-</xs:schema>
diff --git a/v3_28_0/CDT-execInstance-v3_28_0.xsd.bu b/v3_28_0/CDT-execInstance-v3_28_0.xsd.bu
deleted file mode 100644
index f566fdd24c51c5772a9fb5d5ea479a2b6b85ac3a..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-execInstance-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-              			<xs:element name="execStatus" type="m2m:execStatusType" />
-						<xs:element name="execResult" type="m2m:execResultType" />
-						<xs:element name="execDisable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="execTarget" type="m2m:nodeID" />
-						<xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
-						<xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
-						<xs:element name="execDelay" type="xs:duration" minOccurs="0" />
-						<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-firmware-v3_28_0.xsd.bu b/v3_28_0/CDT-firmware-v3_28_0.xsd.bu
deleted file mode 100644
index 2ac1a69bc211e1d072e67ae1eb3fd55b73ac11e7..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-firmware-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" />
-						<xs:element name="firmwareName" type="xs:string" />
-						<xs:element name="URL" type="xs:anyURI" />
-						<xs:element name="update" type="xs:boolean" />
-						<xs:element name="updateStatus" type="m2m:actionStatus" />
-            
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="firmwareAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="firmwareName" type="xs:string" minOccurs="0" />
-						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="update" type="xs:boolean" minOccurs="0" />
-						<xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
-            
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-group-v3_28_0.xsd.bu b/v3_28_0/CDT-group-v3_28_0.xsd.bu
deleted file mode 100644
index 214e522f1342a6c917fc408125aaaf7d33b2cfbb..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-group-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-
-	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>						
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />				
-						<!-- Resource Specific Attributes -->
-						<xs:element name="memberType" type="m2m:memberType" />
-						<xs:element name="specializationType" type="m2m:specializationType" minOccurs="0" />
-						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
-						<xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
-						<xs:element name="memberIDs">
-							<xs:simpleType>
-								<xs:list itemType="xs:anyURI"/>
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
-						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
-						<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="groupAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
-						<xs:element name="specializationType" type="m2m:specializationType" minOccurs="0" />
-						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="memberIDs" minOccurs="0">
-							<xs:simpleType> 
-								<xs:list itemType="xs:anyURI" /> 
-							</xs:simpleType> 
-						</xs:element>			
-						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
-						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
-						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
-						<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
-						
-					    <!-- Child Resources -->    
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-                        	<xs:choice minOccurs="1" maxOccurs="unbounded">
-                        		<xs:element ref="m2m:subscription" />
-                        		<xs:element ref="m2m:semanticDescriptor" />
-                        		<xs:element ref="m2m:semanticDescriptorAnnc" />
-                        		<xs:element ref="m2m:transaction" />
-                        	</xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-localMulticastGroup-v3_28_0.xsd.bu b/v3_28_0/CDT-localMulticastGroup-v3_28_0.xsd.bu
deleted file mode 100644
index 5bb9355ac6dbfedb6dcc68e3b5a3639074660a7a..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-localMulticastGroup-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	
-	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_27_0.xsd" />   -->
-
-
-	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="multicastAddress" type="m2m:ipAddress" />
-						<xs:element name="multicastGroupFanoutTarget" type="xs:anyURI" />
-						<xs:element name="memberList" type="m2m:listOfURIs" />
-						<xs:element name="responseTarget" type="xs:anyURI" />
-						<xs:element name="responseTimeWindow" type="xs:duration" minOccurs="0" />
-						<xs:element name="TMGI" type="m2m:TMGI" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<!--				<xs:element ref="m2m:transaction" />    -->
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-locationPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-locationPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index d747a5e2fb751c886cefb1b3a7e9242a2d053d6e..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-locationPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="locationSource" type="m2m:locationSource" />
-						<xs:element name="locationInformationType" type="m2m:locationInformationType" />
-						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
-						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerID" type="xs:anyURI" />
-						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<xs:element name="locationStatus" type="xs:string" />
-						<xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
-						<xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
-						<xs:element name="authID" type="m2m:externalID" minOccurs="0" />						
-						<xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
-						<xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
-						
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="locationPolicyAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
-						<xs:element name="locationInformationType" type="m2m:locationInformationType" minOccurs="0" />
-						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
-						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
-						<xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
-						<xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
-						<xs:element name="authID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
-						<xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-m2mServiceSubscriptionProfile-v3_28_0.xsd.bu b/v3_28_0/CDT-m2mServiceSubscriptionProfile-v3_28_0.xsd.bu
deleted file mode 100644
index 0897c58b6996d039bfb69a0aa552779c3ce37417..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-m2mServiceSubscriptionProfile-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:serviceSubscribedNode" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-memory-v3_28_0.xsd.bu b/v3_28_0/CDT-memory-v3_28_0.xsd.bu
deleted file mode 100644
index 17a297cc62ae1a86f52327ff3748b3ca1d192578..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-memory-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-
-	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memAvailable" type="xs:unsignedLong" />
-						<xs:element name="memTotal" type="xs:unsignedLong" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="memoryAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memAvailable" type="xs:unsignedLong" minOccurs="0" />
-						<xs:element name="memTotal" type="xs:unsignedLong" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-mgmtCmd-v3_28_0.xsd.bu b/v3_28_0/CDT-mgmtCmd-v3_28_0.xsd.bu
deleted file mode 100644
index 3afb456f6f5cd165f17256b2b501262fb8605240..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-mgmtCmd-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="description" type="xs:string" minOccurs="0" />
-						<xs:element name="cmdType" type="m2m:cmdType" />
-						<xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
-						<xs:element name="execEnable" type="xs:boolean" />
-						<xs:element name="execTarget" type="m2m:nodeID" />
-						<xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
-						<xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
-						<xs:element name="execDelay" type="xs:duration" minOccurs="0" />
-						<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="1" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:execInstance" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-multimediaSession-v3_28_0.xsd.bu b/v3_28_0/CDT-multimediaSession-v3_28_0.xsd.bu
deleted file mode 100644
index 2ab81eb186e21ff5dcc2878bef0e6e50e9f7088f..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-multimediaSession-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="sessionOriginatorID" type="m2m:ID" />				
-						<xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
-						<xs:element name="offeredSessionDescriptions" type="m2m:sessionDescriptions" />
-						<xs:element name="sessionState" type="m2m:sessionState" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="multimediaSessionAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<xs:element name="sessionOriginatorID" type="m2m:ID" />				
-						<xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
-						<xs:element name="sessionState" type="m2m:sessionState" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-node-v3_28_0.xsd.bu b/v3_28_0/CDT-node-v3_28_0.xsd.bu
deleted file mode 100644
index f6987c75294ecc041e1c316da3f96bab9769bf4f..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-node-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_27_0.xsd"/>
-
-	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="nodeID" type="m2m:nodeID" />
-						<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
-						<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />				
-						<xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
-						<xs:element name="networkID" type="xs:string" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:memory" />
-								<xs:element ref="m2m:battery" />
-								<xs:element ref="m2m:areaNwkInfo" />
-								<xs:element ref="m2m:areaNwkDeviceInfo" />
-								<xs:element ref="m2m:firmware" />
-								<xs:element ref="m2m:software" />
-								<xs:element ref="m2m:deviceInfo" />
-								<xs:element ref="m2m:deviceCapability" />
-								<xs:element ref="m2m:reboot" />
-								<xs:element ref="m2m:eventLog" />
-								<xs:element ref="m2m:cmdhPolicy" />
-								<xs:element ref="m2m:activeCmdhPolicy" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-								<xs:element ref="m2m:schedule" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="nodeAnnc" substitutionGroup="m2m:sg_announcedResource">
-        <xs:complexType>
-            <xs:complexContent>
-                <!-- Inherit common attributes for announceable Resources -->
-                <xs:extension base="m2m:announcedResource">
-                    <!-- Resource Specific Attributes -->
-                    <xs:sequence>
-                        <xs:element name="nodeID" type="m2m:nodeID" />
-                        <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
-                    	<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
-                    	<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
-                    	<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
-                    	<xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
-                    	<xs:element name="networkID" type="xs:string" minOccurs="0" />
-
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:memoryAnnc" />
-                                <xs:element ref="m2m:batteryAnnc" />
-                                <xs:element ref="m2m:areaNwkInfoAnnc" />
-                                <xs:element ref="m2m:areaNwkDeviceInfoAnnc" />
-                                <xs:element ref="m2m:firmwareAnnc" />
-                                <xs:element ref="m2m:softwareAnnc" />
-                                <xs:element ref="m2m:deviceInfoAnnc" />
-                                <xs:element ref="m2m:deviceCapabilityAnnc" />
-                                <xs:element ref="m2m:rebootAnnc" />
-                                <xs:element ref="m2m:eventLogAnnc" />
-                                <xs:element ref="m2m:subscription" />
-                            	<xs:element ref="m2m:semanticDescriptor" />
-                            	<xs:element ref="m2m:semanticDescriptorAnnc" />
-                            	<xs:element ref="m2m:transaction" />
-                            	<xs:element ref="m2m:schedule" />
-                            </xs:choice>
-                        </xs:choice>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-notification-v3_28_0.xsd.bu b/v3_28_0/CDT-notification-v3_28_0.xsd.bu
deleted file mode 100644
index a69d7028e41c3577cb92c0213da58c39a4bc4b9b..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-notification-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
-The copyright and the foregoing restriction extend to reproduction in all media.
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://www.onem2m.org/xml/protocols"
-        xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
-        xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_27_0.xsd"/>
-
-
-        <xs:element name="notification" type="m2m:notification" />      
-
-        <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
-
-        <xs:complexType name="aggregatedNotification">
-                <xs:sequence>
-                        <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-        </xs:complexType>
-    
-        <xs:complexType name="notification">
-                <xs:sequence>
-                        <xs:element name="notificationEvent" minOccurs="0">
-                            <xs:complexType >
-                                <xs:sequence>
-                                      <xs:element name="representation" type="m2m:representation" minOccurs="0"/>
-                                      <xs:element name="operationMonitor" minOccurs="0">
-                                          <xs:complexType>
-                                               <xs:sequence>
-                                                   <xs:element name="operation" type="m2m:operation" minOccurs="0"/>
-                                                   <xs:element name="originator" type="m2m:ID" minOccurs="0"/>
-                                               </xs:sequence>
-                                         </xs:complexType>
-                                      </xs:element>
-                                      <xs:element name="notificationEventType" type="m2m:notificationEventType"/>
-                                </xs:sequence>
-                            </xs:complexType>
-                        </xs:element>                      
-                    <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
-                    <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
-                    <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
-                    <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>
-                    <xs:element name="targetRemovalRequest" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="targetRemovalAllowance" type="xs:boolean" minOccurs="0"/>           
-                    <xs:element name="IPEDiscoveryRequest" minOccurs="0">
-                            <xs:complexType >
-                                <xs:sequence>
-                                    <xs:element name="originator" type="m2m:ID" />
-                                    <xs:element name="filterCriteria" type="m2m:filterCriteria" />
-                                </xs:sequence>
-                            </xs:complexType>
-                        </xs:element>   
-                    <xs:element name="AERegistrationPointChange" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="AEReferenceIDChange" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="trackingID1" type="m2m:ID" minOccurs="0"/>
-                    <xs:element name="trackingID2" type="m2m:ID" minOccurs="0"/>
-                    
-                </xs:sequence>
-        </xs:complexType>
-    
-    <xs:element name="securityInfo" type="m2m:securityInfo" />
-    
-    <xs:complexType name="securityInfo">
-        <xs:sequence>
-            <xs:element name="securityInfoType" type="m2m:securityInfoType" minOccurs="0" />
-            <xs:element name="dasRequest" type="m2m:dynAuthDasRequest" minOccurs="0" />
-            <xs:element name="dasResponse" type="m2m:dynAuthDasResponse" minOccurs="0" />
-            <xs:element name="esprimRandObject" type="m2m:receiverESPrimRandObject" minOccurs="0" />
-            <xs:element name="esprimObject" type="m2m:e2eCompactJWE" minOccurs="0" />
-            <xs:element name="escertkeMessage" type="xs:base64Binary" minOccurs="0" />
-            <xs:element name="dynAuthRelMapRequest" type="m2m:dynAuthRelMapRequest" minOccurs="0" />
-            <xs:element name="dynAuthRelMapResponse" type="m2m:dynAuthRelMapResponse" minOccurs="0" />
-        </xs:sequence>
-    </xs:complexType>
-    
-    
-    <xs:simpleType name="securityInfoType">
-        <xs:restriction base="xs:integer">
-            <!-- Dynamic Authorization Request -->
-            <xs:enumeration value="1" />
-            <!-- Dynamic Authorization Response -->
-            <xs:enumeration value="2" />
-            <!-- receiverESPrimRandObject Request -->
-            <xs:enumeration value="3" />
-            <!-- receiverESPrimRandObject Response -->
-            <xs:enumeration value="4" />
-            <!-- ESPrim Object -->
-            <xs:enumeration value="5" />
-            <!-- ESCertKE Message -->
-            <xs:enumeration value="6" />
-            <!-- Dynamic Authorization Relationship Mapping Request -->
-            <xs:enumeration value="7" />
-            <!-- Dynamic Authorization Relationship Mapping Response -->
-            <xs:enumeration value="8" />
-        </xs:restriction>
-    </xs:simpleType>
-        
-    <xs:complexType name="dynAuthDasResponse">
-        <xs:sequence>
-            <xs:element name="dynamicACPInfo" minOccurs="0" >
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="grantedPrivileges" type="m2m:setOfAcrs" minOccurs="0" />
-                        <xs:element name="privilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />         
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="tokens" minOccurs="0" >
-                <xs:simpleType>
-                    <xs:restriction> 
-                        <xs:simpleType> 
-                            <xs:list itemType="m2m:dynAuthJWT" />
-                        </xs:simpleType> 
-                        <xs:minLength value="1" /> 
-                    </xs:restriction> 
-                </xs:simpleType>
-            </xs:element>
-            <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="representation">
-        <xs:choice minOccurs="0" >
-            <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
-            <xs:any namespace="##other" processContents="lax"  />
-        </xs:choice>
-    </xs:complexType>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-notificationTargetMgmtPolicyRef-v3_28_0.xsd.bu b/v3_28_0/CDT-notificationTargetMgmtPolicyRef-v3_28_0.xsd.bu
deleted file mode 100644
index 98a473c77a206dada9e024f134a7f13b78114d3a..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-notificationTargetMgmtPolicyRef-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="notificationTargetURI" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="notificationlPolicyID" type="xs:anyURI" minOccurs="0" />
-	                    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-notificationTargetPolicy-v3_28_0.xsd.bu b/v3_28_0/CDT-notificationTargetPolicy-v3_28_0.xsd.bu
deleted file mode 100644
index cfaab32bd7acd744b742965683c99ae7a9e6a282..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-notificationTargetPolicy-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="action" type="m2m:notificationTargetPolicyAction" minOccurs="1" />
-						<xs:element name="policyLabel" type="xs:token" minOccurs="1" />
-						<xs:element name="rulesRelationship" type="m2m:logicalOperator" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">	
-								<xs:element ref="m2m:policyDeletionRules" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-ontology-v3_28_0.xsd.bu b/v3_28_0/CDT-ontology-v3_28_0.xsd.bu
deleted file mode 100644
index 5029f45421de271eb9d12c0e72e096a24a8b0a24..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-ontology-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-	
-	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontologyRepository> and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="description" type="xs:string" minOccurs="0" />
-						<xs:element name="ontologyFormat" type="m2m:semanticFormat" />
-						<xs:element name="ontologyContent" type="xs:anySimpleType" />
-						<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
-										
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />			
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="ontologyAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="description" type="xs:string" minOccurs="0" />
-						<xs:element name="ontologyFormat" type="m2m:semanticFormat" minOccurs="0" />
-						<xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" />
-						<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-ontologyRepository-v3_28_0.xsd.bu b/v3_28_0/CDT-ontologyRepository-v3_28_0.xsd.bu
deleted file mode 100644
index e3666f469ef315b7d8679aebac5e1c7446d5965d..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-ontologyRepository-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-	
-	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontologyRepository> and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes: none -->
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:ontology" />		
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="ontologyRepositoryAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes: none -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:ontology" />
-								<xs:element ref="m2m:ontologyAnnc" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-policyDeletionRules-v3_28_0.xsd.bu b/v3_28_0/CDT-policyDeletionRules-v3_28_0.xsd.bu
deleted file mode 100644
index 2ca0a2d97440b44d28cbd31b05dbc7214d0de30e..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-policyDeletionRules-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="deletionRules" type="m2m:deletionContexts" minOccurs="0" />
-						<xs:element name="deletionRulesRelation" type="m2m:logicalOperator" minOccurs="0" />
-                        
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-pollingChannel-v3_28_0.xsd.bu b/v3_28_0/CDT-pollingChannel-v3_28_0.xsd.bu
deleted file mode 100644
index 2c8e8ef60f7575b58a98fa7b78cf990b409fe4d3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-pollingChannel-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:subordinateResource">
-					<xs:sequence>
-						<!-- No Resource Specific Attributes  -->
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-reboot-v3_28_0.xsd.bu b/v3_28_0/CDT-reboot-v3_28_0.xsd.bu
deleted file mode 100644
index ba24f65dd257c44ad54be89605c832e912013353..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-reboot-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="reboot" type="xs:boolean" />
-						<xs:element name="factoryReset" type="xs:boolean" />
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="rebootAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="reboot" type="xs:boolean" minOccurs="0" />
-						<xs:element name="factoryReset" type="xs:boolean" minOccurs="0" />
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-remoteCSE-v3_28_0.xsd.bu b/v3_28_0/CDT-remoteCSE-v3_28_0.xsd.bu
deleted file mode 100644
index 27da66810d7e1bf8534535dffda298c9a12f881b..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-remoteCSE-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd" />
-						
-	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0" />
-						<xs:element name="CSEBase" type="xs:anyURI" />
-						<xs:element name="CSE-ID" type="m2m:ID" />
-						<xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" />
-						<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
-						<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-						<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
-						<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
-						<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
-						
-	                    <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                            	<xs:element ref="m2m:nodeAnnc" />
-                                <xs:element ref="m2m:container" />
-                            	<xs:element ref="m2m:containerAnnc" />
-                                <xs:element ref="m2m:group" />
-                            	<xs:element ref="m2m:groupAnnc" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                            	<xs:element ref="m2m:accessControlPolicyAnnc" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:pollingChannel" />
-                            	<xs:element ref="m2m:timeSeries" />
-                            	<xs:element ref="m2m:timeSeriesAnnc" />
-                            	<xs:element ref="m2m:locationPolicyAnnc" />
-                            	<xs:element ref="m2m:AEAnnc" />
-                            	<xs:element ref="m2m:sg_flexContainerResource" />
-                            	<xs:element ref="m2m:sg_announcedFlexContainerResource" />
-                            	<xs:element ref="m2m:ontologyRepositoryAnnc" />
-                            	<xs:element ref="m2m:semanticMashupJobProfile" />
-                            	<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
-                            	<xs:element ref="m2m:semanticMashupInstance" />    
-                            	<xs:element ref="m2m:semanticMashupInstanceAnnc" />
-                            	<xs:element ref="m2m:crossResourceSubscription" />
-                            	<xs:element ref="m2m:transactionMgmt" />
-                            	<xs:element ref="m2m:transaction" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="remoteCSEAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0" />
-						<xs:element name="CSEBase" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
-						<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-						<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
-						<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
-						<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
-                       
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:nodeAnnc" />
-                                <xs:element ref="m2m:container" />
-                                <xs:element ref="m2m:containerAnnc" />
-                                <xs:element ref="m2m:group" />
-                                <xs:element ref="m2m:groupAnnc" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                                <xs:element ref="m2m:accessControlPolicyAnnc" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:pollingChannel" />
-                                <xs:element ref="m2m:locationPolicyAnnc" />
-                            	<xs:element ref="m2m:timeSeries" />
-                            	<xs:element ref="m2m:timeSeriesAnnc" />
-                            	<xs:element ref="m2m:AEAnnc" />
-                            	<xs:element ref="m2m:sg_flexContainerResource" />
-                            	<xs:element ref="m2m:sg_announcedFlexContainerResource" />
-                            	<xs:element ref="m2m:ontologyRepositoryAnnc" />
-                            	<xs:element ref="m2m:semanticMashupJobProfile" />
-                            	<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
-                            	<xs:element ref="m2m:semanticMashupInstance" />    
-                            	<xs:element ref="m2m:semanticMashupInstanceAnnc" />
-                            	<xs:element ref="m2m:crossResourceSubscription" />
-                            	<xs:element ref="m2m:transactionMgmt" />
-                            	<xs:element ref="m2m:transaction" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-request-v3_28_0.xsd.bu b/v3_28_0/CDT-request-v3_28_0.xsd.bu
deleted file mode 100644
index 88b8e0c7f7eda44ae0cd63e90da7344517860390..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-request-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-
-	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="operation" type="m2m:operation" />
-						<xs:element name="target" type="xs:anyURI" />
-						<xs:element name="originator" type="m2m:ID" />
-						<xs:element name="requestID" type="m2m:requestID" />
-						<xs:element name="metaInformation" type="m2m:metaInformation" />
-						<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
-						<xs:element name="requestStatus" type="m2m:requestStatus" />
-						<xs:element name="operationResult" type="m2m:operationResult" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-requestPrimitive-v3_28_0.xsd.bu b/v3_28_0/CDT-requestPrimitive-v3_28_0.xsd.bu
deleted file mode 100644
index aab94e019538cf41c7a8e1de464c7a623e0e48ba..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-requestPrimitive-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-
-    <xs:element name="requestPrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- parameter "Operation"  -->
-          <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "ResourceType" -->
-          <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- parameter "Content" -->
-          <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> 
-          <!-- parameter "Role IDs" -->
-          <xs:element name="roleIDs" minOccurs="0">      
-              <xs:simpleType>
-                <xs:restriction> 
-                  <xs:simpleType> 
-                    <xs:list itemType="m2m:roleID" /> 
-                  </xs:simpleType> 				
-                  <xs:minLength value="1" /> 
-                </xs:restriction> 
-              </xs:simpleType>
-          </xs:element>
-          
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Request Expiration Timestamp" -->
-          <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Operation Execution Time" -->
-          <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Response Type" -->
-          <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
-          <!-- parameter "Result Persistence" -->
-          <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Result Content" -->
-          <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
-          <!-- parameter "Delivery Aggregation" -->
-          <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Group Request Identifier" -->
-          <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
-          <!-- parameter "Filter Criteria" -->
-          <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Desired Identifier Result Type" -->
-          <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
-          <!-- parameter "Tokens" -->
-          <xs:element name="tokens" minOccurs="0">
-            <xs:simpleType>
-              <xs:restriction> 
-                <xs:simpleType> 
-                  <xs:list itemType="m2m:dynAuthJWT" /> 
-                </xs:simpleType> 				
-                <xs:minLength value="1" /> 
-              </xs:restriction> 
-            </xs:simpleType>
-          </xs:element> 
-          <!-- parameter "Token IDs" -->
-          <xs:element name="tokenIDs" minOccurs="0">
-            <xs:simpleType>
-              <xs:restriction> 
-                <xs:simpleType> 
-                  <xs:list itemType="m2m:tokenID" /> 
-                </xs:simpleType> 				
-                <xs:minLength value="1" /> 
-              </xs:restriction> 
-            </xs:simpleType>
-          </xs:element>                   
-          <!-- parameter "Local Token IDs" -->
-          <xs:element name="localTokenIDs" minOccurs="0">
-            <xs:simpleType>
-              <xs:restriction> 
-                <xs:simpleType> 
-                  <xs:list itemType="xs:NCName" /> 
-                </xs:simpleType> 				
-                <xs:minLength value="1" /> 
-              </xs:restriction> 
-            </xs:simpleType>
-          </xs:element>
-          <!-- parameter "Token Request Indicator" -->
-          <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Group Request Traget Members" -->
-          <xs:element name="groupRequestTargetMembers" type="m2m:listOfURIs" minOccurs="0"/>            
-          <!-- parameter "Authorization Signature Indicator" -->
-          <xs:element name="authorSignIndicator" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Authorization Signatures" -->
-          <xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
-          <!-- parameter "Authorization Relationship Indicator" -->
-          <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter " Semantic Query Indicator" -->
-          <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Release Version Indicator" -->
-          <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
-          <!-- parameter "Vendor Information" -->
-          <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>    
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
-  
-    <xs:element name="attributeList" type="m2m:attributeList"  />
-  
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-responsePrimitive-v3_28_0.xsd.bu b/v3_28_0/CDT-responsePrimitive-v3_28_0.xsd.bu
deleted file mode 100644
index 4f056fd0c6fe31ef3d3b1401699a32257d02e21c..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-responsePrimitive-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-  <xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_27_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_27_0.xsd" />
-
-  <xs:element name="responsePrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
-               Response Status Code  in TS-0004 -->
-          <!-- parameter "Response Status Code" -->
-          <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "Content" -->
-          <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />        
-          <!-- parameter "Content Status" -->
-          <xs:element name="contentStatus" type="m2m:contentStatus" minOccurs="0" />
-          <!-- parameter "Content Offset" -->
-          <xs:element name="contentOffset" type="xs:positiveInteger" minOccurs="0" />
-          <!-- parameter "Assigned Token Identifiers -->
-          <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
-          <!-- parameter "Token Request Information -->
-          <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />    
-          <!-- parameter "Authorization Signature Request Information -->
-          <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
-          <!-- parameter "Release Version Indicator" -->
-          <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> 
-          <!-- parameter "Vendor Information" -->
-          <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
-  
-  <xs:element name="resource" type="m2m:resourceWrapper"  />
-  
-  <xs:element name="URIList" >
-    <xs:simpleType> 
-      <xs:list itemType="xs:anyURI" /> 
-    </xs:simpleType> 				
-  </xs:element>
-  
-  <xs:element name="URI" type="xs:anyURI"  />
-  
-  <xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
-  
-  <xs:element name="resourceRefList" type="m2m:listOfChildResourceRef" />
-  
-  <xs:element name="debugInfo" type="xs:string" />
-  
-  <xs:element name="queryResult" type="xs:string" />
-  
-  <xs:complexType name="resourceWrapper">	
-    <xs:sequence>
-      <xs:choice minOccurs="1" maxOccurs="1">
-        <xs:element ref="m2m:sg_resource" />
-        <xs:element ref="m2m:sg_regularResource" />
-        <xs:element ref="m2m:sg_announcedResource" />   
-        <xs:element ref="m2m:sg_announceableResource" />
-        <xs:element ref="m2m:sg_subordinateResource" />
-        <xs:element ref="m2m:sg_announcedSubordinateResource" />
-        <xs:element ref="m2m:sg_announceableSubordinateResource" />
-        <xs:element ref="m2m:sg_mgmtResource" />
-        <xs:element ref="m2m:sg_announcedMgmtResource" />
-        <xs:element ref="m2m:sg_flexContainerResource" />
-        <xs:element ref="m2m:sg_announcedFlexContainerResource" />
-      </xs:choice>
-      <xs:element name="URI" type="xs:anyURI" />		
-    </xs:sequence>	
-  </xs:complexType>
-  
-  
-  <xs:complexType name="aggregatedResponse">    
-    <xs:sequence>
-      <xs:element name="resourceID" type="xs:anyURI" minOccurs="0"/>      
-      <xs:element ref="m2m:responsePrimitive" minOccurs="0" maxOccurs="unbounded"/>      
-    </xs:sequence> 	       
-  </xs:complexType> 
-  
-  <xs:complexType name="listOfChildResourceRef">    
-    <xs:sequence>  
-      <xs:element name="resourceRef" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" />
-    </xs:sequence> 	       
-  </xs:complexType> 
-  
-
-</xs:schema> 
-
diff --git a/v3_28_0/CDT-role-v3_28_0.xsd.bu b/v3_28_0/CDT-role-v3_28_0.xsd.bu
deleted file mode 100644
index fa76d94610a1cadbb560d52e683f484d0f5634b0..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-role-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="roleID" type="m2m:roleID" />
-						<xs:element name="issuer" type="m2m:ID" />
-						<xs:element name="holder" type="m2m:ID" />
-						<xs:element name="notBefore" type="m2m:timestamp" />
-						<xs:element name="notAfter" type="m2m:timestamp" />
-						<xs:element name="roleName" type="xs:string" minOccurs="0" />
-						<xs:element name="tokenLink" type="xs:anyURI" minOccurs="0" /> 
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-schedule-v3_28_0.xsd.bu b/v3_28_0/CDT-schedule-v3_28_0.xsd.bu
deleted file mode 100644
index cd4a9eb3650eeee9b03dd3079051eec632b165a3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-schedule-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-
-	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="scheduleElement" type="m2m:scheduleEntries" />
-						<xs:element name="networkCoordinated" type="xs:boolean" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
-						<xs:element name="networkCoordinated" type="xs:boolean" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-semanticDescriptor-v3_28_0.xsd.bu b/v3_28_0/CDT-semanticDescriptor-v3_28_0.xsd.bu
deleted file mode 100644
index 80f028ec5592529ca13c779d0648052c5b12dab0..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-semanticDescriptor-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="descriptorRepresentation" type="m2m:semanticFormat" minOccurs="0" />
-						<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
-						<xs:element name="descriptor" type="xs:base64Binary" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />		
-						<xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
-						<xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="semanticDescriptorAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="descriptorRepresentation" type="m2m:semanticFormat" minOccurs="0" />
-						<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
-						<xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />						
-						<xs:element name="semanticValidated" type="xs:boolean" minOccurs="0" />
-						<xs:element name="validationEnable" type="xs:boolean" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-semanticMashupInstance-v3_28_0.xsd.bu b/v3_28_0/CDT-semanticMashupInstance-v3_28_0.xsd.bu
deleted file mode 100644
index 44a47ec8fe46d6a681379d2fff5a35ef6e4c524f..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-semanticMashupInstance-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontology>, and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="smjpID" type="xs:anyURI" />
-						<xs:element name="smjpInputParameter" type="xs:base64Binary" />
-						<xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" />
-						<xs:element name="mashupMember" type="m2m:mashupMembers" minOccurs="0"/>
-						<xs:element name="resultGenType" type="m2m:mashupResultGenType" />
-						<xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
-						
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />	
-								<xs:element ref="m2m:semanticMashupResult" />
-								<xs:element ref="m2m:semanticDescriptor" />		
-								<xs:element ref="m2m:transaction" />
-											
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="semanticMashupInstanceAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="smjpID" type="xs:anyURI" minOccurs="0"/>
-						<xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
-						<xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" minOccurs="0"/>
-						<xs:element name="mashupMember" type="m2m:mashupMembers" minOccurs="0"/>
-						<xs:element name="resultGenType" type="m2m:mashupResultGenType" minOccurs="0"/>
-						<xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
-												
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticMashupResult" />
-								<xs:element ref="m2m:semanticMashupResultAnnc" />
-								<xs:element ref="m2m:semanticDescriptor" />	
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:transaction" />
-								
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-semanticMashupJobProfile-v3_28_0.xsd.bu b/v3_28_0/CDT-semanticMashupJobProfile-v3_28_0.xsd.bu
deleted file mode 100644
index f497c1bceb99c4faf243ffd7b4e90880a54d694b..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-semanticMashupJobProfile-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontology>, and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="memberFilter" type="m2m:sparql" />
-						<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
-						<xs:element name="outputDescriptor" type="xs:base64Binary" />
-						<xs:element name="functionDescriptor" type="xs:base64Binary" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />	
-								<xs:element ref="m2m:semanticMashupInstance" />
-								<xs:element ref="m2m:semanticDescriptor" />				
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="semanticMashupJobProfileAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
-						<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
-						<xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" />
-						<xs:element name="functionDescriptor" type="xs:base64Binary" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticMashupInstance" />
-								<xs:element ref="m2m:semanticMashupInstanceAnnc" />
-								<xs:element ref="m2m:semanticDescriptor" />	
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-semanticMashupResult-v3_28_0.xsd.bu b/v3_28_0/CDT-semanticMashupResult-v3_28_0.xsd.bu
deleted file mode 100644
index 2762ba98a8ff6ecec8a55a7aa479ac22feac4a09..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-semanticMashupResult-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontology>, and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="smjpInputParameter" type="xs:base64Binary"  minOccurs="0"/>
-						<xs:element name="mashupResultFormat" type="m2m:serializations" />
-						<xs:element name="mashupResult" type="xs:base64Binary"/>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="semanticMashupResultAnnc" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>, 
-							                               <ontology>, and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
-						<xs:element name="mashupResultFormat" type="m2m:serializations" minOccurs="0"/>
-						<xs:element name="mashupResult" type="xs:base64Binary" minOccurs="0"/>
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-serviceSubscribedAppRule-v3_28_0.xsd.bu b/v3_28_0/CDT-serviceSubscribedAppRule-v3_28_0.xsd.bu
deleted file mode 100644
index 8f5fc0b43d2e120c9299142094f825dad0ac3248..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-serviceSubscribedAppRule-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="applicableCredIDs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="allowedApp-IDs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="allowedAEs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="allowedRole-IDs" minOccurs="0" >
-							<xs:simpleType>
-								<xs:restriction> 
-									<xs:simpleType> 
-										<xs:list itemType="m2m:roleID" /> 
-									</xs:simpleType> 				
-									<xs:minLength value="1" /> 
-								</xs:restriction> 
-							</xs:simpleType>
-						</xs:element>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-serviceSubscribedNode-v3_28_0.xsd.bu b/v3_28_0/CDT-serviceSubscribedNode-v3_28_0.xsd.bu
deleted file mode 100644
index c96d8b2b6a5c1214c219d246ab83e9cf2e783ca5..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-serviceSubscribedNode-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="nodeID" type="m2m:nodeID" />
-						<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="deviceIdentifier" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:deviceID" />
-							</xs:simpleType>
-						</xs:element>
-                        <xs:element name="ruleLinks" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="niddRequired" type="xs:boolean" minOccurs="0" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-software-v3_28_0.xsd.bu b/v3_28_0/CDT-software-v3_28_0.xsd.bu
deleted file mode 100644
index 98a658fc4418f5697ffcd1e2f8b5a9d2d15d4aa2..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-software-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" />
-						<xs:element name="softwareName" type="xs:string" />
-						<xs:element name="URL" type="xs:anyURI" />
-						<xs:element name="install" type="xs:boolean" />
-						<xs:element name="uninstall" type="xs:boolean" />
-						<xs:element name="installStatus" type="m2m:actionStatus" />
-						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="softwareAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="softwareName" type="xs:string" minOccurs="0" />
-						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="install" type="xs:boolean" minOccurs="0" />
-						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
-						<xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-statsCollect-v3_28_0.xsd.bu b/v3_28_0/CDT-statsCollect-v3_28_0.xsd.bu
deleted file mode 100644
index 0dca70120a3a5aa0794f0e2d91e63f3ebbccf1e2..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-statsCollect-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="statsCollectID" type="xs:string" />
-						<xs:element name="collectingEntityID" type="m2m:ID" />
-						<xs:element name="collectedEntityID" type="m2m:listOfM2MID" />						
-						<xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
-						<xs:element name="statModel" type="m2m:statModelType" />
-						<xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
-                        <xs:element name="eventID" type="xs:string" minOccurs="0" />
-                        
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-statsConfig-v3_28_0.xsd.bu b/v3_28_0/CDT-statsConfig-v3_28_0.xsd.bu
deleted file mode 100644
index 4d5e64739982f79df0b1ae8d5d07f1d7060d836c..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-statsConfig-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:eventConfig" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-subscription-v3_28_0.xsd.bu b/v3_28_0/CDT-subscription-v3_28_0.xsd.bu
deleted file mode 100644
index 0adbdb3b4ba177574e0425b616518daaf1b2cce3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-subscription-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" />
-						<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="notificationURI" type="m2m:listOfURIs" />
-						<xs:element name="groupID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="batchNotify" type="m2m:batchNotify" minOccurs="0" />
-						<xs:element name="rateLimit" type="m2m:rateLimit" minOccurs="0" />
-						<xs:element name="preSubscriptionNotify" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="pendingNotification" type="m2m:pendingNotification" minOccurs="0" />
-						<xs:element name="notificationStoragePriority" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="latestNotify" type="xs:boolean" minOccurs="0" />
-						<xs:element name="notificationContentType" type="m2m:notificationContentType" />
-						<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
-						<xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="associatedCrossResourceSub" type="m2m:listOfURIs" minOccurs="0" />					
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:schedule" />
-								<xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:complexType name="batchNotify">
-		<xs:sequence>
-			<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="duration" type="xs:duration" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="rateLimit">
-		<xs:sequence>
-			<xs:element name="maxNrOfNotify" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="timeWindow" type="xs:duration" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-svcFwWrapper-v3_28_0.xsd.bu b/v3_28_0/CDT-svcFwWrapper-v3_28_0.xsd.bu
deleted file mode 100644
index cdc89d48682633d1fb48b4db8d26c0da1545a5b3..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-svcFwWrapper-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	
-	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="svcFwWrapperAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-svcObjWrapper-v3_28_0.xsd.bu b/v3_28_0/CDT-svcObjWrapper-v3_28_0.xsd.bu
deleted file mode 100644
index fff5cf1504ab53d4f2faab2ab1c57e3d21089008..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-svcObjWrapper-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_27_0.xsd" />
-	
-	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to flexContainer specializations -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynApp"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="svcObjWrapperAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit attributes common to announced flexContainer specializations -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="0" maxOccurs="unbounded">
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:subscription"  />
-								<xs:element ref="m2m:allJoynAppAnnc"  />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-timeSeries-v3_28_0.xsd.bu b/v3_28_0/CDT-timeSeries-v3_28_0.xsd.bu
deleted file mode 100644
index be39e7ecbb4783ecf286dd40f5fd616637f3aae0..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-timeSeries-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-
-	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />						
-						<xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
-						<xs:element name="missingDataMaxNr" type="xs:positiveInteger" minOccurs="0" />  
-						<xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
-						<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />						
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> 
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-						
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:timeSeriesInstance" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="timeSeriesAnnc" substitutionGroup="m2m:sg_announcedResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						
-						<!-- Resource Specific Attributes -->
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />						
-						<xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />  
-						<xs:element name="missingDataMaxNr" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
-						<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />						
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> 
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:timeSeriesInstance" />
-								<xs:element ref="m2m:timeSeriesInstanceAnnc" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:semanticDescriptor" />
-								<xs:element ref="m2m:semanticDescriptorAnnc" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-timeSeriesInstance-v3_28_0.xsd.bu b/v3_28_0/CDT-timeSeriesInstance-v3_28_0.xsd.bu
deleted file mode 100644
index 7d1e6d5982bc4a34b429ad9c7c09e785d0e65a62..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-timeSeriesInstance-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_27_0.xsd"/>
-
-	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
-						<xs:element name="content" type="xs:anySimpleType" />
-						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
-						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:transaction" />
-								<xs:element ref="m2m:semanticDescriptor" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="timeSeriesInstanceAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
-						<xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
-						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:transaction" />
-								<xs:element ref="m2m:semanticDescriptor" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-timeSeriesNotification-v3_28_0.xsd.bu b/v3_28_0/CDT-timeSeriesNotification-v3_28_0.xsd.bu
deleted file mode 100644
index 30eba37737bbcef328f08c77eb89d26ac9c94f09..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-timeSeriesNotification-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	
-	<xs:element name="timeSeriesNotification">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="missingDataList" type="m2m:missingDataList"/>
-				<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	
-</xs:schema>
-
diff --git a/v3_28_0/CDT-token-v3_28_0.xsd.bu b/v3_28_0/CDT-token-v3_28_0.xsd.bu
deleted file mode 100644
index 7fd8c19b90e6aaf93308b0c0edbf1ec3f2427f2b..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-token-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-	
-
-	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="tokenID" type="m2m:tokenID" />
-						<xs:element name="tokenObject" type="m2m:dynAuthJWT" />
-						<xs:element name="version" type="xs:string" minOccurs="0"/>
-						<xs:element name="issuer" type="m2m:ID" minOccurs="0" />
-						<xs:element name="holder" type="m2m:ID" minOccurs="0"/>
-						<xs:element name="notBefore" type="m2m:timestamp" />
-						<xs:element name="notAfter" type="m2m:timestamp" minOccurs="0"/>
-						<xs:element name="tokenName" type="xs:string" minOccurs="0" />
-						<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" /> 
-						<xs:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />
-						<xs:element name="extension" type="xs:string" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v3_28_0/CDT-transaction-v3_28_0.xsd.bu b/v3_28_0/CDT-transaction-v3_28_0.xsd.bu
deleted file mode 100644
index c4b31e27f164301814d5d2404a3c25272861cfe1..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-transaction-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_27_0.xsd" />
-
-	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="transactionID" type="xs:string" />
-						<xs:element name="transactionControl" type="m2m:transactionControl" />
-						<xs:element name="transactionState" type="m2m:transactionState" />
-						<xs:element name="transactionLockTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" />
-						<xs:element ref="m2m:requestPrimitive" />
-						<xs:element ref="m2m:responsePrimitive" />
-																						
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-transactionMgmt-v3_28_0.xsd.bu b/v3_28_0/CDT-transactionMgmt-v3_28_0.xsd.bu
deleted file mode 100644
index 4957417e0eb1301ab8aced2a669386a7dce6e9aa..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-transactionMgmt-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_27_0.xsd" />
-
-	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="transactionLockTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionExpirationTime" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="transactionMode" type="m2m:transactionMode" minOccurs="0" />
-						<xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" />
-						<xs:element name="transactionControl" type="m2m:transactionControl" minOccurs="0" />
-						<xs:element name="transactionState" type="m2m:transactionState" />
-						<xs:element name="transactionMaxRetries" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="transactionMgmtHandling" type="m2m:transactionMgmtHandling" minOccurs="0" />
-						<xs:element name="requestPrimitives" type="m2m:aggregatedRequest" />
-						<xs:element name="responsePrimitives" type="m2m:aggregatedResponse" />
-																
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/v3_28_0/CDT-triggerPayload-v3_28_0.xsd.bu b/v3_28_0/CDT-triggerPayload-v3_28_0.xsd.bu
deleted file mode 100644
index db9f076ffb0754e02266da15fb3a50dca9a45408..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-triggerPayload-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	
-	<xs:element name="triggerPayload">
-		<xs:complexType>
-			<xs:sequence>
-				<!-- Parameter Trigger Purpose -->
-				<xs:element name="triggerPurpose" type="m2m:triggerPurpose"/>
-				<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0"/>
-				<xs:element name="triggerInfoPoA" type="m2m:poaList" minOccurs="0"/>
-				<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/>
-				<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/>
-				<xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/>
-				<xs:element name="triggerInfoSerializationTypes" type="m2m:serializations" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	
-</xs:schema>
-
diff --git a/v3_28_0/CDT-triggerRequest-v3_28_0.xsd.bu b/v3_28_0/CDT-triggerRequest-v3_28_0.xsd.bu
deleted file mode 100644
index 199d8aece1be4930fcddde5541e37f2f356b812f..0000000000000000000000000000000000000000
--- a/v3_28_0/CDT-triggerRequest-v3_28_0.xsd.bu
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_27_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_27_0.xsd"/>
-
-	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="M2M-Ext-ID" type="m2m:externalID" />
-						<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" />
-						<xs:element name="triggerPurpose" type="m2m:triggerPurpose" />
-						<xs:element name="triggerStatus" type="m2m:triggerStatus" />
-						<xs:element name="triggerValidityTime" type="xs:duration" minOccurs="0" />
-						<xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
-						<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
-						<xs:element name="triggerReference" type="xs:string" minOccurs="0" />
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:transaction" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>