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
new file mode 100644
index 00000000000000..746b435e7b6c85
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/EN50523-appliance-identification.xml
@@ -0,0 +1,34 @@
+<!--
+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
new file mode 100644
index 00000000000000..c1fdaf03b0bbf5
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/meter-identification.xml
@@ -0,0 +1,33 @@
+<!--
+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/dehumidification-control.xml b/src/app/zap-templates/zcl/data-model/draft/types/dehumidification-control.xml
new file mode 100644
index 00000000000000..f6923851a0aa92
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/dehumidification-control.xml
@@ -0,0 +1,31 @@
+<!--
+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/illuminance-level-sensing.xml b/src/app/zap-templates/zcl/data-model/draft/types/illuminance-level-sensing.xml
new file mode 100644
index 00000000000000..5b578ecd0d35a3
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/illuminance-level-sensing.xml
@@ -0,0 +1,22 @@
+<!--
+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
new file mode 100644
index 00000000000000..7d45f79392cc61
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/onoff-switch-configuration.xml
@@ -0,0 +1,28 @@
+<!--
+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
new file mode 100644
index 00000000000000..58f0de68d018ff
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/draft/types/power-profile.xml
@@ -0,0 +1,35 @@
+<!--
+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/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
index f9bd26ee5fce10..2ba27133278bcd 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
@@ -15,107 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
-  <bitmap name="ShadeClosureStatus" type="BITMAP8">
-    <field name="operational" mask="0x1"/>
-    <field name="adjusting" mask="0x2"/>
-    <field name="opening" mask="0x4"/>
-    <field name="motorOpening" mask="0x8"/>
-  </bitmap>
-  <bitmap name="MainsAlarmMask" type="BITMAP8">
-    <field name="VoltageTooLow" mask="0x1"/>
-    <field name="VoltageTooHigh" mask="0x2"/>
-    <field name="MainsPowerSupplyLost" mask="0x4"/>
-  </bitmap>
-  <bitmap name="BatteryAlarmMask" type="BITMAP8">
-    <field name="VoltageTooLow" mask="0x1"/>
-  </bitmap>
-  <bitmap name="DeviceTempAlarmMask" type="BITMAP8">
-    <field name="TooLow" mask="0x1"/>
-    <field name="TooHigh" mask="0x2"/>
-  </bitmap>
-  <bitmap name="TimeStatusMask" type="BITMAP8">
-    <field name="MasterClock" mask="0x1"/>
-    <field name="Synchronized" mask="0x2"/>
-    <field name="MasterZoneDst" mask="0x4"/>
-    <field name="Superseding" mask="0x8"/>
-  </bitmap>
   <enum name="OperatingMode" type="ENUM8">
     <item name="normal" value="0x0"/>
     <item name="configure" value="0x1"/>
   </enum>
-  <enum name="BatterySize" type="ENUM8">
-    <item name="NoBattery" value="0x0"/>
-    <item name="BuiltIn" value="0x1"/>
-    <item name="Other" value="0x2"/>
-    <item name="AA" value="0x3"/>
-    <item name="AAA" value="0x4"/>
-    <item name="C" value="0x5"/>
-    <item name="D" value="0x6"/>
-    <item name="Unknown" value="0xff"/>
-  </enum>
-  <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>
-  <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>
-  <enum name="LevelStatus" type="ENUM8">
-    <item name="OnTarget" value="0x0"/>
-    <item name="BelowTarget" value="0x1"/>
-    <item name="AboveTarget" value="0x2"/>
-  </enum>
-  <enum name="WarningMode" type="ENUM8">
-    <item name="stop" value="0x0"/>
-    <item name="burglar" value="0x1"/>
-    <item name="fire" value="0x2"/>
-    <item name="emergency" value="0x3"/>
-    <item name="policePanic" value="0x4"/>
-    <item name="firePanic" value="0x5"/>
-    <item name="emergencyPanic" value="0x6"/>
-  </enum>
-  <enum name="WarningStobe" type="ENUM8">
-    <item name="noStrobe" value="0x0"/>
-    <item name="useStrobe" value="0x1"/>
-  </enum>
-  <enum name="SquawkMode" type="ENUM8">
-    <item name="systemIsArmed" value="0x0"/>
-    <item name="systemIsDisarmed" value="0x1"/>
-  </enum>
-  <enum name="SquawkStobe" type="ENUM8">
-    <item name="noStrobe" value="0x0"/>
-    <item name="useStrobe" value="0x1"/>
-  </enum>
-  <enum name="SquawkLevel" type="ENUM8">
-    <item name="lowLevel" value="0x0"/>
-    <item name="mediumLevel" value="0x1"/>
-    <item name="highLevel" value="0x2"/>
-    <item name="veryHighLevel" value="0x2"/>
-  </enum>
-  <enum name="AmiRegistrationState" type="ENUM8">
-    <item name="Unregistered" value="0x0"/>
-    <item name="JoiningNetwork" value="0x1"/>
-    <item name="JoinedNetwork" value="0x2"/>
-    <item name="SubmittedRegistrationRequest" value="0x3"/>
-    <item name="RegistrationRejected" value="0x4"/>
-    <item name="Registered" value="0x5"/>
-    <item name="RegistrationNotPossible" value="0x6"/>
-  </enum>
   <enum name="AnonymousDataState" type="ENUM8">
     <item name="NoSourceFound" value="0x0"/>
     <item name="SourceFound" value="0x1"/>
@@ -133,22 +36,6 @@ limitations under the License.
     <item name="contentId" type="INT16U"/>
     <item name="statusFeedback" type="ENUM8"/>
   </struct>
-  <bitmap name="EnergyFormatting" type="BITMAP8">
-    <field name="NumberOfDigitsToTheRightOfTheDecimalPoint" mask="0x07"/>
-    <field name="NumberOfDigitsToTheLeftOfTheDecimalPoint" mask="0x78"/>
-    <field name="SuppressLeadingZeros" mask="0x80"/>
-  </bitmap>
-  <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>
   <enum name="RemoteEnableFlags" type="ENUM8">
     <item name="Disabled" value="0x00"/>
     <item name="TemporarilyLockedDisabled" value="0x07"/>
@@ -167,35 +54,4 @@ limitations under the License.
     <item name="Relative" value="0x00"/>
     <item name="Absolute" value="0x40"/>
   </enum>
-  <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>
-  <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/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index d76f9ff69bdd32..2e20556e1826d9 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -328,8 +328,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_BARRIER_CONTROL_SAFETY_STATUS_FAILED_COMMUNICATION_OFFSET (2)
 #define EMBER_AF_BARRIER_CONTROL_SAFETY_STATUS_POSITION_FAILURE (8)
 #define EMBER_AF_BARRIER_CONTROL_SAFETY_STATUS_POSITION_FAILURE_OFFSET (3)
-#define EMBER_AF_BATTERY_ALARM_MASK_VOLTAGE_TOO_LOW (1)
-#define EMBER_AF_BATTERY_ALARM_MASK_VOLTAGE_TOO_LOW_OFFSET (0)
 #define EMBER_AF_BITMAP16_MASK_MAP_MASK_VAL1 (1)
 #define EMBER_AF_BITMAP16_MASK_MAP_MASK_VAL1_OFFSET (0)
 #define EMBER_AF_BITMAP16_MASK_MAP_MASK_VAL2 (2)
@@ -466,10 +464,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DAYS_MASK_MAP_FRIDAY_OFFSET (5)
 #define EMBER_AF_DAYS_MASK_MAP_SATURDAY (64)
 #define EMBER_AF_DAYS_MASK_MAP_SATURDAY_OFFSET (6)
-#define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW (1)
-#define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW_OFFSET (0)
-#define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH (2)
-#define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH_OFFSET (1)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_SINGLE (1)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_SINGLE_OFFSET (0)
 #define EMBER_AF_DL_CREDENTIAL_RULE_MASK_DUAL (2)
@@ -646,12 +640,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_ACCESS_SCHEDULES_OFFSET (10)
 #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES (2048)
 #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES_OFFSET (11)
-#define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_RIGHT_OF_THE_DECIMAL_POINT (7)
-#define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_RIGHT_OF_THE_DECIMAL_POINT_OFFSET (0)
-#define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_LEFT_OF_THE_DECIMAL_POINT (120)
-#define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_LEFT_OF_THE_DECIMAL_POINT_OFFSET (3)
-#define EMBER_AF_ENERGY_FORMATTING_SUPPRESS_LEADING_ZEROS (128)
-#define EMBER_AF_ENERGY_FORMATTING_SUPPRESS_LEADING_ZEROS_OFFSET (7)
 #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS (1)
 #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS_OFFSET (0)
 #define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_FEATURE_ERROR_COUNTS (2)
@@ -692,12 +680,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF_OFFSET (0)
 #define EMBER_AF_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL (2)
 #define EMBER_AF_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL_OFFSET (1)
-#define EMBER_AF_MAINS_ALARM_MASK_VOLTAGE_TOO_LOW (1)
-#define EMBER_AF_MAINS_ALARM_MASK_VOLTAGE_TOO_LOW_OFFSET (0)
-#define EMBER_AF_MAINS_ALARM_MASK_VOLTAGE_TOO_HIGH (2)
-#define EMBER_AF_MAINS_ALARM_MASK_VOLTAGE_TOO_HIGH_OFFSET (1)
-#define EMBER_AF_MAINS_ALARM_MASK_MAINS_POWER_SUPPLY_LOST (4)
-#define EMBER_AF_MAINS_ALARM_MASK_MAINS_POWER_SUPPLY_LOST_OFFSET (2)
 #define EMBER_AF_MEDIA_INPUT_FEATURE_NAME_UPDATES (1)
 #define EMBER_AF_MEDIA_INPUT_FEATURE_NAME_UPDATES_OFFSET (0)
 #define EMBER_AF_MEDIA_PLAYBACK_FEATURE_ADVANCED_SEEK (1)
@@ -818,14 +800,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_SCENE_FEATURES_SCENE_NAMES_OFFSET (0)
 #define EMBER_AF_SCENES_COPY_MODE_COPY_ALL_SCENES (1)
 #define EMBER_AF_SCENES_COPY_MODE_COPY_ALL_SCENES_OFFSET (0)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_OPERATIONAL (1)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_OPERATIONAL_OFFSET (0)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_ADJUSTING (2)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_ADJUSTING_OFFSET (1)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_OPENING (4)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_OPENING_OFFSET (2)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_MOTOR_OPENING (8)
-#define EMBER_AF_SHADE_CLOSURE_STATUS_MOTOR_OPENING_OFFSET (3)
 #define EMBER_AF_SIMPLE_BITMAP_VALUE_A (1)
 #define EMBER_AF_SIMPLE_BITMAP_VALUE_A_OFFSET (0)
 #define EMBER_AF_SIMPLE_BITMAP_VALUE_B (2)
@@ -874,14 +848,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_MLE_COUNTS_OFFSET (2)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_MAC_COUNTS (8)
 #define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_FEATURE_MAC_COUNTS_OFFSET (3)
-#define EMBER_AF_TIME_STATUS_MASK_MASTER_CLOCK (1)
-#define EMBER_AF_TIME_STATUS_MASK_MASTER_CLOCK_OFFSET (0)
-#define EMBER_AF_TIME_STATUS_MASK_SYNCHRONIZED (2)
-#define EMBER_AF_TIME_STATUS_MASK_SYNCHRONIZED_OFFSET (1)
-#define EMBER_AF_TIME_STATUS_MASK_MASTER_ZONE_DST (4)
-#define EMBER_AF_TIME_STATUS_MASK_MASTER_ZONE_DST_OFFSET (2)
-#define EMBER_AF_TIME_STATUS_MASK_SUPERSEDING (8)
-#define EMBER_AF_TIME_STATUS_MASK_SUPERSEDING_OFFSET (3)
 #define EMBER_AF_UNIT_LOCALIZATION_FEATURE_TEMPERATURE_UNIT (1)
 #define EMBER_AF_UNIT_LOCALIZATION_FEATURE_TEMPERATURE_UNIT_OFFSET (0)
 #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS (1)