diff --git a/data_model/in_progress/clusters/EnergyPrice.xml b/data_model/in_progress/clusters/EnergyPrice.xml
deleted file mode 100644
index aae07641398eeb..00000000000000
--- a/data_model/in_progress/clusters/EnergyPrice.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
-
-:xrefstyle: short
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0095" name="Energy Price Cluster" revision="4">
-  <revisionHistory>
-    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
-    <revision revision="2" summary="Updated from SE1.4 version; CCB 1447 2964 2965"/>
-    <revision revision="3" summary="CCBs 2043 2706 2810 2912 3566"/>
-    <revision revision="4" summary="Initial Matter revision"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId id="0x0095" name="Energy Price"/>
-  </clusterIds>
-  <classification hierarchy="base" role="application" picsCode="SEPR" scope="Endpoint"/>
-  <features>
-    <feature bit="0" code="FORE" name="Forecasting" summary="Forecasts upcoming pricing">
-      <optionalConform/>
-    </feature>
-  </features>
-  <dataTypes>
-    <enum name="PriceComponentSourceEnum">
-      <item value="0" name="Tariff" summary="Tariff">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="IncentiveSignal" summary="Incentive Signal">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <enum name="UnitOfMeasureEnum">
-      <item value="0" name="kWh" summary="Kilowatt Hours">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="m" summary="Cubic meters">
-        <mandatoryConform/>
-      </item>
-      <item value="2" name="ft" summary="Cubic feet">
-        <mandatoryConform/>
-      </item>
-      <item value="3" name="CCF" summary="Centum Cubic feet">
-        <mandatoryConform/>
-      </item>
-      <item value="4" name="US" summary="US Gallons">
-        <mandatoryConform/>
-      </item>
-      <item value="5" name="IMP" summary="Imperial Gallons">
-        <mandatoryConform/>
-      </item>
-      <item value="6" name="L" summary="Liters">
-        <mandatoryConform/>
-      </item>
-      <item value="7" name="BTUs" summary="British Thermal Units">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <bitmap name="PriceDetailBitmap">
-      <bitfield name="Description" bit="0" summary="A textual description of a price; e.g. the name of a rate plan.">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Components" bit="1" summary="A breakdown of the component parts of a price; e.g. generation, delivery, etc.">
-        <mandatoryConform/>
-      </bitfield>
-    </bitmap>
-    <struct name="PriceComponentStruct">
-      <field id="0" name="Price" type="int32">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Source" type="PriceComponentSourceEnum" default="Tariff">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="Description" type="string">
-        <optionalConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="PriceStruct">
-      <field id="0" name="PeriodStart" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PeriodEnd" type="epoch-s" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="Price" type="int32">
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="DecimalPoints" type="uint8" default="0">
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="Currency" type="uint16">
-        <mandatoryConform/>
-        <constraint type="max" value="999"/>
-      </field>
-      <field id="5" name="Description" type="string">
-        <optionalConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="6" name="Components" type="list" default="empty">
-        <entry type="PriceComponentStruct"/>
-        <optionalConform/>
-        <constraint type="maxCount" value="10"/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="UnitOfMeasure" type="UnitOfMeasureEnum" default="null">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="CurrentPrice" type="PriceStruct" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0002" name="PriceForecast" type="list" default="empty">
-      <entry type="PriceStruct"/>
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="FORE"/>
-      </mandatoryConform>
-    </attribute>
-  </attributes>
-  <commands>
-    <command id="0x00" name="GetDetailedPriceRequest" direction="commandToServer" response="GetDetailedPriceResponse">
-      <access invokePrivilege="operate"/>
-      <optionalConform/>
-      <field id="0" name="Details" type="PriceDetailBitmap" default="0">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x01" name="GetDetailedPriceResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <command name="GetDetailedPriceRequest"/>
-      </mandatoryConform>
-      <field id="0" name="Price" type="PriceStruct" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x02" name="GetDetailedForecastRequest" direction="commandToServer" response="GetDetailedForecastResponse">
-      <access invokePrivilege="operate"/>
-      <optionalConform>
-        <feature name="FORE"/>
-      </optionalConform>
-      <field id="0" name="Details" type="PriceDetailBitmap" default="0">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x03" name="GetDetailedForecastResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <command name="GetDetailedForecastRequest"/>
-      </mandatoryConform>
-      <field id="0" name="Price" type="list" default="empty">
-        <entry type="PriceStruct"/>
-        <mandatoryConform/>
-      </field>
-    </command>
-  </commands>
-  <events>
-    <event id="0x00" name="PriceChange" priority="info">
-      <access readPrivilege="view"/>
-      <optionalConform/>
-      <field id="0" name="Price" type="PriceStruct">
-        <mandatoryConform/>
-      </field>
-    </event>
-    <event id="0x01" name="ForecastChange" priority="info">
-      <access readPrivilege="view"/>
-      <optionalConform/>
-      <field id="0" name="Forecast" type="list">
-        <entry type="PriceStruct"/>
-        <mandatoryConform/>
-      </field>
-    </event>
-  </events>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/GeneralCommissioningCluster.xml b/data_model/in_progress/clusters/GeneralCommissioningCluster.xml
index 8d6c428259f427..7dae043cd4df98 100644
--- a/data_model/in_progress/clusters/GeneralCommissioningCluster.xml
+++ b/data_model/in_progress/clusters/GeneralCommissioningCluster.xml
@@ -64,11 +64,6 @@ Davis, CA 95616, USA
     <clusterId id="0x0030" name="General Commissioning"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="CGEN" scope="Node"/>
-  <features>
-    <feature bit="0" code="TC" name="TermsAndConditions" summary="Supports Terms &amp; Conditions acknowledgement">
-      <optionalConform/>
-    </feature>
-  </features>
   <dataTypes>
     <enum name="CommissioningErrorEnum">
       <item value="0" name="OK" summary="No error">
@@ -246,9 +241,6 @@ Davis, CA 95616, USA
       <mandatoryConform>
         <feature name="TC"/>
       </mandatoryConform>
-      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
-        <mandatoryConform/>
-      </field>
     </command>
   </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/JointFabricDatastoreCluster.xml b/data_model/in_progress/clusters/JointFabricDatastoreCluster.xml
deleted file mode 100644
index 79143f34d03f55..00000000000000
--- a/data_model/in_progress/clusters/JointFabricDatastoreCluster.xml
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Joint Fabric Datastore Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId name="Joint Fabric Datastore Cluster"/>
-  </clusterIds>
-  <classification hierarchy="base" role="utility" picsCode="JFDS" scope="Node"/>
-  <dataTypes>
-    <enum name="DatastoreStateEnum">
-      <item value="0" name="Pending" summary="Target device operation is pending">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="Committed" summary="Target device operation has been committed">
-        <mandatoryConform/>
-      </item>
-      <item value="2" name="DeletePending" summary="Target device delete operation is pending">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <struct name="Datastore ACL Entry">
-      <field id="0" name="ListID" type="uint16">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="ACLEntry" type="ref_AccessControlEntryStruct">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="StatusEntry" type="DatastoreStatusEntry">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Administrator Information Entry">
-      <field id="1" name="NodeID" type="node-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="FriendlyName" type="string">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="3" name="VendorID" type="vendor-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="ICAC" type="octstr">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="400"/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Endpoint Entry">
-      <field id="0" name="EndpointID" type="endpoint-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="FriendlyName" type="string">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="3" name="StatusEntry" type="DatastoreStatusEntry">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="GroupIDList" type="DataTypeList[Datastore Group ID Entry Type]">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="5" name="BindingList" type="DataTypeList[Datastore Binding Entry Type]">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Group ID Entry">
-      <field id="0" name="GroupID" type="group-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="StatusEntry" type="DatastoreStatusEntry">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Group Information Entry">
-      <field id="0" name="GroupID" type="uint64">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="2" name="GroupKeySetID" type="uint16">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="3" name="GroupCAT" type="uint16">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="4" name="GroupCATVersion" type="uint16">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Node Information Entry">
-      <field id="1" name="NodeID" type="node-id">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="FriendlyName" type="string">
-        <access read="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="3" name="CommissioningStatusEntry" type="DatastoreStatusEntry">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="NodeKeySetList" type="DataTypeList[Datastore Node Key Entry Type]">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="5" name="ACLList" type="list">
-        <entry type="Datastore ACL Entry"/>
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="6" name="EndpointList" type="DataTypeList[Datastore Endpoint Entry Type]">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="Datastore Node Key Entry">
-      <field id="0" name="GroupKeySetID" type="uint16">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="StatusEntry" type="DatastoreStatusEntry">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="DatastoreStatusEntry">
-      <field id="0" name="State" type="DatastoreStateEnum" default="Pending">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="UpdateTimestamp" type="utc" default="null">
-        <access read="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="AnchorRootCA" type="octstr">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="AnchorNodeID" type="node-id">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0002" name="AnchorVendorID" type="vendor-id">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0003" name="FriendlyName" type="string">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="32"/>
-    </attribute>
-    <attribute id="0x0004" name="GroupKeySetList" type="DataTypeList[ref_GroupKeySetStruct]">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0005" name="GroupList" type="DataTypeList[Datastore Group Information Entry Type]">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0006" name="NodeList" type="DataTypeList[Datastore Node Information Entry Type]">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0007" name="AdminList" type="DataTypeList[Datastore Administrator Information Entry Type]">
-      <access read="true" readPrivilege="admin"/>
-      <mandatoryConform/>
-    </attribute>
-  </attributes>
-  <commands>
-    <command id="0x00" name="AddKeySet Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupKeySet" type="ref_GroupKeySetStruct">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x01" name="UpdateKeySet Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupKeySet" type="ref_GroupKeySetStruct">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x02" name="RemoveKeySet Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupKeySetID" type="uint16">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x03" name="AddGroup Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="2" name="GroupKeySetID" type="uint16">
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="3" name="GroupCAT" type="uint16">
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="4" name="GroupCATVersion" type="uint16">
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x04" name="UpdateGroup Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="2" name="GroupKeySetID" type="uint16">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="3" name="GroupCAT" type="uint16">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="4" name="GroupCATVersion" type="uint16">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
-      </field>
-      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
-        <mandatoryConform/>
-        <constraint type="allowed" value="0bX"/>
-      </field>
-    </command>
-    <command id="0x05" name="RemoveGroup Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x06" name="AddAdmin Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="AdminInformationEntry" type="Datastore Administrator Information Entry">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x07" name="UpdateAdmin Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="2" name="ICAC" type="octstr">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="maxLength" value="400"/>
-      </field>
-    </command>
-    <command id="0x08" name="RemoveAdmin Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x09" name="AddPendingNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-    </command>
-    <command id="0x0A" name="RefreshNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x0B" name="UpdateNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="FriendlyName" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-    </command>
-    <command id="0x0C" name="RemoveNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x0D" name="UpdateEndpointForNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="FriendlyName" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-    </command>
-    <command id="0x0E" name="AddGroupIDToEndpointForNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x0F" name="RemoveGroupIDFromEndpointForNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x10" name="AddBindingToEndpointForNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="Binding" type="ref_BindingTargetStruct">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x11" name="RemoveBindingFromEndpointForNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="ListID" type="uint16">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x12" name="AddACLToNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="ACLEntry" type="ref_AccessControlEntryStruct">
-        <mandatoryConform/>
-      </field>
-    </command>
-    <command id="0x13" name="RemoveACLFromNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="ListID" type="uint16">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-    </command>
-  </commands>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/JointFabricPKICluster.xml b/data_model/in_progress/clusters/JointFabricPKICluster.xml
deleted file mode 100644
index 7fba1e17376ecd..00000000000000
--- a/data_model/in_progress/clusters/JointFabricPKICluster.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Joint Fabric PKI Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId name="Joint Fabric PKI Cluster"/>
-  </clusterIds>
-  <classification hierarchy="base" role="utility" picsCode="JFPKI" scope="Node"/>
-  <dataTypes>
-    <enum name="ICAC Signing Request Status Enum">
-      <item value="0" name="ref_IcacsrRequestStatusOK" summary="No error">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="ref_InvalidIcaCsrFormat" summary="The ICACSR in the request is not compliant to &lt;&lt;ref_Rfc2986, PKCS #10&gt;&gt; rules">
-        <mandatoryConform/>
-      </item>
-      <item value="2" name="ref_InvalidIcaCsrSignature" summary="The ICACSR in the request has an incorrect signature">
-        <mandatoryConform/>
-      </item>
-      <item value="3" name="ref_FailedDCLVendorIdValidation" summary="DCL Vendor ID validation failed">
-        <mandatoryConform/>
-      </item>
-      <item value="4" name="ref_NotAnIcac" summary="DCL returned certificate is not an ICAC">
-        <mandatoryConform/>
-      </item>
-      <item value="5" name="ref_IcaSigningFailed" summary="Signing the ICA CSR failed">
-        <mandatoryConform/>
-      </item>
-    </enum>
-  </dataTypes>
-  <commands>
-    <command id="0x00" name="ICACSRRequest Command" direction="commandToServer" response="ICACSRResponse Command">
-      <access invokePrivilege="admin"/>
-      <mandatoryConform/>
-      <field id="0" name="ref_Icacsr" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="400"/>
-      </field>
-    </command>
-    <command id="0x01" name="ICACSRResponse Command" direction="responseFromServer">
-      <mandatoryConform/>
-      <field id="0" name="ref_IcaCsrResponseStatusCode" type="ICAC Signing Request Status Enum">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="ref_IcaCsrResponseICAC" type="octstr">
-        <optionalConform/>
-        <constraint type="maxLength" value="400"/>
-      </field>
-    </command>
-  </commands>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/MeterIdentification.xml b/data_model/in_progress/clusters/MeterIdentification.xml
deleted file mode 100644
index 1ed47d5d3da3af..00000000000000
--- a/data_model/in_progress/clusters/MeterIdentification.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
-
-:xrefstyle: short
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B06" name="Meter Identification Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial version"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId id="0x0B06" name="Meter Identification"/>
-  </clusterIds>
-  <classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
-  <features>
-    <feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
-      <optionalConform/>
-    </feature>
-  </features>
-  <dataTypes>
-    <enum name="MeterTypeEnum">
-      <item value="0x00" name="Utility" summary="Utility Meter">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Private" summary="Private Meter">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Generic" summary="Generic Meter">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <enum name="PowerThresholdSourceEnum">
-      <item value="0x00" name="Contract" summary="The value comes from a signed contract">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Regulator" summary="The value comes from a legal regulator">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Equipment" summary="The value comes from a certified limits of the meter">
-        <mandatoryConform/>
-      </item>
-    </enum>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="MeterType" type="MeterTypeEnum" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="UtilityName" type="string" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0002" name="PointOfDelivery" type="string" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0003" name="PowerThreshold" type="power-mW" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="PWRTHLD"/>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0004" name="PowerThresholdSource" type="PowerThresholdSourceEnum" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="PWRTHLD"/>
-      </mandatoryConform>
-    </attribute>
-  </attributes>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/NetworkCommissioningCluster.xml b/data_model/in_progress/clusters/NetworkCommissioningCluster.xml
index 8eefb234a2920a..1a511ed18fda3a 100644
--- a/data_model/in_progress/clusters/NetworkCommissioningCluster.xml
+++ b/data_model/in_progress/clusters/NetworkCommissioningCluster.xml
@@ -55,11 +55,10 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning Cluster" revision="3">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning Cluster" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements."/>
-    <revision revision="3" summary="Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and QueryIdentityResponse commands; PDC-related fields in commands)."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0031" name="Network Commissioning"/>
@@ -75,11 +74,6 @@ Davis, CA 95616, USA
     <feature bit="2" code="ET" name="EthernetNetworkInterface" summary="Ethernet related features">
       <optionalConform choice="a"/>
     </feature>
-    <feature bit="3" code="PDC" name="PerDeviceCredentials" summary="Wi-Fi Per-Device Credentials">
-      <mandatoryConform>
-        <feature name="WI"/>
-      </mandatoryConform>
-    </feature>
   </features>
   <dataTypes>
     <enum name="NetworkCommissioningStatusEnum">
@@ -176,9 +170,6 @@ Davis, CA 95616, USA
       <bitfield name="WPA3-PERSONAL" bit="4" summary="Supports Wi-Fi using WPA3-Personal security">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="WPA3-Matter-PDC" bit="5" summary="Supports Wi-Fi using Per-Device Credentials">
-        <mandatoryConform/>
-      </bitfield>
     </bitmap>
     <struct name="NetworkInfoStruct">
       <field id="0" name="NetworkID" type="octstr">
@@ -188,22 +179,6 @@ Davis, CA 95616, USA
       <field id="1" name="Connected" type="bool">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NetworkIdentifier" type="octstr" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform>
-          <feature name="PDC"/>
-        </mandatoryConform>
-        <constraint type="maxLength" value="20"/>
-        <constraint type="desc"/>
-      </field>
-      <field id="3" name="ClientIdentifier" type="octstr" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform>
-          <feature name="PDC"/>
-        </mandatoryConform>
-        <constraint type="maxLength" value="20"/>
-        <constraint type="desc"/>
-      </field>
     </struct>
     <struct name="ThreadInterfaceScanResultStruct">
       <field id="0" name="PanId" type="uint16">
@@ -430,30 +405,6 @@ Davis, CA 95616, USA
       <field id="2" name="Breadcrumb" type="uint64">
         <optionalConform/>
       </field>
-      <field id="3" name="NetworkIdentity" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="4" name="ClientIdentifier" type="octstr">
-        <optionalConform>
-          <andTerm>
-            <feature name="PDC"/>
-            <commandField name="NetworkIdentity"/>
-          </andTerm>
-        </optionalConform>
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="5" name="PossessionNonce" type="octstr">
-        <optionalConform>
-          <andTerm>
-            <feature name="PDC"/>
-            <commandField name="NetworkIdentity"/>
-          </andTerm>
-        </optionalConform>
-        <constraint type="maxLength" value="32"/>
-      </field>
     </command>
     <command id="0x03" name="AddOrUpdateThreadNetwork" direction="commandToServer" response="NetworkConfigResponse">
       <access invokePrivilege="admin"/>
@@ -503,18 +454,6 @@ Davis, CA 95616, USA
         <optionalConform/>
         <constraint type="between" from="0" to="MaxNetworks - 1"/>
       </field>
-      <field id="3" name="ClientIdentity" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="4" name="PossessionSignature" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="64"/>
-      </field>
     </command>
     <command id="0x06" name="ConnectNetwork" direction="commandToServer" response="ConnectNetworkResponse">
       <access invokePrivilege="admin"/>
@@ -570,32 +509,5 @@ Davis, CA 95616, USA
         <optionalConform/>
       </field>
     </command>
-    <command id="0x09" name="QueryIdentity" direction="commandToServer" response="QueryIdentityResponse">
-      <access invokePrivilege="admin"/>
-      <mandatoryConform>
-        <feature name="PDC"/>
-      </mandatoryConform>
-      <field id="0" name="KeyIdentifier" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="1" name="PossessionNonce" type="octstr">
-        <optionalConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-    </command>
-    <command id="0x0A" name="QueryIdentityResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <feature name="PDC"/>
-      </mandatoryConform>
-      <field id="0" name="Identity" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="1" name="PossessionSignature" type="octstr">
-        <optionalConform/>
-        <constraint type="maxLength" value="64"/>
-      </field>
-    </command>
   </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/NetworkIdentityManagement.xml b/data_model/in_progress/clusters/NetworkIdentityManagement.xml
deleted file mode 100644
index cef2f88f6ddad9..00000000000000
--- a/data_model/in_progress/clusters/NetworkIdentityManagement.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
-
-:xrefstyle: basic
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0450" name="Network Identity Management Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId id="0x0450" name="Network Identity Management"/>
-  </clusterIds>
-  <classification hierarchy="base" role="application" picsCode="NETIM" scope="Endpoint"/>
-  <dataTypes>
-    <number name="Client Table" type=""/>
-    <enum name="NetworkIdentityStatus">
-      <item value="2" name="INVALID_SIGNATURE" summary="The provided signature is invalid">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <struct name="ClientEndorsementStruct">
-      <field id="0" name="NodeID" type="node-id" default="null">
-        <access fabricSensitive="true"/>
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <access fabricScoped="true"/>
-    </struct>
-    <struct name="ClientStruct">
-      <field id="0" name="ClientNumber" type="uint16">
-        <mandatoryConform/>
-        <constraint type="between" from="1" to="2047"/>
-      </field>
-      <field id="1" name="ClientIdentifier" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="2" name="Endorsements" type="list">
-        <entry type="ClientEndorsementStruct"/>
-        <mandatoryConform/>
-        <constraint type="countBetween" from="1" to="SupportedFabrics"/>
-      </field>
-    </struct>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="NetworkIdentifier" type="octstr">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="20"/>
-    </attribute>
-    <attribute id="0x0001" name="NetworkIdentity" type="octstr" default="desc">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="140"/>
-    </attribute>
-    <attribute id="0x0002" name="Clients" type="list">
-      <entry type="ClientStruct"/>
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxCount" value="ClientTableSize"/>
-    </attribute>
-    <attribute id="0x0003" name="ClientTableSize" type="uint16" default="500">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="between" from="500" to="2047"/>
-    </attribute>
-  </attributes>
-  <commands>
-    <command id="0x00" name="AddOrUpdateClient" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-      <field id="0" name="ClientIdentity" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
-        <optionalConform/>
-      </field>
-    </command>
-    <command id="0x01" name="RemoveClient" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-      <field id="0" name="ClientNumber" type="uint16">
-        <optionalConform choice="a"/>
-      </field>
-      <field id="1" name="ClientIdentifier" type="octstr">
-        <optionalConform choice="a"/>
-        <constraint type="maxLength" value="20"/>
-      </field>
-    </command>
-    <command id="0x40" name="EndorseNetworkIdentityUpdate" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-      <field id="0" name="NetworkIdentifier" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="1" name="PreviousNetworkIdentifiers" type="list">
-        <entry type="octstr">
-          <constraint type="maxLength" value="20"/>
-        </entry>
-        <mandatoryConform/>
-        <constraint type="countBetween" from="1" to="3"/>
-      </field>
-      <field id="2" name="Signature" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="64"/>
-      </field>
-    </command>
-  </commands>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/ServiceArea.xml b/data_model/in_progress/clusters/ServiceArea.xml
deleted file mode 100644
index 6a54264a94928b..00000000000000
--- a/data_model/in_progress/clusters/ServiceArea.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0150" name="Service Area Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId id="0x0150" name="Service Area"/>
-  </clusterIds>
-  <classification hierarchy="base" role="application" picsCode="SEAR" scope="Endpoint"/>
-  <features>
-    <feature bit="0" code="SELRUN" name="SelectWhileRunning" summary="The device allows changing the selected areas while running">
-      <optionalConform/>
-    </feature>
-    <feature bit="1" code="PROG" name="ProgressReporting" summary="The device implements the progress reporting feature">
-      <optionalConform/>
-    </feature>
-    <feature bit="2" code="MAPS" name="Maps" summary="The device has map support">
-      <optionalConform/>
-    </feature>
-  </features>
-  <dataTypes>
-    <enum name="OperationalStatusEnum">
-      <item value="0x00" name="Pending" summary="The device has not yet started operating at the given area,
-                         or has not finished operating at that area but it is not currently
-                         operating at the area">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Operating" summary="The device is currently operating at the given area">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Skipped" summary="The device has skipped the given area, before or during operating at it,
-                         due to a SkipArea command, due an out of band command (e.g. from the vendor's application),
-                         due to a vendor specific reason, such as a time limit used by the device,
-                         or due the device ending operating unsuccessfully">
-        <mandatoryConform/>
-      </item>
-      <item value="0x03" name="Completed" summary="The device has completed operating at the given area">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <struct name="AreaInfoStruct">
-      <field id="0" name="LocationInfo" type="locationdesc">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="LandmarkInfo" type="LandmarkInfoStruct">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-    </struct>
-    <struct name="AreaStruct">
-      <field id="0" name="AreaID" type="uint32" default="MS">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="MapID" type="uint32" default="MS">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="2" name="AreaDesc" type="AreaInfoStruct" default="MS">
-        <mandatoryConform/>
-      </field>
-    </struct>
-    <struct name="LandmarkInfoStruct">
-      <field id="0" name="LandmarkTag" type="tag">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="PositionTag" type="tag">
-        <quality nullable="true"/>
-        <mandatoryConform/>
-      </field>
-    </struct>
-    <struct name="MapStruct">
-      <field id="0" name="MapID" type="uint32" default="MS">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Name" type="string" default="MS">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="64"/>
-      </field>
-    </struct>
-    <struct name="ProgressStruct">
-      <field id="0" name="AreaID" type="uint32" default="MS">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="Status" type="OperationalStatusEnum" default="MS">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="TotalOperationalTime" type="elapsed-s" default="MS">
-        <quality nullable="true"/>
-        <optionalConform/>
-      </field>
-      <field id="3" name="InitialTimeEstimate" type="elapsed-s" default="MS">
-        <quality nullable="true"/>
-        <optionalConform/>
-      </field>
-    </struct>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="SupportedAreas" type="list" default="MS">
-      <entry type="AreaStruct"/>
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform/>
-      <constraint type="maxCount" value="255"/>
-    </attribute>
-    <attribute id="0x0001" name="SupportedMaps" type="list" default="MS">
-      <entry type="MapStruct"/>
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="MAPS"/>
-      </mandatoryConform>
-      <constraint type="maxCount" value="255"/>
-    </attribute>
-    <attribute id="0x0002" name="SelectedAreas" type="list" default="empty">
-      <entry type="uint32"/>
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform/>
-      <constraint type="desc"/>
-    </attribute>
-    <attribute id="0x0003" name="CurrentArea" type="uint32" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <constraint type="desc"/>
-    </attribute>
-    <attribute id="0x0004" name="EstimatedEndTime" type="epoch-s" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
-      <optionalConform>
-        <attribute name="CurrentArea"/>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0005" name="Progress" type="list" default="empty">
-      <entry type="ProgressStruct"/>
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="PROG"/>
-      </mandatoryConform>
-      <constraint type="maxCount" value="255"/>
-    </attribute>
-  </attributes>
-  <commands>
-    <command id="0x00" name="SelectAreas" direction="commandToServer" response="SelectAreasResponse">
-      <access invokePrivilege="operate"/>
-      <mandatoryConform/>
-      <field id="0" name="NewAreas" type="list">
-        <entry type="uint32"/>
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </command>
-    <command id="0x01" name="SelectAreasResponse" direction="responseFromServer">
-      <mandatoryConform/>
-      <field id="0" name="Status" type="SelectAreasStatus">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="StatusText" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="256"/>
-      </field>
-    </command>
-    <command id="0x02" name="SkipArea" direction="commandToServer" response="SkipAreaResponse">
-      <access invokePrivilege="operate"/>
-      <field id="0" name="SkippedArea" type="uint32">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </command>
-    <command id="0x03" name="SkipAreaResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <command name="SkipArea"/>
-      </mandatoryConform>
-      <field id="0" name="Status" type="SkipAreaStatus">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="1" name="StatusText" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="256"/>
-      </field>
-    </command>
-  </commands>
-</cluster>
\ No newline at end of file
diff --git a/data_model/in_progress/clusters/cluster_ids.json b/data_model/in_progress/clusters/cluster_ids.json
index 5896dc1a366f73..0ff45e8f9db637 100644
--- a/data_model/in_progress/clusters/cluster_ids.json
+++ b/data_model/in_progress/clusters/cluster_ids.json
@@ -64,7 +64,6 @@
     "144": "Electrical Power Measurement",
     "145": "Electrical Energy Measurement",
     "148": "Water Heater Management",
-    "149": "Energy Price",
     "150": "Demand Response Load Control",
     "151": "Messages",
     "152": "Device Energy Management",
@@ -77,7 +76,6 @@
     "159": "Device Energy Management Mode",
     "257": "Door Lock",
     "258": "Window Covering",
-    "336": "Service Area",
     "512": "Pump Configuration and Control",
     "513": "Thermostat",
     "514": "Fan Control",
@@ -101,7 +99,6 @@
     "1069": "PM10 Concentration Measurement",
     "1070": "Total Volatile Organic Compounds Concentration Measurement",
     "1071": "Radon Concentration Measurement",
-    "1104": "Network Identity Management",
     "1105": "Wi-Fi Network Management",
     "1106": "Thread Border Router Management",
     "1107": "Thread Network Directory",
@@ -120,6 +117,5 @@
     "1295": "Content Control",
     "1296": "Content App Observer",
     "1872": "Ecosystem Information",
-    "1873": "Commissioner Control",
-    "2822": "Meter Identification"
+    "1873": "Commissioner Control"
 }
diff --git a/data_model/in_progress/device_types/BatteryStorage.xml b/data_model/in_progress/device_types/BatteryStorage.xml
deleted file mode 100644
index 5f09eeb1d2dac9..00000000000000
--- a/data_model/in_progress/device_types/BatteryStorage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance +
-508 Second Street, Suite 206 +
-Davis, CA 95616, USA
--->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0018" name="Battery Storage" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <classification class="simple" scope="endpoint"/>
-  <conditions/>
-  <clusters>
-    <cluster id="0x0003" name="Identify" side="server">
-      <optionalConform/>
-    </cluster>
-  </clusters>
-</deviceType>
\ No newline at end of file
diff --git a/data_model/in_progress/device_types/HeatPump.xml b/data_model/in_progress/device_types/HeatPump.xml
deleted file mode 100644
index 61f556c6ed2a9b..00000000000000
--- a/data_model/in_progress/device_types/HeatPump.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance +
-508 Second Street, Suite 206 +
-Davis, CA 95616, USA
--->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0309" name="Heat Pump" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <classification class="simple" scope="endpoint"/>
-  <conditions/>
-  <clusters>
-    <cluster id="0x0003" name="Identify" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0301" name="Thermostat" side="client">
-      <optionalConform/>
-    </cluster>
-  </clusters>
-</deviceType>
\ No newline at end of file
diff --git a/data_model/in_progress/device_types/JointFabricAdmin.xml b/data_model/in_progress/device_types/JointFabricAdmin.xml
deleted file mode 100644
index 7d29cbba1305d5..00000000000000
--- a/data_model/in_progress/device_types/JointFabricAdmin.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2024). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
--->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Joint Fabric Administrator" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial revision"/>
-  </revisionHistory>
-  <classification class="utility" scope="endpoint"/>
-  <clusters>
-    <cluster id="" name="Joint Fabric Datastore" side="server">
-      <mandatoryConform/>
-    </cluster>
-    <cluster id="" name="Joint Fabric PKI" side="server">
-      <mandatoryConform/>
-    </cluster>
-  </clusters>
-</deviceType>
\ No newline at end of file