diff --git a/CDT-node-v0_8_0.xsd b/CDT-node-v0_8_0.xsd
index 2e1d84bb628e8f74813003acee064c1fd316aed1..2739aef47fbbba37ef6bc8960404e7c736704b47 100644
--- a/CDT-node-v0_8_0.xsd
+++ b/CDT-node-v0_8_0.xsd
@@ -50,8 +50,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="nodeID" type="m2m:nodeID" />
-
-						<!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 -->
 						<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
 
 						<!-- Child Resources -->
@@ -87,8 +85,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                     <!-- Resource Specific Attributes -->
                     <xs:sequence>
                         <xs:element name="nodeID" type="m2m:nodeID" />
-
-                        <!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 -->
                         <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
 
                         <!-- Child Resources -->
@@ -105,8 +101,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                                 <xs:element ref="m2m:deviceCapabilityAnnc" />
                                 <xs:element ref="m2m:rebootAnnc" />
                                 <xs:element ref="m2m:eventLogAnnc" />
-                                <xs:element ref="m2m:cmdhPolicyAnnc" />
-                                <xs:element ref="m2m:activeCmdhPolicyAnnc" />
                                 <xs:element ref="m2m:subscription" />
                             </xs:choice>
                         </xs:choice>