diff --git a/src/app/util/af-event.cpp b/src/app/util/af-event.cpp
index 2a4ae5e1eb27d7..6e381149c083b8 100644
--- a/src/app/util/af-event.cpp
+++ b/src/app/util/af-event.cpp
@@ -180,17 +180,6 @@ EmberStatus emberAfScheduleClusterTick(EndpointId endpoint, ClusterId clusterId,
                                        (sleepControl == EMBER_AF_STAY_AWAKE ? EMBER_AF_STAY_AWAKE : EMBER_AF_OK_TO_SLEEP));
 }
 
-EmberStatus emberAfScheduleClientTickExtended(EndpointId endpoint, ClusterId clusterId, uint32_t delayMs,
-                                              EmberAfEventPollControl pollControl, EmberAfEventSleepControl sleepControl)
-{
-    return emberAfScheduleTickExtended(endpoint, clusterId, EMBER_AF_CLIENT_CLUSTER_TICK, delayMs, pollControl, sleepControl);
-}
-
-EmberStatus emberAfScheduleClientTick(EndpointId endpoint, ClusterId clusterId, uint32_t delayMs)
-{
-    return emberAfScheduleClientTickExtended(endpoint, clusterId, delayMs, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP);
-}
-
 EmberStatus emberAfScheduleServerTickExtended(EndpointId endpoint, ClusterId clusterId, uint32_t delayMs,
                                               EmberAfEventPollControl pollControl, EmberAfEventSleepControl sleepControl)
 {
@@ -213,11 +202,6 @@ EmberStatus emberAfDeactivateClusterTick(EndpointId endpoint, ClusterId clusterI
     return EMBER_BAD_ARGUMENT;
 }
 
-EmberStatus emberAfDeactivateClientTick(EndpointId endpoint, ClusterId clusterId)
-{
-    return emberAfDeactivateClusterTick(endpoint, clusterId, EMBER_AF_CLIENT_CLUSTER_TICK);
-}
-
 EmberStatus emberAfDeactivateServerTick(EndpointId endpoint, ClusterId clusterId)
 {
     return emberAfDeactivateClusterTick(endpoint, clusterId, EMBER_AF_SERVER_CLUSTER_TICK);
diff --git a/src/app/util/af.h b/src/app/util/af.h
index 04c8f08492444f..043c5e80ebe5bb 100644
--- a/src/app/util/af.h
+++ b/src/app/util/af.h
@@ -61,15 +61,6 @@ static constexpr uint16_t kEmberInvalidEndpointIndex = 0xFFFF;
  */
 const EmberAfAttributeMetadata * emberAfLocateAttributeMetadata(chip::EndpointId endpoint, chip::ClusterId clusterId,
                                                                 chip::AttributeId attributeId);
-
-/**
- * @brief Returns true if endpoint contains the ZCL cluster with specified id.
- *
- * This function returns true regardless of whether
- * the endpoint contains server, client or both in the Zigbee cluster Library.
- */
-bool emberAfContainsCluster(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
 /**
  * @brief Returns true if endpoint contains the ZCL server with specified id.
  *
@@ -89,14 +80,6 @@ bool emberAfContainsServer(chip::EndpointId endpoint, chip::ClusterId clusterId)
  */
 bool emberAfContainsServerFromIndex(uint16_t index, chip::ClusterId clusterId);
 
-/**
- * @brief Returns true if endpoint contains the ZCL client with specified id.
- *
- * This function returns true if
- * the endpoint contains client of a given cluster.
- */
-bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
 /**
  * @brief write an attribute, performing all the checks.
  *
@@ -120,22 +103,6 @@ EmberAfStatus emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId c
 // TODO: Remove this define.
 #define emberAfWriteServerAttribute emberAfWriteAttribute
 
-/**
- * @brief Function that test the success of attribute write.
- *
- * This function returns success if attribute write would be successful.
- * It does not actually write anything, just validates for read-only and
- * data-type.
- *
- * @param endpoint Zigbee endpoint number
- * @param cluster Cluster ID of the sought cluster.
- * @param attributeID Attribute ID of the sought attribute.
- * @param dataPtr Location where attribute will be written from.
- * @param dataType ZCL attribute type.
- */
-EmberAfStatus emberAfVerifyAttributeWrite(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID,
-                                          uint8_t * dataPtr, EmberAfAttributeType dataType);
-
 /**
  * @brief Read the attribute value, performing all the checks.
  *
@@ -216,12 +183,6 @@ uint16_t emberAfIndexFromEndpoint(chip::EndpointId endpoint);
  */
 uint16_t emberAfIndexFromEndpointIncludingDisabledEndpoints(chip::EndpointId endpoint);
 
-/**
- * Returns the endpoint index within a given cluster (Client-side),
- * looking only for standard clusters.
- */
-uint16_t emberAfFindClusterClientEndpointIndex(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
 /**
  * Returns the endpoint index within a given cluster (Server-side),
  * looking only for standard clusters.
@@ -291,11 +252,6 @@ uint8_t * emberAfGetString(uint8_t * message, uint16_t currentIndex, uint16_t ms
  * @brief Function that extracts a ZCL long string from the message buffer
  */
 uint8_t * emberAfGetLongString(uint8_t * message, uint16_t currentIndex, uint16_t msgLen);
-/*
- * @brief Function that extracts a ZCL Date from the message buffer and returns it
- * in the given destination. Returns the number of bytes copied.
- */
-uint8_t emberAfGetDate(uint8_t * message, uint16_t currentIndex, uint16_t msgLen, EmberAfDate * destination);
 
 /**
  * @brief Macro for consistency, that extracts single byte out of the message
@@ -332,30 +288,11 @@ void emberAfCopyString(uint8_t * dest, const uint8_t * src, size_t size);
  */
 void emberAfCopyLongString(uint8_t * dest, const uint8_t * src, size_t size);
 
-/*
- * @brief Function that determines the size of a zigbee Cluster Library
- * attribute value (where the attribute could be non-string, string, or long
- * string). For strings, the size includes the length of the string plus the
- * number of the string's length prefix byte(s).
- */
-uint16_t emberAfAttributeValueSize(chip::ClusterId clusterId, chip::AttributeId attributeId, EmberAfAttributeType dataType,
-                                   const uint8_t * buffer);
-
 /** @} END Attribute Storage */
 
 /** @name Device Control */
 // @{
 
-/**
- * @brief Function that checks if endpoint is enabled.
- *
- * This function returns true if device at a given endpoint is
- * enabled. At startup all endpoints are enabled.
- *
- * @param endpoint Zigbee endpoint number
- */
-bool emberAfIsDeviceEnabled(chip::EndpointId endpoint);
-
 /**
  * @brief Function that checks if endpoint is identifying
  *
@@ -406,37 +343,6 @@ bool emberAfIsThisDataTypeAStringType(EmberAfAttributeType dataType);
 /** @brief Returns true if a given ZCL data type is a list type. */
 bool emberAfIsThisDataTypeAListType(EmberAfAttributeType dataType);
 
-/**
- * @brief The mask applied by ::emberAfNextSequence when generating ZCL
- * sequence numbers.
- */
-#define EMBER_AF_ZCL_SEQUENCE_MASK 0x7F
-
-/**
- * @brief The mask applied to generated message tags used by the framework when sending messages via EZSP.
- * Customers who call ezspSend functions directly must use message tags outside this mask
- */
-#define EMBER_AF_MESSAGE_TAG_MASK 0x7F
-
-/**
- * @brief Increments the ZCL sequence number and returns the value.
- *
- * ZCL messages have sequence numbers so that they can be matched up with other
- * messages in the transaction.  To avoid conflicts with sequence numbers
- * generated independently by the application, this API returns sequence
- * numbers with the high bit clear.  If the application generates its own
- * sequence numbers, it should use numbers with the high bit set.
- *
- * @return The next ZCL sequence number.
- */
-uint8_t emberAfNextSequence(void);
-
-/**
- * @brief Retrieves the last sequence number that was used.
- *
- */
-uint8_t emberAfGetLastSequenceNumber(void);
-
 /**
  * @brief Simple integer comparison function.
  * Compares two values of a known length as integers.
@@ -456,136 +362,22 @@ int8_t emberAfCompareValues(const uint8_t * val1, const uint8_t * val2, uint16_t
  */
 void emberAfGetEui64(EmberEUI64 returnEui64);
 
-#if (BIGENDIAN_CPU) || defined(EZSP_HOST)
-// Normally this is provided by the stack code, but on the host
-// it is provided by the application code.
-void emberReverseMemCopy(uint8_t * dest, const uint8_t * src, uint16_t length);
-#endif
-
 /**
  * @brief Returns the node ID of the local node.
  */
 EmberNodeId emberAfGetNodeId(void);
 
-#if defined(DOXYGEN_SHOULD_SKIP_THIS) || defined(EZSP_HOST)
-/**
- * @brief Generates a random key (link, network, or master).
- */
-EmberStatus emberAfGenerateRandomKey(EmberKeyData * result);
-#else
-#define emberAfGenerateRandomKey(result) emberGenerateRandomKey(result)
-#endif
-
-/**
- * @brief Returns the PAN ID of the local node.
- */
-EmberPanId emberAfGetPanId(void);
-
-/**
- * @brief Returns the radioChannel of the current network
- */
-uint8_t emberAfGetRadioChannel(void);
-
-/*
- * @brief Returns a binding index that matches the current incoming message, if
- * known.
- */
-uint8_t emberAfGetBindingIndex(void);
-
-/*
- * @brief Returns an address index that matches the current incoming message,
- * if known.
- */
-uint8_t emberAfGetAddressIndex(void);
-
 /**
  * @brief Returns the current network state.  This call caches the results
  *   on the host to prevent frequent EZSP transactions.
  */
 EmberNetworkStatus emberAfNetworkState(void);
 
-/**
- * @brief Returns the current network parameters.
- */
-EmberStatus emberAfGetNetworkParameters(EmberNodeType * nodeType, EmberNetworkParameters * parameters);
-
-/**
- * @brief Returns the current node type.
- */
-EmberStatus emberAfGetNodeType(EmberNodeType * nodeType);
-
-/**
- */
-#define EMBER_AF_REJOIN_DUE_TO_END_DEVICE_MOVE 0xA0
-#define EMBER_AF_REJOIN_DUE_TO_TC_KEEPALIVE_FAILURE 0xA1
-#define EMBER_AF_REJOIN_DUE_TO_CLI_COMMAND 0xA2
-#define EMBER_AF_REJOIN_DUE_TO_WWAH_CONNECTIVITY_MANAGER 0xA3
-
-#define EMBER_AF_REJOIN_FIRST_REASON EMBER_AF_REJOIN_DUE_TO_END_DEVICE_MOVE
-#define EMBER_AF_REJOIN_LAST_REASON EMBER_AF_REJOIN_DUE_TO_END_DEVICE_MOVE
-
-/**
- * @brief Enables local permit join and optionally broadcasts the ZDO
- * Mgmt_Permit_Join_req message. This API can be called from any device
- * type and still return EMBER_SUCCESS. If the API is called from an
- * end device, the permit association bit will just be left off.
- *
- * @param duration the duration that the permit join bit will remain on
- * and other devices will be able to join the current network.
- * @param broadcastMgmtPermitJoin whether or not to broadcast the ZDO
- * Mgmt_Permit_Join_req message.
- *
- * @returns status of whether or not permit join was enabled.
- */
-EmberStatus emberAfPermitJoin(uint8_t duration, bool broadcastMgmtPermitJoin);
-
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-/**
- * @brief Enables local permit join and broadcasts the ZDO
- * Mgmt_Permit_Join_req message. This API can be called from any device
- * type and still return EMBER_SUCCESS. If the API is called from an
- * end device, the permit association bit will just be left off.
- *
- * @param duration the duration that the permit join bit will remain on
- * and other devices will be able to join the current network.
- *
- * @returns status of whether or not permit join was enabled.
- */
-EmberStatus emberAfBroadcastPermitJoin(uint8_t duration);
-#else
-#define emberAfBroadcastPermitJoin(duration) emberAfPermitJoin((duration), true)
-#endif
-
 /** @} END Miscellaneous */
 
 /** @name Sleep Control */
 //@{
 
-/**
- * @brief A function used to add a task to the task register.
- */
-#define emberAfAddToCurrentAppTasks(x) emberAfAddToCurrentAppTasksCallback(x)
-
-/**
- * @brief A function used to remove a task from the task register.
- */
-#define emberAfRemoveFromCurrentAppTasks(x) emberAfRemoveFromCurrentAppTasksCallback(x)
-
-/**
- * @brief A macro used to retrieve the bitmask of all application
- * frameowrk tasks currently in progress. This can be useful for debugging if
- * some task is holding the device out of hibernation.
- */
-#define emberAfCurrentAppTasks() emberAfGetCurrentAppTasksCallback()
-
-/**
- * @brief a function used to run the application framework's
- *        event mechanism. This function passes the application
- *        framework's event tables to the ember stack's event
- *        processing code.
- */
-void emberAfRunEvents(void);
-
 /**
  * @brief Friendly define for use in the scheduling or canceling client events
  * with emberAfScheduleClusterTick() and emberAfDeactivateClusterTick().
@@ -645,36 +437,6 @@ EmberStatus emberAfScheduleTickExtended(chip::EndpointId endpoint, chip::Cluster
 EmberStatus emberAfScheduleClusterTick(chip::EndpointId endpoint, chip::ClusterId clusterId, bool isClient, uint32_t delayMs,
                                        EmberAfEventSleepControl sleepControl);
 
-/**
- * @brief A function used to schedule a cluster client event.  This function
- * is a wrapper for ::emberAfScheduleTickExtended.
- *
- * @param endpoint the endpoint of the event to be scheduled
- * @param clusterId the cluster id of the event to be scheduled
- * @param delayMs the number of milliseconds until the event should be called.
- * @param pollControl ::EMBER_AF_SHORT_POLL if the cluster needs to short poll
- *        or ::EMBER_AF_LONG_POLL otherwise.
- * @param sleepControl ::EMBER_AF_STAY_AWAKE if the cluster needs to stay awake
- *        or EMBER_AF_OK_TO_SLEEP otherwise.
- *
- * @return EMBER_SUCCESS if the event was scheduled or an error otherwise.
- */
-EmberStatus emberAfScheduleClientTickExtended(chip::EndpointId endpoint, chip::ClusterId clusterId, uint32_t delayMs,
-                                              EmberAfEventPollControl pollControl, EmberAfEventSleepControl sleepControl);
-
-/**
- * @brief A function used to schedule a cluster client event.  This function
- * is a wrapper for ::emberAfScheduleClientTickExtended.  It indicates that
- * the cluster client on the given endpoint can long poll and can sleep.
- *
- * @param endpoint the endpoint of the event to be scheduled.
- * @param clusterId the cluster id of the event to be scheduled.
- * @param delayMs the number of milliseconds until the event should be called.
- *
- * @return EMBER_SUCCESS if the event was scheduled or an error otherwise.
- */
-EmberStatus emberAfScheduleClientTick(chip::EndpointId endpoint, chip::ClusterId clusterId, uint32_t delayMs);
-
 /**
  * @brief A function used to schedule a cluster server event.  This function
  * is a wrapper for ::emberAfScheduleTickExtended.
@@ -721,17 +483,6 @@ EmberStatus emberAfScheduleServerTick(chip::EndpointId endpoint, chip::ClusterId
  */
 EmberStatus emberAfDeactivateClusterTick(chip::EndpointId endpoint, chip::ClusterId clusterId, bool isClient);
 
-/**
- * @brief A function used to deactivate a cluster client event.  This function
- * is a wrapper for ::emberAfDeactivateClusterTick.
- *
- * @param endpoint the endpoint of the event to be deactivated.
- * @param clusterId the cluster id of the event to be deactivated.
- *
- * @return EMBER_SUCCESS if the event was deactivated or an error otherwise.
- */
-EmberStatus emberAfDeactivateClientTick(chip::EndpointId endpoint, chip::ClusterId clusterId);
-
 /**
  * @brief A function used to deactivate a cluster server event.  This function
  * is a wrapper for ::emberAfDeactivateClusterTick.
@@ -758,180 +509,11 @@ EmberStatus emberAfDeactivateServerTick(chip::EndpointId endpoint, chip::Cluster
  */
 EmberStatus emberEventControlSetDelayMS(EmberEventControl * control, uint32_t delayMs);
 
-/**
- * @brief Sets the ::EmberEventControl to run "delayQs" quarter seconds in the
- * future.  The 'quarter seconds' are actually 256 milliseconds long.  This
- * function first verifies that the delay is within the acceptable range before
- * scheduling the event.
- *
- * @param control a pointer to the event control.
- * @param delayQs the number of quarter seconds until the next event.
- *
- * @return If delayQs is less than or equal to
-           ::EMBER_MAX_EVENT_CONTROL_DELAY_QS, this function will schedule the
-           event and return ::EMBER_SUCCESS.  Otherwise it will return
-           ::EMBER_BAD_ARGUMENT.
- */
-EmberStatus emberAfEventControlSetDelayQS(EmberEventControl * control, uint32_t delayQs);
-
-/**
- * @brief Sets the ::EmberEventControl for the current network, and only
- * the current network, as inactive.  See ::emberEventControlSetInactive.
- */
-void emberAfNetworkEventControlSetInactive(EmberEventControl * controls);
-/**
- * @brief Returns true if the event for the current network, and only the
- * current network, is active.  See ::emberEventControlGetActive.
- */
-bool emberAfNetworkEventControlGetActive(EmberEventControl * controls);
-/**
- * @brief Sets the ::EmberEventControl for the current network, and only
- * current network, to run at the next available opportunity.  See
- * ::emberEventControlSetActive.
- */
-void emberAfNetworkEventControlSetActive(EmberEventControl * controls);
-/**
- * @brief Sets the ::EmberEventControl for the current network, and only the
- * current network, to run "delayMs" milliseconds in the future.  See
- * ::emberEventControlSetDelayMS.
- */
-EmberStatus emberAfNetworkEventControlSetDelayMS(EmberEventControl * controls, uint32_t delayMs);
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-/**
- * @brief Sets the ::EmberEventControl for the current network, and only the
- * current network, to run "delayMs" milliseconds in the future.  See
- * ::emberEventControlSetDelayMS.
- */
-EmberStatus emberAfNetworkEventControlSetDelay(EmberEventControl * controls, uint32_t delayMs);
-#else
-#define emberAfNetworkEventControlSetDelay(controls, delayMs) emberAfNetworkEventControlSetDelayMS(controls, delayMs);
-#endif
-/**
- * @brief Sets the ::EmberEventControl for the current network, and only the
- * current network, to run "delayM" minutes in the future.  See
- * ::emberAfEventControlSetDelayMinutes.
- */
-EmberStatus emberAfNetworkEventControlSetDelayMinutes(EmberEventControl * controls, uint16_t delayM);
-
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint as inactive.
- * See ::emberEventControlSetInactive.
- */
-EmberStatus emberAfEndpointEventControlSetInactive(EmberEventControl * controls, chip::EndpointId endpoint);
-/**
- * @brief Returns true if the event for the current number is active.  See
- * ::emberEventControlGetActive.
- */
-bool emberAfEndpointEventControlGetActive(EmberEventControl * controls, chip::EndpointId endpoint);
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint to run at the
- * next available opportunity.  See ::emberEventControlSetActive.
- */
-EmberStatus emberAfEndpointEventControlSetActive(EmberEventControl * controls, chip::EndpointId endpoint);
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint to run
- * "delayMs" milliseconds in the future.  See ::emberEventControlSetDelayMS.
- */
-EmberStatus emberAfEndpointEventControlSetDelayMS(EmberEventControl * controls, chip::EndpointId endpoint, uint32_t delayMs);
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint to run
- * "delayMs" milliseconds in the future.  See ::emberEventControlSetDelayMS.
- */
-EmberStatus emberAfEndpointEventControlSetDelay(EmberEventControl * controls, chip::EndpointId endpoint, uint32_t delayMs);
-#else
-#define emberAfEndpointEventControlSetDelay(controls, endpoint, delayMs)                                                           \
-    emberAfEndpointEventControlSetDelayMS(controls, endpoint, delayMs);
-#endif
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint to run
- * "delayQs" quarter seconds in the future.  See
- * ::emberAfEventControlSetDelayQS.
- */
-EmberStatus emberAfEndpointEventControlSetDelayQS(EmberEventControl * controls, chip::EndpointId endpoint, uint32_t delayQs);
-/**
- * @brief Sets the ::EmberEventControl for the specified endpoint to run
- * "delayM" minutes in the future.  See ::emberAfEventControlSetDelayMinutes.
- */
-EmberStatus emberAfEndpointEventControlSetDelayMinutes(EmberEventControl * controls, chip::EndpointId endpoint, uint16_t delayM);
-
-/**
- * @brief A function used to retrieve the number of milliseconds until
- * the next event scheduled in the application framework's event
- * mechanism.
- * @param maxMs the maximum number of milliseconds until the next
- *              event.
- * @return The number of milliseconds until the next event or
- * maxMs if no event is scheduled before then.
- */
-uint32_t emberAfMsToNextEvent(uint32_t maxMs);
-
-/** @brief This is the same as the function emberAfMsToNextEvent() with the
- *  following addition.  If returnIndex is non-NULL it returns the index
- *  of the event that is ready to fire next.
- */
-uint32_t emberAfMsToNextEventExtended(uint32_t maxMs, uint8_t * returnIndex);
-
-/**
- * @brief A function used to retrieve the number of quarter seconds until
- * the next event scheduled in the application framework's event
- * mechanism. This function will round down and will return 0 if the
- * next event must fire within a quarter second.
- * @param maxQS, the maximum number of quarter seconds until the next
- *        event.
- * @return The number of quarter seconds until the next event or
- * maxQS if no event is scheduled before then.
- */
-#define emberAfQSToNextEvent(maxQS)                                                                                                \
-    (emberAfMsToNextEvent(maxQS * MILLISECOND_TICKS_PER_QUARTERSECOND) / MILLISECOND_TICKS_PER_QUARTERSECOND)
-
-/**
- * @brief A function for retrieving the most restrictive sleep
- * control value for all scheduled events. This function is
- * used by emberAfOkToNap and emberAfOkToHibernate to makes sure
- * that there are no events scheduled which will keep the device
- * from hibernating or napping.
- * @return The most restrictive sleep control value for all
- *         scheduled events or the value returned by
- *         emberAfGetDefaultSleepControl()
- *         if no events are currently scheduled. The default
- *         sleep control value is initialized to
- *         EMBER_AF_OK_TO_HIBERNATE but can be changed at any
- *         time using the emberAfSetDefaultSleepControl() function.
- */
-#define emberAfGetCurrentSleepControl() emberAfGetCurrentSleepControlCallback()
-
-/**
- * @brief A function for setting the default sleep control
- *        value against which all scheduled event sleep control
- *        values will be evaluated. This can be used to keep
- *        a device awake for an extended period of time by setting
- *        the default to EMBER_AF_STAY_AWAKE and then resetting
- *        the value to EMBER_AF_OK_TO_HIBERNATE once the wake
- *        period is complete.
- */
-#define emberAfSetDefaultSleepControl(x) emberAfSetDefaultSleepControlCallback(x)
-
-/**
- * @brief A function used to retrieve the default sleep control against
- *        which all event sleep control values are evaluated. The
- *        default sleep control value is initialized to
- *        EMBER_AF_OK_TO_HIBERNATE but can be changed by the application
- *        at any time using the emberAfSetDefaultSleepControl() function.
- * @return The current default sleep control value.
- */
-#define emberAfGetDefaultSleepControl() emberAfGetDefaultSleepControlCallback()
-
 /** @} END Sleep Control */
 
 /** @name Messaging */
 // @{
 
-/**
- * @brief Sends end device binding request.
- */
-EmberStatus emberAfSendEndDeviceBind(chip::EndpointId endpoint);
-
 /**
  * @brief Sends a default response to a cluster command.
  *
@@ -968,18 +550,6 @@ EmberApsFrame * emberAfGetCommandApsFrame(void);
  */
 void emberAfSetCommandEndpoints(chip::EndpointId sourceEndpoint, chip::EndpointId destinationEndpoint);
 
-/**
- * @brief Friendly define for use in discovering client clusters with
- * ::emberAfFindDevicesByCluster().
- */
-#define EMBER_AF_CLIENT_CLUSTER_DISCOVERY false
-
-/**
- * @brief Friendly define for use in discovering server clusters with
- * ::emberAfFindDevicesByCluster().
- */
-#define EMBER_AF_SERVER_CLUSTER_DISCOVERY true
-
 /**
  * @brief Use this function to find devices in the network with endpoints
  *   matching a given cluster ID in their descriptors.
@@ -1007,98 +577,6 @@ void emberAfSetCommandEndpoints(chip::EndpointId sourceEndpoint, chip::EndpointI
 EmberStatus emberAfFindDevicesByCluster(EmberNodeId target, chip::ClusterId clusterId, bool serverCluster,
                                         EmberAfServiceDiscoveryCallback * callback);
 
-/**
- * @brief Use this function to find all of the given in and out clusters
- *   implemented on a devices given endpoint. Target should only be the
- *   short address of a specific device.
- *
- * With this function a single service discovery is initiated and the response
- * is passed back to the passed callback.
- *
- * @param target The destination node ID for the discovery. This should be a
- *  specific node's ID and should not be a broadcast address.
- * @param targetEndpoint The endpoint to target with the discovery process.
- * @param callback Function pointer for the callback function triggered when
- *  the discovery is returned.
- */
-EmberStatus emberAfFindClustersByDeviceAndEndpoint(EmberNodeId target, uint8_t targetEndpoint,
-                                                   EmberAfServiceDiscoveryCallback * callback);
-
-/**
- * @brief Use this function to initiate a discovery for the IEEE address
- *   of the specified node id.  This will send a unicast sent to the target
- *   node ID.
- */
-EmberStatus emberAfFindIeeeAddress(EmberNodeId shortAddress, EmberAfServiceDiscoveryCallback * callback);
-
-/**
- * @brief Use this function to initiate a discovery for the short ID of the
- *   specified long address.  This will send a broadcast to all
- *   rx-on-when-idle devices (non-sleepies).
- */
-EmberStatus emberAfFindNodeId(EmberEUI64 longAddress, EmberAfServiceDiscoveryCallback * callback);
-
-/**
- * @brief Initiate an Active Endpoint request ZDO message to the target node ID.
- */
-EmberStatus emberAfFindActiveEndpoints(EmberNodeId target, EmberAfServiceDiscoveryCallback * callback);
-
-/**
- * @brief Use this function to add an entry for a remote device to the address
- * table.
- *
- * If the EUI64 already exists in the address table, the index of the existing
- * entry will be returned.  Otherwise, a new entry will be created and the new
- * new index will be returned.  The framework will remember how many times the
- * returned index has been referenced.  When the address table entry is no
- * longer needed, the application should remove its reference by calling
- * ::emberAfRemoveAddressTableEntry.
- *
- * @param longId The EUI64 of the remote device.
- * @param shortId The node id of the remote device or ::EMBER_UNKNOWN_NODE_ID
- * if the node id is currently unknown.
- * @return The index of the address table entry for this remove device or
- * ::EMBER_NULL_ADDRESS_TABLE_INDEX if an error occurred (e.g., the address
- * table is full).
- */
-uint8_t emberAfAddAddressTableEntry(EmberEUI64 longId, EmberNodeId shortId);
-
-/**
- * @brief Use this function to add an entry for a remote device to the address
- * table at a specific location.
- *
- * The framework will remember how many times an address table index has been
- * referenced through ::emberAfAddAddressTableEntry.  If the reference count
- * for the index passed to this function is not zero, the entry will be not
- * changed.   When the address table entry is no longer needed, the application
- * should remove its reference by calling ::emberAfRemoveAddressTableEntry.
- *
- * @param index The index of the address table entry.
- * @param longId The EUI64 of the remote device.
- * @param shortId The node id of the remote device or ::EMBER_UNKNOWN_NODE_ID
- * if the node id is currently unknown.
- * @return ::EMBER_SUCCESS if the address table entry was successfully set,
- * ::EMBER_ADDRESS_TABLE_ENTRY_IS_ACTIVE if any messages are being sent using
- * the existing entry at that index or the entry is still referenced in the
- * framework, or ::EMBER_ADDRESS_TABLE_INDEX_OUT_OF_RANGE if the index is out
- * of range.
- */
-EmberStatus emberAfSetAddressTableEntry(uint8_t index, EmberEUI64 longId, EmberNodeId shortId);
-
-/**
- * @brief Use this function to remove a specific entry from the address table.
- *
- * The framework will remember how many times an address table index has been
- * referenced through ::emberAfAddAddressTableEntry and
- * ::emberAfSetAddressTableEntry.  The address table entry at this index will
- * not actually be removed until its reference count reaches zero.
- *
- * @param index The index of the address table entry.
- * @return ::EMBER_SUCCESS if the address table entry was successfully removed
- * or ::EMBER_ADDRESS_TABLE_INDEX_OUT_OF_RANGE if the index is out of range.
- */
-EmberStatus emberAfRemoveAddressTableEntry(uint8_t index);
-
 #if !defined(DOXYGEN_SHOULD_SKIP_THIS)
 /**
  * @brief Use this macro to retrieve the current command. This
@@ -1119,54 +597,6 @@ extern EmberAfClusterCommand * emAfCurrentCommand;
  */
 #define emberAfCurrentEndpoint() (emberAfCurrentCommand()->apsFrame->destinationEndpoint)
 
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-/** @brief Use this function to initiate key establishment with a remote node.
- * ::emberAfKeyEstablishmentCallback will be called as events occur and when
- * key establishment completes.
- *
- * @param nodeId The node id of the remote device.
- * @param endpoint The endpoint on the remote device.
- * @return ::EMBER_SUCCESS if key establishment was initiated successfully
- */
-EmberStatus emberAfInitiateKeyEstablishment(EmberNodeId nodeId, chip::EndpointId endpoint);
-
-/** @brief Use this function to initiate key establishment with a remote node on
- * a different PAN.  ::emberAfInterPanKeyEstablishmentCallback will be called
- * as events occur and when key establishment completes.
- *
- * @param panId The PAN id of the remote device.
- * @param eui64 The EUI64 of the remote device.
- * @return ::EMBER_SUCCESS if key establishment was initiated successfully
- */
-EmberStatus emberAfInitiateInterPanKeyEstablishment(EmberPanId panId, const EmberEUI64 eui64);
-
-/** @brief Use this function to tell if the device is in the process of
- * performing key establishment.
- *
- * @return ::true if key establishment is in progress.
- */
-bool emberAfPerformingKeyEstablishment(void);
-
-/** @brief Use this function to initiate partner link key exchange with a
- * remote node.
- *
- * @param target The node id of the remote device.
- * @param endpoint The key establishment endpoint of the remote device.
- * @param callback The callback that should be called when the partner link
- * key exchange completes.
- * @return ::EMBER_SUCCESS if the partner link key exchange was initiated
- * successfully.
- */
-EmberStatus emberAfInitiatePartnerLinkKeyExchange(EmberNodeId target, chip::EndpointId endpoint,
-                                                  EmberAfPartnerLinkKeyExchangeCallback * callback);
-#else
-#define emberAfInitiateKeyEstablishment(nodeId, endpoint) emberAfInitiateKeyEstablishmentCallback(nodeId, endpoint)
-#define emberAfInitiateInterPanKeyEstablishment(panId, eui64) emberAfInitiateInterPanKeyEstablishmentCallback(panId, eui64)
-#define emberAfPerformingKeyEstablishment() emberAfPerformingKeyEstablishmentCallback()
-#define emberAfInitiatePartnerLinkKeyExchange(target, endpoint, callback)                                                          \
-    emberAfInitiatePartnerLinkKeyExchangeCallback(target, endpoint, callback)
-#endif
-
 /** @} END Messaging */
 
 /** @name ZCL macros */
@@ -1204,56 +634,6 @@ EmberStatus emberAfInitiatePartnerLinkKeyExchange(EmberNodeId target, chip::Endp
 
 /** @} END ZCL macros */
 
-/** @name Network utility functions */
-// ${
-
-/** @brief Use this function to form a new network using the specified network
- * parameters.
- *
- * @param parameters Specification of the new network.
- * @return An ::EmberStatus value that indicates either the successful formation
- * of the new network or the reason that the network formation failed.
- */
-EmberStatus emberAfFormNetwork(EmberNetworkParameters * parameters);
-
-/** @brief Use this function to associate with the network using the specified
- * network parameters.
- *
- * @param parameters Specification of the network with which the node should
- * associate.
- * @return An ::EmberStatus value that indicates either that the association
- * process began successfully or the reason for failure.
- */
-EmberStatus emberAfJoinNetwork(EmberNetworkParameters * parameters);
-
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-/** @brief Use this function to find an unused PAN id and form a new network.
- *
- * @return An ::EmberStatus value that indicates either the process begin
- * successfully or the reason for failure.
- */
-EmberStatus emberAfFindUnusedPanIdAndForm(void);
-/** @brief Use this function to find a joinable network and join it.
- *
- * @return An ::EmberStatus value that indicates either the process begin
- * successfully or the reason for failure.
- */
-EmberStatus emberAfStartSearchForJoinableNetwork(void);
-#else
-#define emberAfFindUnusedPanIdAndForm() emberAfFindUnusedPanIdAndFormCallback()
-#define emberAfStartSearchForJoinableNetwork() emberAfStartSearchForJoinableNetworkCallback()
-#endif
-
-/** @brief Basic initialization API to be invoked before ::emberAfMain.
- */
-void emberAfMainInit(void);
-
-/** @brief This function effectively serves as the application main.
- */
-int emberAfMain(MAIN_FUNCTION_PARAMETERS);
-
-/** @} End network utility functions */
-
 /** @} END addtogroup */
 
 #if !defined(DOXYGEN_SHOULD_SKIP_THIS)
@@ -1264,11 +644,6 @@ int emberAfMain(MAIN_FUNCTION_PARAMETERS);
 #endif
 #endif
 
-/** @brief The maximum power level that can be used by the chip.
- */
-// Note:  This is a #define for now but could be a real function call in the future.
-#define emberAfMaxPowerLevel() (3)
-
 /**
  * @brief API for parsing a cluster-specific message.  Implemented by
  * generated code.
diff --git a/src/app/util/attribute-size-util.cpp b/src/app/util/attribute-size-util.cpp
index 5cb95313dce574..f8cf9507f11b53 100644
--- a/src/app/util/attribute-size-util.cpp
+++ b/src/app/util/attribute-size-util.cpp
@@ -37,43 +37,3 @@ uint8_t emberAfGetDataSize(uint8_t dataType)
 
     return 0;
 }
-
-uint16_t emberAfAttributeValueSize(ClusterId clusterId, AttributeId attrId, EmberAfAttributeType dataType, const uint8_t * buffer)
-{
-    // If the dataType is a string or long string, refer to the buffer for the
-    // string's length prefix; size is string length plus number of prefix bytes.
-    // If non-string, determine size from dataType. If dataType is unrecognized,
-    // return zero.
-    //
-    // Note: A non-empty long string has max length 0xFFFE, and adding 2 for its
-    // length prefix would roll a uint16_t back to zero. Choosing not to
-    // expand return type to uint32_t just to accommodate that one case.
-    uint16_t dataSize = 0;
-    if (emberAfIsThisDataTypeAStringType(dataType))
-    {
-        if (buffer != nullptr)
-        {
-            if (emberAfIsStringAttributeType(dataType))
-            {
-                // size is string length plus 1-byte length prefix
-                dataSize = static_cast<uint16_t>(static_cast<uint16_t>(emberAfStringLength(buffer)) + 1u);
-            }
-            else
-            {
-                // size is long string length plus 2-byte length prefix
-                dataSize = static_cast<uint16_t>(emberAfLongStringLength(buffer) + 2u);
-            }
-        }
-    }
-    else if (emberAfIsThisDataTypeAListType(dataType))
-    {
-        // Just claim to have a length and nothing else.
-        dataSize = 2;
-    }
-    else
-    {
-        dataSize = (uint16_t) emberAfGetDataSize(dataType);
-    }
-
-    return dataSize;
-}
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index 6f037518f8d80d..b051abaadea0dc 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -295,42 +295,6 @@ bool emberAfIsThisDataTypeAListType(EmberAfAttributeType dataType)
     return dataType == ZCL_ARRAY_ATTRIBUTE_TYPE;
 }
 
-// This function is used to call the per-cluster default response callback
-void emberAfClusterDefaultResponseCallback(EndpointId endpoint, ClusterId clusterId, CommandId commandId, EmberAfStatus status,
-                                           uint8_t clientServerMask)
-{
-    const EmberAfCluster * cluster = emberAfFindCluster(endpoint, clusterId, clientServerMask);
-    if (cluster != nullptr)
-    {
-        EmberAfGenericClusterFunction f = emberAfFindClusterFunction(cluster, CLUSTER_MASK_DEFAULT_RESPONSE_FUNCTION);
-        if (f != nullptr)
-        {
-            ((EmberAfDefaultResponseFunction) f)(endpoint, commandId, status);
-        }
-    }
-}
-
-// This function is used to call the per-cluster message sent callback
-void emberAfClusterMessageSentCallback(const MessageSendDestination & destination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                                       uint8_t * message, EmberStatus status)
-{
-    if (apsFrame != nullptr && message != nullptr && msgLen != 0)
-    {
-        const EmberAfCluster * cluster = emberAfFindCluster(
-            apsFrame->sourceEndpoint, apsFrame->clusterId,
-            (((message[0] & ZCL_FRAME_CONTROL_DIRECTION_MASK) == ZCL_FRAME_CONTROL_SERVER_TO_CLIENT) ? CLUSTER_MASK_SERVER
-                                                                                                     : CLUSTER_MASK_CLIENT));
-        if (cluster != nullptr)
-        {
-            EmberAfGenericClusterFunction f = emberAfFindClusterFunction(cluster, CLUSTER_MASK_MESSAGE_SENT_FUNCTION);
-            if (f != nullptr)
-            {
-                ((EmberAfMessageSentFunction) f)(destination, apsFrame, msgLen, message, status);
-            }
-        }
-    }
-}
-
 // This function is used to call the per-cluster attribute changed callback
 void emAfClusterAttributeChangedCallback(const app::ConcreteAttributePath & attributePath)
 {
@@ -699,25 +663,12 @@ uint8_t emberAfClusterIndex(EndpointId endpoint, ClusterId clusterId, EmberAfClu
     return 0xFF;
 }
 
-// Returns whether the given endpoint has the client or server of the given
-// cluster on it.
-bool emberAfContainsCluster(EndpointId endpoint, ClusterId clusterId)
-{
-    return (emberAfFindCluster(endpoint, clusterId, 0) != nullptr);
-}
-
 // Returns whether the given endpoint has the server of the given cluster on it.
 bool emberAfContainsServer(EndpointId endpoint, ClusterId clusterId)
 {
     return (emberAfFindCluster(endpoint, clusterId, CLUSTER_MASK_SERVER) != nullptr);
 }
 
-// Returns whether the given endpoint has the client of the given cluster on it.
-bool emberAfContainsClient(EndpointId endpoint, ClusterId clusterId)
-{
-    return (emberAfFindCluster(endpoint, clusterId, CLUSTER_MASK_CLIENT) != nullptr);
-}
-
 // This will find the first server that has the clusterId given from the index of endpoint.
 bool emberAfContainsServerFromIndex(uint16_t index, ClusterId clusterId)
 {
@@ -792,12 +743,6 @@ uint16_t emberAfFindClusterServerEndpointIndex(EndpointId endpoint, ClusterId cl
     return findClusterEndpointIndex(endpoint, clusterId, CLUSTER_MASK_SERVER);
 }
 
-// Client wrapper for findClusterEndpointIndex
-uint16_t emberAfFindClusterClientEndpointIndex(EndpointId endpoint, ClusterId clusterId)
-{
-    return findClusterEndpointIndex(endpoint, clusterId, CLUSTER_MASK_CLIENT);
-}
-
 // Returns the endpoint index within a given cluster
 static uint16_t findClusterEndpointIndex(EndpointId endpoint, ClusterId clusterId, uint8_t mask)
 {
diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h
index 28d4588e944ba9..81722dd21da2ad 100644
--- a/src/app/util/attribute-storage.h
+++ b/src/app/util/attribute-storage.h
@@ -154,6 +154,9 @@ chip::Optional<chip::ClusterId> emberAfGetNthClusterId(chip::EndpointId endpoint
 uint8_t emberAfGetClustersFromEndpoint(chip::EndpointId endpoint, chip::ClusterId * clusterList, uint8_t listLen, bool server);
 
 // Returns cluster within the endpoint, or NULL if it isn't there
+//
+// TODO: we likely now only have mask as CLUSTER_MASK_SERVER so this
+//       method should be renamed to emberAfFindServerCluster or similar and simplify the code.
 const EmberAfCluster * emberAfFindCluster(chip::EndpointId endpoint, chip::ClusterId clusterId, EmberAfClusterMask mask);
 
 // Returns cluster within the endpoint; Does not ignore disabled endpoints
@@ -187,15 +190,6 @@ void emAfClusterAttributeChangedCallback(const chip::app::ConcreteAttributePath
 EmberAfStatus emAfClusterPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
                                                      EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-// Calls the default response callback for a specific cluster.
-// with the EMBER_NULL_MANUFACTURER_CODE
-void emberAfClusterDefaultResponseCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::CommandId commandId,
-                                           EmberAfStatus status, uint8_t clientServerMask);
-
-// Calls the message sent callback for a specific cluster.
-void emberAfClusterMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                                       uint8_t * message, EmberStatus status);
-
 // Checks a cluster mask byte against ticks passed bitmask
 // returns true if the mask matches a passed interval
 bool emberAfCheckTick(EmberAfClusterMask mask, uint8_t passedMask);
diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp
index 3d4466980570d1..2a86c16fec77fe 100644
--- a/src/app/util/attribute-table.cpp
+++ b/src/app/util/attribute-table.cpp
@@ -67,14 +67,6 @@ EmberAfStatus emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attr
                               false); // just test?
 }
 
-EmberAfStatus emberAfVerifyAttributeWrite(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr,
-                                          EmberAfAttributeType dataType)
-{
-    return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType,
-                              false, // override read-only?
-                              true); // just test?
-}
-
 EmberAfStatus emberAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr,
                                    uint16_t readLength)
 {
diff --git a/src/app/util/common.h b/src/app/util/common.h
index d1e2f315e8d263..f78ae87d61da35 100644
--- a/src/app/util/common.h
+++ b/src/app/util/common.h
@@ -21,7 +21,6 @@
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/attribute-table.h>
-#include <app/util/time-util.h>
 #include <app/util/util.h>
 
 #include <messaging/ExchangeContext.h>
diff --git a/src/app/util/message.cpp b/src/app/util/message.cpp
index bdbcb3c58d29e6..86175ca4f2006a 100644
--- a/src/app/util/message.cpp
+++ b/src/app/util/message.cpp
@@ -253,18 +253,3 @@ uint16_t emberAfLongStringLength(const uint8_t * buffer)
     uint16_t length = emberAfGetInt16u(buffer, 0, 2);
     return (length == 0xFFFF ? 0 : length);
 }
-
-uint8_t emberAfGetDate(uint8_t * message, uint16_t currentIndex, uint16_t msgLen, EmberAfDate * destination)
-{
-    if ((currentIndex + 4) > msgLen)
-    {
-        emberAfDebugPrintln("GetDate, %x bytes short", 4);
-        emberAfDebugFlush();
-        return 0;
-    }
-    destination->year       = message[(currentIndex + 0)];
-    destination->month      = message[(currentIndex + 1)];
-    destination->dayOfMonth = message[(currentIndex + 2)];
-    destination->dayOfWeek  = message[(currentIndex + 3)];
-    return 4;
-}
diff --git a/src/app/util/time-util.h b/src/app/util/time-util.h
deleted file mode 100644
index b4918f16eb2e70..00000000000000
--- a/src/app/util/time-util.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- *
- *    Copyright (c) 2020 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.
- */
-
-#pragma once
-
-#include <inttypes.h>
-
-#include <app/util/af-types.h>
-
-#define SECONDS_IN_MINUTE 60
-#define SECONDS_IN_HOUR 3600
-#define SECONDS_IN_DAY (SECONDS_IN_MINUTE * 60 * 24)
-#define SECONDS_IN_WEEK (SECONDS_IN_DAY * 7)
-#define DURATION_FOREVER_U32 0xFFFFFFFFU
-
-/**
- * @brief ZCL Date comparison function.
- * The results are undefined for dates that contain the do not care value
- * in any of the subfields.
- * @return -1, if val1 is smaller
- *          0, if they are the same
- *          1, if val2 is smaller
- */
-int8_t emberAfCompareDates(EmberAfDate * date1, EmberAfDate * date2);
-
-/**
- * @brief function that copies a ZigBee Date into a buffer
- */
-void emberAfCopyDate(uint8_t * data, uint16_t index, EmberAfDate * src);
-
-/**
- * @brief Decode the given uint32_t into a ZCL Date object where
- * the uint32_t is formatted as follows:
- *
- * (0xFF000000 & value) = year
- * (0x00FF0000 & value) = month
- * (0x0000FF00 & value) = day of month
- * (0x000000FF & value) = day of week
- *
- */
-void emberAfDecodeDate(uint32_t src, EmberAfDate * dest);
-
-/**
- * @brief Encode and return the given ZCL Date object as an uint32_t.
- * Refer to emberAFDecodeDate for details on how the information is stored
- * within an uint32_t.
- */
-uint32_t emberAfEncodeDate(EmberAfDate * date);
-
-/**
- * @brief Fills the a time structure based on the passed UTC time.
- *
- */
-void emberAfFillTimeStructFromUtc(uint32_t utcTime, EmberAfTimeStruct * returnTime);
-/**
- * @brief Returns the number of days in the month specified in the EmberAfTimeStruct.
- *
- */
-uint8_t emberAfGetNumberDaysInMonth(EmberAfTimeStruct * time);
-
-/**
- * @brief Calculate a UTC time from the passed time structure.
- *
- */
-uint32_t emberAfGetUtcFromTimeStruct(EmberAfTimeStruct * time);
-
-/**
- * @brief Determine the week day (Monday=0 ... Sunday=6) based on
- * a specified UTC time.
- */
-uint8_t emberAfGetWeekdayFromUtc(uint32_t utcTime);
-
-/**
- * @brief Sets current time.
- * Convenience function for setting the time to a value.
- * If the time server cluster is implemented on this device,
- * then this call will be passed along to the time cluster server
- * which will update the time. Otherwise the emberAfSetTimeCallback
- * is called, which in the case of the stub does nothing.
- *
- * @param utcTime A ZigBee time, the number of seconds since the
- *                year 2000.
- */
-void emberAfSetTime(uint32_t utcTime);
-
-/**
- * @brief Retrieves current time.
- *
- * Convienience function for retrieving the current time.
- * If the time server cluster is implemented, then the time
- * is retrieved from that cluster's time attribute. Otherwise,
- * the emberAfGetCurrentTimeCallback is called.
- *
- * A real time is expected to in the ZigBee time format, the number
- * of seconds since the year 2000.
- */
-uint32_t emberAfGetCurrentTime(void);
-
-/**
- * @brief Prints time.
- *
- * Convenience function for all clusters to print time.
- * This function expects to be passed a ZigBee time which
- * is the number of seconds since the year 2000. If
- * EMBER_AF_PRINT_CORE is defined, this function will print
- * a human readable time from the passed value. If not, this
- * function will print nothing.
- *
- * @param utcTime A ZigBee time, the number of seconds since the
- *                year 2000.
- */
-void emberAfPrintTime(uint32_t utcTime);
-
-/**
- * @brief Prints the time in ISO 8601 format
- * yyyy-mm-dd hh:mm:ss
- *
- * @param utcTime A ZigBee time, the number of seconds since the
- *                year 2000.
- */
-void emberAfPrintTimeIsoFormat(uint32_t utcTime);
diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h
index d098c323e27e8d..56f15a23efedb4 100644
--- a/src/app/util/types_stub.h
+++ b/src/app/util/types_stub.h
@@ -297,27 +297,6 @@ typedef struct
  * node might play in a network.
  */
 
-#ifdef DOXYGEN_SHOULD_SKIP_THIS
-enum EmberNodeType
-#else
-typedef uint8_t EmberNodeType;
-enum
-#endif
-{
-    /** The device is not joined. */
-    EMBER_UNKNOWN_DEVICE = 0,
-    /** Will relay messages and can act as a parent to other nodes. */
-    EMBER_COORDINATOR = 1,
-    /** Will relay messages and can act as a parent to other nodes. */
-    EMBER_ROUTER = 2,
-    /** Communicates only with its parent and will not relay messages. */
-    EMBER_END_DEVICE = 3,
-    /** An end device whose radio can be turned off to save power.
-     *  The application must call ::emberPollForData() to receive messages.
-     */
-    EMBER_SLEEPY_END_DEVICE = 4,
-};
-
 /**
  * @brief Defines the possible incoming message types.
  */
@@ -722,19 +701,6 @@ typedef struct
     EmberVersionType type;
 } EmberVersion;
 
-/** @brief This structure contains information about child nodes.
- *
- */
-typedef struct
-{
-    EmberEUI64 eui64;
-    EmberNodeType type;
-    EmberNodeId id;
-    uint8_t phy;
-    uint8_t power;
-    uint8_t timeout;
-} EmberChildData;
-
 /**
  * @brief A distinguished network ID that will never be assigned
  * to any node.  This value is used when getting the remote node ID
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index 1ba17a0e935967..c00d36bdcc4750 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -84,24 +84,6 @@ EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS
 //------------------------------------------------------------------------------
 
 // Device enabled/disabled functions
-bool emberAfIsDeviceEnabled(EndpointId endpoint)
-{
-    uint16_t index;
-#ifdef ZCL_USING_BASIC_CLUSTER_DEVICE_ENABLED_ATTRIBUTE
-    bool deviceEnabled;
-    if (emberAfReadServerAttribute(endpoint, ZCL_BASIC_CLUSTER_ID, ZCL_DEVICE_ENABLED_ATTRIBUTE_ID, (uint8_t *) &deviceEnabled,
-                                   sizeof(deviceEnabled)) == EMBER_ZCL_STATUS_SUCCESS)
-    {
-        return deviceEnabled;
-    }
-#endif
-    index = emberAfIndexFromEndpoint(endpoint);
-    if (index != 0xFFFF && index < sizeof(afDeviceEnabled))
-    {
-        return afDeviceEnabled[index];
-    }
-    return false;
-}
 
 void emberAfSetDeviceEnabled(EndpointId endpoint, bool enabled)
 {
@@ -292,16 +274,6 @@ uint16_t emberAfGetMfgCodeFromCurrentCommand(void)
     return EMBER_AF_NULL_MANUFACTURER_CODE;
 }
 
-uint8_t emberAfNextSequence(void)
-{
-    return ((++emberAfSequenceNumber) & EMBER_AF_ZCL_SEQUENCE_MASK);
-}
-
-uint8_t emberAfGetLastSequenceNumber(void)
-{
-    return (emberAfSequenceNumber & EMBER_AF_ZCL_SEQUENCE_MASK);
-}
-
 // the caller to the library can set a flag to say do not respond to the
 // next ZCL message passed in to the library. Passing true means disable
 // the reply for the next ZCL message. Setting to false re-enables the
@@ -572,34 +544,6 @@ bool emberAfIsTypeSigned(EmberAfAttributeType dataType)
     return (dataType >= ZCL_INT8S_ATTRIBUTE_TYPE && dataType <= ZCL_INT64S_ATTRIBUTE_TYPE);
 }
 
-EmberStatus emberAfEndpointEventControlSetInactive(EmberEventControl * controls, EndpointId endpoint)
-{
-    uint16_t index = emberAfIndexFromEndpoint(endpoint);
-    if (index == 0xFFFF)
-    {
-        return EMBER_INVALID_ENDPOINT;
-    }
-    emberEventControlSetInactive(&controls[index]);
-    return EMBER_SUCCESS;
-}
-
-bool emberAfEndpointEventControlGetActive(EmberEventControl * controls, EndpointId endpoint)
-{
-    uint16_t index = emberAfIndexFromEndpoint(endpoint);
-    return (index != 0xFFFF && emberEventControlGetActive(&controls[index]));
-}
-
-EmberStatus emberAfEndpointEventControlSetActive(EmberEventControl * controls, EndpointId endpoint)
-{
-    uint16_t index = emberAfIndexFromEndpoint(endpoint);
-    if (index == 0xFFFF)
-    {
-        return EMBER_INVALID_ENDPOINT;
-    }
-    emberEventControlSetActive(&controls[index]);
-    return EMBER_SUCCESS;
-}
-
 uint8_t emberAfAppendCharacters(uint8_t * zclString, uint8_t zclStringMaxLen, const uint8_t * appendingChars,
                                 uint8_t appendingCharsLen)
 {
diff --git a/src/app/zap-templates/templates/app/callback-stub-src.zapt b/src/app/zap-templates/templates/app/callback-stub-src.zapt
index 8e8ce31bce288a..8b39bc49cbb875 100644
--- a/src/app/zap-templates/templates/app/callback-stub-src.zapt
+++ b/src/app/zap-templates/templates/app/callback-stub-src.zapt
@@ -35,10 +35,6 @@ void __attribute__((weak)) emberAf{{asUpperCamelCase name}}ClusterInitCallback(E
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
     EndpointId endpoint, ClusterId clusterId,
                                                                           AttributeId attributeId,
@@ -95,11 +91,6 @@ EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
     EndpointId endpoint, uint8_t * returnNetworkIndex,
     EmberAfEndpointInfoStruct * returnEndpointInfo)
@@ -109,12 +100,6 @@ bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
-    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt
index 9c296dbf8939fb..4f379bd3471e8a 100644
--- a/src/app/zap-templates/templates/app/callback.zapt
+++ b/src/app/zap-templates/templates/app/callback.zapt
@@ -155,29 +155,6 @@ bool emberAf{{asUpperCamelCase parent.label}}Cluster{{asUpperCamelCase name}}Cal
 {{/zcl_commands}}
 {{/zcl_clusters}}
 
-/** @brief Add To Current App Tasks
- *
- * This function is only useful to sleepy end devices.  This function will note
- * the passed item as part of a set of tasks the application has outstanding
- * (e.g. message sent requiring APS acknwoledgement).  This will affect how the
- * application behaves with regard to sleeping and polling.  Until the
- * outstanding task is completed, the device may poll more frequently and sleep
- * less often.
- */
-void emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks);
-
-/** @brief Remove From Current App Tasks
- *
- * This function is only useful to sleepy end devices.  This function will
- * remove the passed item from the set of tasks the application has outstanding
- * (e.g. message sent requiring APS acknwoledgement).  This will affect how the
- * application behaves with regard to sleeping and polling.  Removing the item
- * from the list of outstanding tasks may allow the device to sleep longer and
- * poll less frequently.  If there are other outstanding tasks the system may
- * still have to stay away and poll more often.
- */
-void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks);
-
 /** @brief Allow Network Write Attribute
  *
  * This function is called by the application framework before it writes an
@@ -346,17 +323,6 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(chip::EndpointId endpoint, c
                                                     const EmberAfAttributeMetadata * attributeMetadata,
                                                     uint8_t * buffer);
 
-/** @brief Get Current Time
- *
- * This callback is called when device attempts to get current time from the
- * hardware. If this device has means to retrieve exact time, then this method
- * should implement it. If the callback can't provide the exact time it should
- * return 0 to indicate failure. Default action is to return 0, which indicates
- * that device does not have access to real time.
- *
- */
-uint32_t emberAfGetCurrentTimeCallback();
-
 /** @brief Get Endpoint Info
  *
  * This function is a callback to an application implemented endpoint that
@@ -384,18 +350,6 @@ bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnN
  */
 void emberAfRegistrationAbortCallback();
 
-/** @brief Interpan Send Message
- *
- * This function will send a raw MAC message with interpan frame format using
- * the passed parameters.
- *
- * @param header Interpan header info  Ver.: always
- * @param messageLength The length of the message received or to send  Ver.:
- * always
- * @param message The message data received or to send.  Ver.: always
- */
-EmberStatus emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message);
-
 /** @brief Start Move
  *
  * This function is called to initiate the process for a device to move (rejoin)
diff --git a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
index 79eb5a24243274..09b308d2728d12 100644
--- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
@@ -552,10 +552,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -603,11 +599,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -616,12 +607,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
index 1e748d603d754d..7e0e1471ee4836 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
@@ -512,10 +512,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -563,11 +559,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -576,12 +567,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index 8a674cd17d6c30..7e04ce7f7a70db 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -8926,29 +8926,6 @@ bool emberAfFaultInjectionClusterFailRandomlyAtFaultCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::FaultInjection::Commands::FailRandomlyAtFault::DecodableType & commandData);
 
-/** @brief Add To Current App Tasks
- *
- * This function is only useful to sleepy end devices.  This function will note
- * the passed item as part of a set of tasks the application has outstanding
- * (e.g. message sent requiring APS acknwoledgement).  This will affect how the
- * application behaves with regard to sleeping and polling.  Until the
- * outstanding task is completed, the device may poll more frequently and sleep
- * less often.
- */
-void emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks);
-
-/** @brief Remove From Current App Tasks
- *
- * This function is only useful to sleepy end devices.  This function will
- * remove the passed item from the set of tasks the application has outstanding
- * (e.g. message sent requiring APS acknwoledgement).  This will affect how the
- * application behaves with regard to sleeping and polling.  Removing the item
- * from the list of outstanding tasks may allow the device to sleep longer and
- * poll less frequently.  If there are other outstanding tasks the system may
- * still have to stay away and poll more often.
- */
-void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks);
-
 /** @brief Allow Network Write Attribute
  *
  * This function is called by the application framework before it writes an
@@ -9116,17 +9093,6 @@ EmberAfStatus emberAfExternalAttributeReadCallback(chip::EndpointId endpoint, ch
 EmberAfStatus emberAfExternalAttributeWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
                                                     const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer);
 
-/** @brief Get Current Time
- *
- * This callback is called when device attempts to get current time from the
- * hardware. If this device has means to retrieve exact time, then this method
- * should implement it. If the callback can't provide the exact time it should
- * return 0 to indicate failure. Default action is to return 0, which indicates
- * that device does not have access to real time.
- *
- */
-uint32_t emberAfGetCurrentTimeCallback();
-
 /** @brief Get Endpoint Info
  *
  * This function is a callback to an application implemented endpoint that
@@ -9155,18 +9121,6 @@ bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnN
  */
 void emberAfRegistrationAbortCallback();
 
-/** @brief Interpan Send Message
- *
- * This function will send a raw MAC message with interpan frame format using
- * the passed parameters.
- *
- * @param header Interpan header info  Ver.: always
- * @param messageLength The length of the message received or to send  Ver.:
- * always
- * @param message The message data received or to send.  Ver.: always
- */
-EmberStatus emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message);
-
 /** @brief Start Move
  *
  * This function is called to initiate the process for a device to move (rejoin)
diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
index d8149a41611f21..541da14da7d700 100644
--- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
index b92b03791f095b..f460822e248777 100644
--- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
@@ -256,10 +256,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -307,11 +303,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -320,12 +311,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp
index 2d5c943fb30d95..92618dd1a0f3b7 100644
--- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp
@@ -208,10 +208,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -259,11 +255,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -272,12 +263,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp
index 0048f359fa28fd..4aa191ee7068a3 100644
--- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
index 6fd5c04396147f..14cd7146e757cf 100644
--- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp
@@ -264,10 +264,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -315,11 +311,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -328,12 +319,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp
index 3b3dc275a244c9..3e7b15e961b1c0 100644
--- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp
index 5203681136bcdb..285fd0785c31b0 100644
--- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp
@@ -264,10 +264,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -315,11 +311,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -328,12 +319,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp
index 384f59484f7d6a..645b260573ac4b 100644
--- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp
@@ -232,10 +232,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -283,11 +279,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -296,12 +287,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp
index e67653133c0dc2..97a91da04dceb1 100644
--- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp
index 83427624f287f4..90490e899dc32a 100644
--- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp
@@ -272,10 +272,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -323,11 +319,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -336,12 +327,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp
index 5b01c84b47b28d..11bf6c75676817 100644
--- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp
index 5c1c2b4c85b0fe..b49ff9c7a1c649 100644
--- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp
index f59b1abac8ceab..214bd4b6730dd3 100644
--- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp
index 0c08973fe4c214..e2abf8824dff23 100644
--- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp
@@ -256,10 +256,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -307,11 +303,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -320,12 +311,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp
index 165c3d1c54a5de..8982536e30bf4c 100644
--- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp
index 165c3d1c54a5de..8982536e30bf4c 100644
--- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp
index 9a94176c2694b4..16b27602629f9b 100644
--- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp
index 6e356bf49c9130..9793b4ca0c6a0a 100644
--- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp
index 44e831a55c94db..e09cdf1416122b 100644
--- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp
index e65961f1fbfef8..a1d62f5d4d669c 100644
--- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp
@@ -288,10 +288,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -339,11 +335,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -352,12 +343,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp
index f5e18ae9e2bcf9..21eca132a41332 100644
--- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp
+++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp b/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp
index c61d4b45f26c1b..ab1c733d78636f 100644
--- a/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp
@@ -232,10 +232,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -283,11 +279,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -296,12 +287,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
index 8258822775bbef..be2affbb2af6ed 100644
--- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
+++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
@@ -560,10 +560,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -611,11 +607,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -624,12 +615,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp
index d8149a41611f21..541da14da7d700 100644
--- a/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp
index 1e70ab52a91a1d..897c9de6977933 100644
--- a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp
@@ -256,10 +256,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -307,11 +303,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -320,12 +311,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp
index b809a1f1b65cb6..ec1aaf37f421aa 100644
--- a/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp
+++ b/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp
@@ -176,10 +176,6 @@ void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(En
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -227,11 +223,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -240,12 +231,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
index 20850267856b32..24622a8683a9d6 100644
--- a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
@@ -256,10 +256,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -307,11 +303,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -320,12 +311,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/lock-app/zap-generated/callback-stub.cpp b/zzz_generated/lock-app/zap-generated/callback-stub.cpp
index 40b8a2a845ac46..93b96e4f0843bb 100644
--- a/zzz_generated/lock-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/lock-app/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/log-source-app/zap-generated/callback-stub.cpp b/zzz_generated/log-source-app/zap-generated/callback-stub.cpp
index 5470d69131e3ae..48229d6cdb8258 100644
--- a/zzz_generated/log-source-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/log-source-app/zap-generated/callback-stub.cpp
@@ -80,10 +80,6 @@ void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -131,11 +127,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -144,12 +135,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
index d20319aac67bb5..020697569e3d72 100644
--- a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp
@@ -144,10 +144,6 @@ void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoi
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -195,11 +191,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -208,12 +199,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
index b0e6e30fa06011..576efe9e06c48a 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
@@ -184,10 +184,6 @@ void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoi
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -235,11 +231,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -248,12 +239,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
index 07638a5e37f466..3df9eb37e5199b 100644
--- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
+++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
@@ -320,10 +320,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -371,11 +367,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -384,12 +375,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
index 07638a5e37f466..3df9eb37e5199b 100644
--- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
+++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
@@ -320,10 +320,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -371,11 +367,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -384,12 +375,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp
index e9fde2c7b8c439..9e7655fd485314 100644
--- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp
@@ -208,10 +208,6 @@ void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(En
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -259,11 +255,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -272,12 +263,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp
index 056f140ef38382..2d6f8da65eec40 100644
--- a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp
@@ -192,10 +192,6 @@ void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(En
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -243,11 +239,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -256,12 +247,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
index aed58a11790ccc..0117b746c3266c 100644
--- a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp
@@ -192,10 +192,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -243,11 +239,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -256,12 +247,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/thermostat/zap-generated/callback-stub.cpp b/zzz_generated/thermostat/zap-generated/callback-stub.cpp
index 46ed91ffbe0fef..9a26400abe2037 100644
--- a/zzz_generated/thermostat/zap-generated/callback-stub.cpp
+++ b/zzz_generated/thermostat/zap-generated/callback-stub.cpp
@@ -248,10 +248,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -299,11 +295,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -312,12 +303,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/tv-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp
index 7ec58577fea388..6f69c615598cec 100644
--- a/zzz_generated/tv-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/tv-app/zap-generated/callback-stub.cpp
@@ -328,10 +328,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -379,11 +375,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -392,12 +383,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
index 4ad54800c7a76f..83a5e52f00c4ac 100644
--- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp
@@ -360,10 +360,6 @@ void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(Endp
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -411,11 +407,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -424,12 +415,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;
diff --git a/zzz_generated/window-app/zap-generated/callback-stub.cpp b/zzz_generated/window-app/zap-generated/callback-stub.cpp
index 4f583b0d46ac58..401d2b68b1cda8 100644
--- a/zzz_generated/window-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/window-app/zap-generated/callback-stub.cpp
@@ -240,10 +240,6 @@ void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId e
 // Non-Cluster Related Callbacks
 //
 
-void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
-void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {}
-
 EmberAfAttributeWritePermission __attribute__((weak))
 emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value,
                                           uint8_t type)
@@ -291,11 +287,6 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
     return EMBER_ZCL_STATUS_FAILURE;
 }
 
-uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
-{
-    return 0;
-}
-
 bool __attribute__((weak))
 emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
@@ -304,12 +295,6 @@ emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex
 
 void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
 
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
-{
-    return EMBER_LIBRARY_NOT_PRESENT;
-}
-
 bool __attribute__((weak)) emberAfStartMoveCallback()
 {
     return false;