diff --git a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
index af13619a85365c..25e0edc034a855 100644
--- a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
+++ b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
@@ -26,10 +26,7 @@ using namespace chip::app::Clusters::ThermostatUserInterfaceConfiguration;
 using chip::Protocols::InteractionModel::Status;
 
 namespace {
-//
-// Those types are defined as drafts in
-// src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml
-//
+
 enum class TemperatureDisplayMode : uint8_t
 {
     kCelsius    = 0x0,
diff --git a/src/app/zap-templates/zcl/data-model/draft/EN50523-appliance-identification.xml b/src/app/zap-templates/zcl/data-model/draft/EN50523-appliance-identification.xml
deleted file mode 100644
index 3e18ec7343171b..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/EN50523-appliance-identification.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="ProductTypeId" type="enum16">
-    <item name="WhiteGoods" value="0x0000"/>
-    <item name="Dishwasher" value="0x5601"/>
-    <item name="TumbleDryer" value="0x5602"/>
-    <item name="WasherDryer" value="0x5603"/>
-    <item name="WashingMachine" value="0x5604"/>
-    <item name="Hobs" value="0x5E03"/>
-    <item name="InductionHobs" value="0x5E09"/>
-    <item name="Oven" value="0x5E01"/>
-    <item name="ElectricalOven" value="0x5E06"/>
-    <item name="RefrigeratorFreezer" value="0x6601"/>
-  </enum>
-
-  <enum name="CecedSpecificationVersion" type="enum8">
-    <item name="CompliantWithV10NotCertified" value="0x10"/>
-    <item name="CompliantWithV10Certified" value="0x1A"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/meter-identification.xml b/src/app/zap-templates/zcl/data-model/draft/meter-identification.xml
deleted file mode 100644
index 7cd304194793e0..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/meter-identification.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="MeterTypeId" type="enum16">
-    <item name="UtilityPrimaryMeter" value="0x0000"/>
-    <item name="UtilityProductionMeter" value="0x0001"/>
-    <item name="UtilitySecondaryMeter" value="0x0002"/>
-    <item name="PrivatePrimaryMeter" value="0x0100"/>
-    <item name="PrivateProductionMeter" value="0x0101"/>
-    <item name="PrivateSecondaryMeters" value="0x0102"/>
-    <item name="GenericMeter" value="0x0110"/>
-  </enum>
-
-  <enum name="DataQualityId" type="enum16">
-    <item name="AllDataCertified" value="0x0000"/>
-    <item name="OnlyInstantaneousPowerNotCertified" value="0x0001"/>
-    <item name="OnlyCumulatedConsumptionNotCertified" value="0x0002"/>
-    <item name="NotCertifiedData" value="0x0003"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml b/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml
deleted file mode 100644
index c31350d60223e9..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/ballast-configuration.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <bitmap name="BallastStatus" type="bitmap8">
-    <field name="NonOperational" mask="0x1"/>
-    <field name="LampNotInSocket" mask="0x2"/>
-  </bitmap>
-
-  <bitmap name="LampAlarmMode" type="bitmap8">
-    <field name="lampBurnHours" mask="0x1"/>
-  </bitmap>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/dehumidification-control.xml b/src/app/zap-templates/zcl/data-model/draft/types/dehumidification-control.xml
deleted file mode 100644
index 2f5d6b5d960963..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/dehumidification-control.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="RelativeHumidityMode" type="enum8">
-    <item name="measureLocally" value="0x0"/>
-    <item name="updatedOverTheNetwork" value="0x1"/>
-  </enum>
-
-  <enum name="DehumidifcationLockout" type="enum8">
-    <item name="notAllowed" value="0x0"/>
-    <item name="allowed" value="0x1"/>
-  </enum>
-
-  <enum name="RelativeHumidityDisplay" type="enum8">
-    <item name="notDisplayed" value="0x0"/>
-    <item name="displayed" value="0x1"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml b/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml
deleted file mode 100644
index f54aa998c937e0..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="DoorLockState" type="enum8">
-    <item name="NotFullyLocked" value="0x00"/>
-    <item name="Locked" value="0x01"/>
-    <item name="Unlocked" value="0x02"/>
-  </enum>
-
-  <enum name="DoorLockSoundVolume" type="enum8">
-    <item name="Silent" value="0x00"/>
-    <item name="Low" value="0x01"/>
-    <item name="High" value="0x02"/>
-  </enum>
-
-  <enum name="DoorLockType" type="enum8">
-    <item name="DeadBolt" value="0x00"/>
-    <item name="Magnetic" value="0x01"/>
-    <item name="Mortise" value="0x02"/>
-    <item name="Rim" value="0x03"/>
-    <item name="LatchBolt" value="0x04"/>
-    <item name="Cylindrical" value="0x05"/>
-    <item name="Tubular" value="0x06"/>
-    <item name="Interconnected" value="0x07"/>
-    <item name="DeadLatch" value="0x08"/>
-    <item name="Other" value="0x09"/>
-  </enum>
-
-  <enum name="DoorState" type="enum8">
-    <item name="Open" value="0x00"/>
-    <item name="Closed" value="0x01"/>
-    <item name="ErrorJammed" value="0x02"/>
-    <item name="ErrorForcedOpen" value="0x03"/>
-    <item name="ErrorUnspecified" value="0x04"/>
-  </enum>
-
-  <enum name="DoorLockOperatingMode" type="enum8">
-    <item name="NormalMode" value="0x00"/>
-    <item name="VacationMode" value="0x01"/>
-    <item name="PrivacyMode" value="0x02"/>
-    <item name="NoRfLockOrUnlock" value="0x03"/>
-    <item name="LocalProgrammingMode" value="0x04"/>
-    <item name="PassageMode" value="0x05"/>
-  </enum>
-
-  <enum name="DoorLockSecurityLevel" type="enum8">
-    <item name="NetworkSecurity" value="0x00"/>
-    <item name="ApsSecurity" value="0x01"/>
-  </enum>
-
-  <enum name="DoorLockEventType" type="enum8">
-    <item name="Operation" value="0x00"/>
-    <item name="Programming" value="0x01"/>
-    <item name="Alarm" value="0x02"/>
-  </enum>
-
-  <enum name="DoorLockEventSource" type="enum8">
-    <item name="Keypad" value="0x00"/>
-    <item name="Rf" value="0x01"/>
-    <item name="Manual" value="0x02"/>
-    <item name="Rfid" value="0x03"/>
-    <item name="Indeterminate" value="0xFF"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/illuminance-level-sensing.xml b/src/app/zap-templates/zcl/data-model/draft/types/illuminance-level-sensing.xml
deleted file mode 100644
index 04eedca71a1038..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/illuminance-level-sensing.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="LevelStatus" type="enum8">
-    <item name="OnTarget" value="0x0"/>
-    <item name="BelowTarget" value="0x1"/>
-    <item name="AboveTarget" value="0x2"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/onoff-switch-configuration.xml b/src/app/zap-templates/zcl/data-model/draft/types/onoff-switch-configuration.xml
deleted file mode 100644
index 6e696a6bfb5bc2..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/onoff-switch-configuration.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="SwitchType" type="enum8">
-    <item name="Toggle" value="0x00"/>
-    <item name="Momentary" value="0x01"/>
-    <item name="MultiFunction" value="0x02" introducedIn="ha-1.2-05-3520-29"/>
-  </enum>
-
-  <enum name="SwitchActions" type="enum8">
-    <item name="On" value="0x0"/>
-    <item name="Off" value="0x1"/>
-    <item name="Toggle" value="0x2"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/power-profile.xml b/src/app/zap-templates/zcl/data-model/draft/types/power-profile.xml
deleted file mode 100644
index 5e68d974fa182e..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/power-profile.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="LevelStatus" type="enum8">
-  <enum name="PowerProfileState" type="enum8">
-    <item name="PowerProfileWaitingToStart" value="0x01"/>
-    <item name="PowerProfileStarted" value="0x02"/>
-    <item name="EnergyPhaseRunning" value="0x03"/>
-    <item name="EnergyPhaseEnded" value="0x04"/>
-    <item name="EnergyPhaseWaitingToStart" value="0x05"/>
-    <item name="EnergyPhaseStarted" value="0x06"/>
-    <item name="PowerProfileEnded" value="0x07"/>
-    <item name="ProfileReadyForScheduling" value="0x08"/>
-    <item name="PowerProfileScheduled" value="0x09"/>
-  </enum>
-
-  <bitmap name="EnergyFormatting" type="bitmap8">
-    <field name="NumberOfDigitsToTheRightOfTheDecimalPoint" mask="0x07"/>
-    <field name="NumberOfDigitsToTheLeftOfTheDecimalPoint" mask="0x78"/>
-    <field name="SuppressLeadingZeros" mask="0x80"/>
-  </bitmap>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml b/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml
deleted file mode 100644
index 060490580fb268..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/thermostat-user-interface-configuration.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <enum name="TemperatureDisplayMode" type="enum8">
-    <item name="celsius" value="0x0"/>
-    <item name="fahrenheit" value="0x1"/>
-  </enum>
-
-  <enum name="KeypadLockout" type="enum8">
-    <item name="noLockout" value="0x0"/>
-    <item name="levelOneLockout" value="0x1"/>
-    <item name="levelTwoLockout" value="0x2"/>
-    <item name="levelThreeLockout" value="0x3"/>
-    <item name="levelFourLockout" value="0x4"/>
-    <item name="levelfiveLockout" value="0x5"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml b/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml
deleted file mode 100644
index 9264e13176db0d..00000000000000
--- a/src/app/zap-templates/zcl/data-model/draft/types/thermostat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2023 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configurator>
-  <bitmap name="ThermostatOccupancy" type="bitmap8">
-    <field name="occupied" mask="0x1"/>
-  </bitmap>
-
-  <bitmap name="ThermostatSensing" type="bitmap8">
-    <field name="localTempSensedRemotely" mask="0x1"/>
-    <field name="outdoorTempSensedRemotely" mask="0x2"/>
-    <field name="occupancySensedRemotely" mask="0x4"/>
-  </bitmap>
-
-  <bitmap name="ThermostatAlarmMask" type="bitmap8">
-    <field name="initializationFailure" mask="0x1"/>
-    <field name="hardwareFailure" mask="0x2"/>
-    <field name="selfcalibrationFailure" mask="0x4"/>
-  </bitmap>
-
-  <bitmap name="ThermostatRunningState" type="bitmap16">
-    <field name="HeatStateOn" mask="0x0001"/>
-    <field name="CoolStateOn" mask="0x0002"/>
-    <field name="FanStateOn" mask="0x0004"/>
-    <field name="HeatSecondStageStateOn" mask="0x0008"/>
-    <field name="CoolSecondStageStateOn" mask="0x0010"/>
-    <field name="FanSecondStageStateOn" mask="0x0020"/>
-    <field name="FanThirdStageStateOn" mask="0x0040"/>
-  </bitmap>
-</configurator>