diff --git a/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd b/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd
deleted file mode 100644
index b7dd53cf1c792c8ef548b2c7f0f8095f55a1c778..0000000000000000000000000000000000000000
--- a/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd
+++ /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 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_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	
-	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="operationName" type="xs:string" />
-						<xs:element name="operationState" type="xs:string" />
-						<xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputLinks" type="m2m:listOfDataLinks" 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:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-
-	<xs:element name="genericInterworkingOperationInstanceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="operationName" type="xs:string" minOccurs="0" />
-						<xs:element name="operationState" type="xs:string" minOccurs="0" />
-						<xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputLinks" type="m2m:listOfDataLinks" 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: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_23_0/CDT-genericInterworkingService-v3_23_0.xsd b/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd
deleted file mode 100644
index 8e1e6aab90b313ed97fad967af5520bf82c12909..0000000000000000000000000000000000000000
--- a/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd
+++ /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" 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_23_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_23_0.xsd" />
-	
-	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:flexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="serviceName" type="xs:string" />
-						<xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" 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:genericInterworkingService" />
-								<xs:element ref="m2m:genericInterworkingOperationInstance" />
-								<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="genericInterworkingServiceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedFlexContainerResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="serviceName" type="xs:string" />
-						<xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-						<xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" 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:genericInterworkingServiceAnnc" />
-								<xs:element ref="m2m:genericInterworkingOperationInstanceAnnc" />
-								<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>