diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 051cbb43bc2e7f..0b097380222275 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3944,95 +3944,6 @@ provisional cluster ElectricalEnergyMeasurement = 145 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** This cluster provides an interface for passing messages to be presented by a device. */
-provisional cluster Messages = 151 {
-  revision 1;
-
-  enum FutureMessagePreferenceEnum : enum8 {
-    kAllowed = 0;
-    kIncreased = 1;
-    kReduced = 2;
-    kDisallowed = 3;
-    kBanned = 4;
-  }
-
-  enum MessagePriorityEnum : enum8 {
-    kLow = 0;
-    kMedium = 1;
-    kHigh = 2;
-    kCritical = 3;
-  }
-
-  bitmap Feature : bitmap32 {
-    kReceivedConfirmation = 0x1;
-    kConfirmationResponse = 0x2;
-    kConfirmationReply = 0x3;
-    kProtectedMessages = 0x4;
-  }
-
-  bitmap MessageControlBitmap : bitmap32 {
-    kConfirmationRequired = 0x1;
-    kResponseRequired = 0x2;
-    kReplyMessage = 0x3;
-    kMessageConfirmed = 0x4;
-    kMessageProtected = 0x5;
-  }
-
-  struct MessageResponseOptionStruct {
-    int32u messageResponseID = 0;
-    char_string<32> label = 1;
-  }
-
-  fabric_scoped struct MessageStruct {
-    octet_string<16> messageID = 0;
-    MessagePriorityEnum priority = 1;
-    MessageControlBitmap messageControl = 2;
-    nullable epoch_s startTime = 3;
-    nullable int16u duration = 4;
-    char_string<256> messageText = 5;
-    optional MessageResponseOptionStruct responses[] = 6;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event MessageQueued = 0 {
-    octet_string messageID = 0;
-  }
-
-  info event MessagePresented = 1 {
-    octet_string messageID = 0;
-  }
-
-  info event MessageComplete = 2 {
-    octet_string messageID = 0;
-    epoch_s timestamp = 2;
-    nullable int32u responseID = 3;
-    nullable long_char_string reply = 4;
-    nullable FutureMessagePreferenceEnum futureMessagesPref = 5;
-  }
-
-  readonly attribute MessageStruct messages[] = 0;
-  readonly attribute octet_string activeMessageIDs[] = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct PresentMessagesRequestRequest {
-    octet_string messages[] = 0;
-  }
-
-  request struct CancelMessagesRequestRequest {
-    octet_string messages[] = 0;
-  }
-
-  /** Command for requesting messages be presented */
-  command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0;
-  /** Command for cancelling message present requests */
-  command CancelMessagesRequest(CancelMessagesRequestRequest): DefaultSuccess = 1;
-}
-
 /** This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA). */
 provisional cluster DeviceEnergyManagement = 152 {
   revision 3;
@@ -8193,17 +8104,6 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster Messages {
-    callback attribute messages;
-    callback attribute activeMessageIDs;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute eventList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster DeviceEnergyManagement {
     emits event PowerAdjustStart;
     emits event PowerAdjustEnd;
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index 7d4f5f88206f2e..c9c353ddea89ca 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -20758,145 +20758,6 @@
             }
           ]
         },
-        {
-          "name": "Messages",
-          "code": 151,
-          "mfgCode": null,
-          "define": "MESSAGES_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "apiMaturity": "provisional",
-          "attributes": [
-            {
-              "name": "Messages",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "MessageStruct",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActiveMessageIDs",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "octet_string",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Electrical Measurement",
           "code": 2820,