diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13xx_26xx.yaml
similarity index 93%
rename from .github/workflows/examples-cc13x2x7_26x2x7.yaml
rename to .github/workflows/examples-cc13xx_26xx.yaml
index d36fb18c7c0509..1e259824a6b72a 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13xx_26xx.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Build example - TI CC26X2X7
+name: Build example - TI CC13XX_26XX
 
 on:
     push:
@@ -26,11 +26,11 @@ env:
     CHIP_NO_LOG_TIMESTAMPS: true
     
 jobs:
-    cc26x2x7:
-        name: cc26x2x7
+    cc13xx_26xx:
+        name: cc13xx_26xx
 
         env:
-            BUILD_TYPE: gn_cc26x2x7
+            BUILD_TYPE: gn_cc13xx_26xx
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -97,11 +97,6 @@ jobs:
                     cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
                     out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
                     /tmp/bloat_reports/
-            - name: Uploading Size Reports
-              uses: ./.github/actions/upload-size-reports
-              if: ${{ !env.ACT }}
-              with:
-                platform-name: cc13x2x7_26x2x7
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
diff --git a/README.md b/README.md
index 1dad5ef6fe4d4f..d2967701288875 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![ASR](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ASR/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-asr.yaml)
 [![BouffaloLab](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20BouffaloLab/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-bouffalolab.yaml)
 [![Darwin](https://github.com/project-chip/connectedhomeip/workflows/Darwin/badge.svg)](https://github.com/project-chip/connectedhomeip/blob/master/.github/workflows/darwin.yaml)
-[![TI CC26X2X7](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC26X2X7/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc13x2x7_26x2x7.yaml)
+[![TI CC26X2X7](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC13XX_26XX/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc13xx_26xx.yaml)
 [![TI CC32XX](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC32XX/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc32xx.yaml)
 [![EFR32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20EFR32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-efr32.yaml)
 [![ESP32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ESP32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-esp32.yaml)
diff --git a/config/cc13x2_26x2/toolchain/BUILD.gn b/config/cc13x2_26x2/toolchain/BUILD.gn
deleted file mode 100644
index 5655b6579f0469..00000000000000
--- a/config/cc13x2_26x2/toolchain/BUILD.gn
+++ /dev/null
@@ -1,31 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-
-import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
-
-arm_toolchain("cc13x2x7_26x2x7_lock_app") {
-  toolchain_args = {
-    current_os = "freertos"
-    import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
-  }
-  arm_toolchain("cc13x2x7_26x2x7_all_clusters_app") {
-    toolchain_args = {
-      current_os = "freertos"
-      import("${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni")
-    }
-  }
-}
diff --git a/docs/examples/index.md b/docs/examples/index.md
index fc82f2a0bc9016..2c0225cbbf3b9f 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -213,7 +213,6 @@ pigweed-app/**/README
 :maxdepth: 1
 
 pump-app/**/README
-pump-app/cc13x2x7_26x2x7/doc/programming*
 ```
 
 ## Pump controller example
@@ -223,7 +222,6 @@ pump-app/cc13x2x7_26x2x7/doc/programming*
 :maxdepth: 1
 
 pump-controller-app/**/README
-pump-controller-app/cc13x2x7_26x2x7/doc/programming*
 ```
 
 ## Refrigerator example
diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
index f521c78ec3caf9..12ae984ce7d586 100644
--- a/docs/guides/BUILDING.md
+++ b/docs/guides/BUILDING.md
@@ -470,7 +470,7 @@ gn desc out/unified '//src/controller(//build/toolchain/host:linux_x64_clang)'
 > **Note:** Some platforms that can be built as part of the unified build
 > require downloading additional tools. To add these to the build, the location
 > must be provided as a build argument. For example, to add the Simplelink
-> cc13x2_26x2 examples to the unified build, install
+> cc13xx_26xx examples to the unified build, install
 > [SysConfig](https://www.ti.com/tool/SYSCONFIG) and add the following build
 > arguments:
 >
diff --git a/docs/guides/ti/images/cc13x2_memmap.png b/docs/guides/ti/images/cc13x2_memmap.png
deleted file mode 100644
index a89aee7837e3aa..00000000000000
Binary files a/docs/guides/ti/images/cc13x2_memmap.png and /dev/null differ
diff --git a/docs/guides/ti/ti_factory_data_user_guide.md b/docs/guides/ti/ti_factory_data_user_guide.md
index c8168779d17119..50dfc41b15231d 100644
--- a/docs/guides/ti/ti_factory_data_user_guide.md
+++ b/docs/guides/ti/ti_factory_data_user_guide.md
@@ -33,29 +33,26 @@ Each element is described in more detail below:
    Developers can configure this per device. Elements in this file are from the
    specification.
 2. Matter Application with dummy factory data: Any TI Matter example application
-3. `BIM`/MCUBoot: Boot Image Manager/MCUBoot image used for OTA. This is built
-   with the Matter application and does not require additional build steps from
-   developers.
+3. MCUBoot: MCUBoot image used for OTA. This is built with the Matter
+   application and does not require additional build steps from developers.
 4. create_factory_data.py: Processes a factory data JSON file and generates a
    hex file with the unique factory data values configured in the JSON file.
 5. factory_data_trim.py: When using the custom factory data option, this script
    removes the dummy factory data which is required to be able to successfully
    compile the application.
 6. `oad`\_and_factory_data_merge_tool.py: Merges the factory data hex, Matter
-   application without factory data and `BIM`/MCUBoot image to generate a
-   functional hex that can be programmed onto the device.
+   application without factory data and MCUBoot image to generate a functional
+   hex that can be programmed onto the device.
 
 ## Flash memory layout
 
-![Memory Layout 1](images/cc13x2_memmap.png)
-
 ![Memory Layout 2](images/cc13x4_memmap.png)
 
 ## How to use
 
 Out of box factory data location is configured to be on second last page of
-flash. For CC13x2, the starting address is `0xAC000`. For CC13x4, the starting
-address is `0xFE800`. This can be configured in the linker file.
+flash. For CC13x4, the starting address is `0xFE800`. This can be configured in
+the linker file.
 
 To configure:
 
@@ -63,13 +60,13 @@ To configure:
    used by the application
 
 ```
-FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
+FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000fe800, LENGTH = 0x00000900
 ```
 
 ```
 /* Define base address for the DAC arrays and struct */
     PROVIDE (_factory_data_base_address =
-        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xAC000);
+        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xFE800);
 ```
 
 2. create_factory_data.py: Set the address of the start of the factory data
@@ -78,7 +75,7 @@ FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
 ```
     # there are 17 elements, each element will need 8 bytes in the struct
     # 4 for length of the element, and 4 for the pointer to the element
-    # factory data starts at 0xAC000 or 0xFE800, so the elements will
+    # factory data starts at 0xFE800, so the elements will
     # start 136 bytes after the start address
     factory_data_dict = json.load(args.factory_data_json_file[0])
     factory_data_schema = json.load(args.factory_data_schema[0])
@@ -88,23 +85,16 @@ FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
 
     struct_idx = 0
     values_idx = 0
-    if device_family == 'cc13x2_26x2':
-        value_address = 0xAC088
-    else:
-        value_address = 0xFE888
+    value_address = 0xFE888
 ```
 
 ```
-    if device_family == 'cc13x2_26x2':
-        subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xac000'])
-    else:
-        subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
+   subprocess.call(['objcopy', 'temp.bin','--input-target','binary','--output-target', 'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
 ```
 
 3. In the example's args.gni file, set 'custom_factory_data' to true
 
-It is recommended to keep a dedicated page (2 pages for CC13x4) for factory
-data.
+It is recommended to keep 2 dedicated pages for CC13x4 for factory data.
 
 ### Formatting certs and keys for JSON file
 
@@ -121,7 +111,6 @@ being copied into the JSON file.
 The example application can be built using the instructions in the example's
 README. The factory data from the JSON file will be formatted into a hex file
 that will then be merged into the final executable. The final executable will be
-named _{example-application}-`bim`.hex_ for CC13x2 and
-_{example-application}-mcuboot.hex_ for CC13x4, and the factory data that was
-inputted into the JSON file will be named
+named _{example-application}-mcuboot.hex_ for CC13x4, and the factory data that
+was inputted into the JSON file will be named
 _{example-application}-factory-data.hex_.
diff --git a/docs/guides/ti/ti_platform_overview.md b/docs/guides/ti/ti_platform_overview.md
index 47e140cfa06ba0..a26ade4d224b0a 100644
--- a/docs/guides/ti/ti_platform_overview.md
+++ b/docs/guides/ti/ti_platform_overview.md
@@ -48,8 +48,8 @@ In the TI example applications the Bluetooth Low Energy protocol is used to
 provision the Thread protocol to enable Matter communication. Then Thread is
 used for IP communication with other Matter devices.
 
-The TI applications leverage the Bluetooth Low Energy stack on the CC13X2 and
-CC26X2 families. This BLE software is distributed in binary form within the TI
+The TI applications leverage the Bluetooth Low Energy stack on the CC13XX and
+CC26XX families. This BLE software is distributed in binary form within the TI
 SimpleLink SDK. The BLE stack leverages code that is present in the device ROM
 for certain common BLE operations.
 
@@ -103,9 +103,9 @@ handled by the platform implementation files.
 Sample Matter applications are provided for the TI platform. These can be used
 as reference for your own application.
 
--   [lock-app](../../../examples/lock-app/cc13x2x7_26x2x7/README.md)
--   [pump-app](../../../examples/pump-app/cc13x2x7_26x2x7/README.md)
--   [pump-controller-app](../../../examples/pump-controller-app/cc13x2x7_26x2x7/README.md)
+-   [lock-app](../../../examples/lock-app/cc13x4_26x4/README.md)
+-   [pump-app](../../../examples/pump-app/cc13x4_26x4/README.md)
+-   [pump-controller-app](../../../examples/pump-controller-app/cc13x4_26x4/README.md)
 
 <hr>
 
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn b/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 6cf5941e79d2c4..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,143 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/all-clusters-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":all-clusters-app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "${project_dir}/chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-
-    # disabled until upstream generation is aligned
-    #"tiop_config.h",
-    #"tiop_config.c",
-
-    # not traditional source files
-    #"ti_utils_build_linker.cmd.genlibs",
-    #"syscfg_c.rov.xs",
-    #"ti_utils_runtime_model.gv",
-    #"ti_utils_runtime_Makefile",
-    #"ti_ble_app_config.opt",
-    #"ti_build_config.opt",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("all-clusters-app") {
-  output_name = "chip-${ti_simplelink_board}-all-clusters-example.out"
-
-  sources = [
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/air-quality-instance.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/concentration-measurement-instances.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/device-energy-management-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/oven-modes.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/ClusterManager.cpp",
-    "${project_dir}/main/Globals.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-    "${chip_root}/examples/energy-management-app/energy-management-common/include",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":all-clusters-app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 68d6f927224585..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,241 +0,0 @@
-# Matter CC1352 CC2652 All-clusters Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter CC1352 CC2652 All Clusters Example Application](#matter-cc1352-cc2652-all-clusters-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-![CC1352R1_LAUNCHXL](../../pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg)
-
-The CC13XX_26XX all clusters example application provides the basis to query and
-run commands for all currently implemented Matter clusters. This uses the
-open-source Matter implementation and the Texas Instruments SimpleLinkā„¢ CC13XX
-and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The all-clusters example is intended to serve both as a means to explore the
-workings of Matter, as well as a template for creating real products based on
-the Texas Instruments devices.
-
-## Device UI
-
-This example application has a simple User Interface to depict the state of the
-various Matter clusters and the attribute changes associated with them. The user
-LEDs on the LaunchPad are used for the onoff, levelcontrol and identify clusters
-to provide a working demonstration of the cluster attribute changes. The Green
-LED is used to represent attribute changes to endpoint 1 while the Red LED is
-used to represent changes to endpoint 2.
-
-Short presses (less than 1000ms) of the user buttons are used currently unused
-in the all-clusters application, but stubs are provided.
-
-Long presses (greater than 1000ms) of the user buttons are used for controlling
-BLE advertisements and resets. The left button (`BTN-1`) is used to perform a
-factory reset of the device. The Right button (`BTN-2`) is used to disable BLE
-advertisements (if enabled) or enable advertisements (if disabled).
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Thread network. The following sections assume that a Thread network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-2` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://github.com/project-chip/connectedhomeip
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[cc1352r1_launchxl]: https://www.ti.com/tool/LAUNCHXL-CC1352R1
-[e2e]: https://e2e.ti.com/support/wireless-connectivity/zigbee-and-thread
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 23c3aee1afb0bb..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,54 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = false
-
-# Disable FTD Build for all-clusters app to save Flash
-chip_openthread_ftd = false
-
-# Disable CHIP Logging
-chip_progress_logging = false
-
-# Dsiable verbose logs for all-clusters app to save Flash
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides b/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index 4f02a9fd40da9a..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RTOS        = scripting.addModule("/ti/drivers/RTOS");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var Thread      = scripting.addModule("/ti/thread/thread");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART        = scripting.addModule("/ti/drivers/UART");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART1       = UART.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-AESCTRDRBG1.aesctrObject.$name = "CONFIG_AESCTR_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* RTOS */
-RTOS.name = "FreeRTOS";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART1.$hardware     = system.deviceData.board.components.XDS110UART;
-UART1.$name         = "CONFIG_UART_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_1";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-RTOS.name = "FreeRTOS";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param1";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 234458d8638e48..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include <app/server/Server.h>
-
-#include "FreeRTOS.h"
-#include "Globals.h"
-#include <app/util/endpoint-config-api.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <static-supported-temperature-levels.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13x2_26x2/OTAImageProcessorImpl.h>
-#endif
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
-#endif
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (5000)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
-
-namespace {
-app::Clusters::TemperatureControl::AppSupportedTemperatureLevelsDelegate sAppSupportedTemperatureLevelsDelegate;
-}
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-#ifdef AUTO_PRINT_METRICS
-static void printMetrics(void)
-{
-    chip::DeviceLayer::ThreadMetrics *threadMetricsOut, *currThread;
-    uint64_t heapFree, heapUsed;
-
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapUsed(heapUsed);
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetCurrentHeapFree(heapFree);
-    DiagnosticDataProviderImpl::GetDefaultInstance().GetThreadMetrics(&threadMetricsOut);
-
-    PLAT_LOG("Heap Metrics\n Heap Free: %d Heap Used: %d", (uint32_t) heapFree, (uint32_t) heapUsed);
-
-    PLAT_LOG("Thread Metrics\n");
-
-    currThread = threadMetricsOut;
-    while (currThread)
-    {
-        PLAT_LOG("Task Name: %s ID: %d Stack Free Min: %d", currThread->name, (uint32_t) currThread->id,
-                 (uint32_t) currThread->stackFreeMinimum);
-
-        currThread = currThread->Next;
-    }
-
-    DiagnosticDataProviderImpl::GetDefaultInstance().ReleaseThreadMetrics(threadMetricsOut);
-}
-#endif
-
-void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    switch (event->Type)
-    {
-    case DeviceEventType::kCHIPoBLEConnectionEstablished:
-        PLAT_LOG("CHIPoBLE connection established");
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionClosed:
-        PLAT_LOG("CHIPoBLE disconnected");
-        break;
-
-    case DeviceEventType::kCommissioningComplete:
-        PLAT_LOG("Commissioning complete");
-        break;
-    }
-
-#ifdef AUTO_PRINT_METRICS
-    printMetrics();
-#endif
-}
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13x2_26x2LogInit();
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    chip::Server::GetInstance().Init(initParams);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    // We only have network commissioning on endpoint 0.
-    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
-
-    // Register a function to receive events from the CHIP device layer.  Note that calls to
-    // this function will happen on the CHIP event loop thread, not the app_main thread.
-    PlatformMgr().AddEventHandler(DeviceEventCallback, reinterpret_cast<intptr_t>(nullptr));
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    app::Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
deleted file mode 100644
index df12e131ca069a..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-#include "ClusterManager.h"
-#include "Globals.h"
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app/CommandHandler.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/util/basic-types.h>
-
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
-#endif
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Inet;
-using namespace ::chip::System;
-using namespace ::chip::DeviceLayer;
-
-constexpr uint32_t kIdentifyTimerDelayMS     = 250;
-constexpr uint32_t kIdentifyTimerDelayPerSec = 4;
-ClusterManager ClusterManager::sCluster;
-
-#define ENDPOINT_ID_0 (0)
-#define ENDPOINT_ID_1 (1)
-#define ENDPOINT_ID_2 (2)
-
-void OnIdentifyTriggerEffect(Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kBlink");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kBreathe");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kOkay");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Clusters::Identify::EffectIdentifierEnum::kChannelChange");
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-        break;
-    }
-    return;
-}
-
-Identify gIdentify0 = {
-    chip::EndpointId{ 0 },
-    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
-    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
-    Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
-    OnIdentifyTriggerEffect,
-};
-
-Identify gIdentify1 = {
-    chip::EndpointId{ 1 },
-    [](Identify *) { PLAT_LOG("onIdentifyStart"); },
-    [](Identify *) { PLAT_LOG("onIdentifyStop"); },
-    Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
-    OnIdentifyTriggerEffect,
-};
-
-void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::OnOff::Attributes;
-
-    VerifyOrExit(attributeId == OnOff::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    // At this point we can assume that value points to a bool value.
-    mEndpointOnOffState[endpointId - 1] = *value;
-    endpointId == ENDPOINT_ID_1 ? LED_write(sAppGreenHandle, *value) : LED_write(sAppRedHandle, *value);
-
-exit:
-    return;
-}
-
-void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::LevelControl::Attributes;
-
-    bool onOffState    = mEndpointOnOffState[endpointId - 1];
-    uint8_t brightness = onOffState ? *value : 0;
-
-    VerifyOrExit(brightness > 0, PLAT_LOG("Brightness set to 0, ignoring"));
-    VerifyOrExit(attributeId == CurrentLevel::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    if (brightness > LED_BRIGHTNESS_MAX)
-    {
-        brightness = LED_BRIGHTNESS_MAX;
-    }
-
-    endpointId == ENDPOINT_ID_1 ? LED_setOn(sAppGreenHandle, brightness) : LED_setOn(sAppRedHandle, brightness);
-
-exit:
-    return;
-}
-
-void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    using namespace app::Clusters::ColorControl::Attributes;
-
-    VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id,
-                 PLAT_LOG("Unhandled AttributeId ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2,
-                 PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    if (endpointId == ENDPOINT_ID_1)
-    {
-        uint8_t hue, saturation;
-        if (attributeId == CurrentHue::Id)
-        {
-            hue = *value;
-            /* Read Current Saturation value when Attribute change callback for HUE Attribute */
-            CurrentSaturation::Get(endpointId, &saturation);
-        }
-        else
-        {
-            saturation = *value;
-            /* Read Current Hue value when Attribute change callback for SATURATION Attribute */
-            CurrentHue::Get(endpointId, &hue);
-        }
-        PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation);
-    }
-exit:
-    return;
-}
-
-void ClusterManager::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint16_t size,
-                                                           uint8_t * value)
-{
-    if (attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id && size == 2)
-    {
-        uint16_t identifyTime;
-        memcpy(&identifyTime, value, size);
-        if (identifyTime)
-        {
-            // Currently we have no separate indicator LEDs on each endpoints.
-            // We are using LED1 for endpoint 0,1 and LED2 for endpoint 2
-            if (endpointId == ENDPOINT_ID_2)
-            {
-                LED_startBlinking(sAppGreenHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
-            }
-            else
-            {
-                LED_startBlinking(sAppRedHandle, kIdentifyTimerDelayMS, identifyTime * kIdentifyTimerDelayPerSec);
-            }
-        }
-        else
-        {
-            bool onOffState;
-            endpointId == ENDPOINT_ID_0 ? onOffState = mEndpointOnOffState[0] : onOffState = mEndpointOnOffState[endpointId - 1];
-            endpointId == ENDPOINT_ID_2 ? LED_write(sAppRedHandle, onOffState) : LED_write(sAppGreenHandle, onOffState);
-        }
-    }
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp
deleted file mode 100644
index 01a945e1a33d12..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/Globals.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "Globals.h"
-
-LED_Handle sAppRedHandle;
-LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index f2668eca426677..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
- *
- *    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.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "Globals.h"
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "ClusterManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/CommandHandler.h>
-#include <app/util/af-types.h>
-#include <app/util/basic-types.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    EndpointId endpoint     = attributePath.mEndpointId;
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    PLAT_LOG("MatterPostAttributeChangeCallback - Cluster ID: " ChipLogFormatMEI
-             ", EndPoint ID: '0x%02x', Attribute ID: " ChipLogFormatMEI,
-             ChipLogValueMEI(clusterId), endpoint, ChipLogValueMEI(attributeId));
-
-    switch (clusterId)
-    {
-    case OnOff::Id:
-        ClusterMgr().OnOnOffPostAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-
-    case Identify::Id:
-        ClusterMgr().OnIdentifyPostAttributeChangeCallback(endpoint, attributeId, size, value);
-        break;
-
-    case LevelControl::Id:
-        ClusterMgr().OnLevelControlAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-
-    case ColorControl::Id:
-        ClusterMgr().OnColorControlAttributeChangeCallback(endpoint, attributeId, value);
-        break;
-    default:
-        PLAT_LOG("Unhandled cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-        break;
-    }
-}
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index f7302b6efd10cd..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-#endif // APP_CONFIG_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index ad9e93ee3ad1a5..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- *    Copyright (c) 2018 Nest Labs, Inc.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } BoltLockEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index 6ab8ca425ddbdf..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostEvent(const AppEvent * event);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index 97357823332342..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13X2_26X2_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
-
-// All clusters app has 3 group endpoints. This needs to defined here so that
-// CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
-#define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
deleted file mode 100644
index 1599ef1ef19264..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/ClusterManager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright 2021, Cypress Semiconductor Corporation (an Infineon company)
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- * @file ClusterManager.h
- *
- * Declarations for the ClusterManager callbacks for this application
- *
- **/
-
-#pragma once
-
-#include <app/util/af-types.h>
-#include <app/util/basic-types.h>
-#include <platform/CHIPDeviceLayer.h>
-
-class ClusterManager
-{
-public:
-    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnColorControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint16_t size,
-                                               uint8_t * value);
-
-private:
-    friend ClusterManager & ClusterMgr(void);
-    bool mEndpointOnOffState[2];
-    static ClusterManager sCluster;
-};
-
-inline ClusterManager & ClusterMgr(void)
-{
-    return ClusterManager::sCluster;
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h
deleted file mode 100644
index 43f9362e0341b9..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/Globals.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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 <ti/drivers/apps/LED.h>
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13x2_26x2LogInit(void);
-void cc13x2_26x2Log(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13x2_26x2Log(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-extern LED_Handle sAppRedHandle;
-extern LED_Handle sAppGreenHandle;
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
deleted file mode 100644
index 30f5633cc3bc7f..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 8311c8990aa5c6..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-#include <ti/drivers/UART.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc800)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    UART_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
index 513bf01de715d4..4cb76380ce2df4 100644
--- a/examples/all-clusters-app/cc13x4_26x4/README.md
+++ b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
index 24d08943edb0ef..3e338474833eab 100644
--- a/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
+++ b/examples/all-clusters-app/cc13x4_26x4/main/AppTask.cpp
@@ -40,8 +40,8 @@
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPPlatformMemory.h>
 
-#ifdef AUTO_PRINT_METRICS
-#include <platform/cc13x2_26x2/DiagnosticDataProviderImpl.h>
+#if AUTO_PRINT_METRICS
+// #include <platform/cc13xx_26xx/DiagnosticDataProviderImpl.h>
 #endif
 #include <app/server/OnboardingCodesUtil.h>
 
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/.gn b/examples/lighting-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn b/examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 1292b5f5e9626c..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/lighting-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-  public_configs = [ ":lighting_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("lighting_app") {
-  output_name = "chip-${ti_simplelink_board}-lighting-example.out"
-
-  sources = [
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/src/AppTask.cpp",
-    "${project_dir}/src/LightingManager.cpp",
-    "${project_dir}/src/ZclCallbacks.cpp",
-    "${project_dir}/src/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/lighting-app/lighting-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":lighting_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index f6d77a423ac37a..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,297 +0,0 @@
-# Matter Lighting Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Lighting Example Application](#matter-lighting-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [Running the Example](#running-the-example)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX lighting example application provides a working demonstration of
-a connected light device. This uses the open-source Matter implementation and
-the Texas Instruments SimpleLinkā„¢ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The lighting example is intended to serve both as a means to explore the
-workings of Matter, as well as a template for creating real products based on
-the Texas Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | Light is turned on                     |
-| Left Button (`BTN-1`) Press (more than 1000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Light is turned off                    |
-| Right Button (`BTN-2`) Press (more than 1000 ms) | BLE Advertisement (Enable/Disable)     |
-| Red LED Solid On State                           | Light is turned on                     |
-| Red LED Off State                                | Light is turned off                    |
-| Green LED Blinking State                         | Identify Trigger Effect in progress    |
-| Green LED Off State                              | No Identify Trigger Effect in progress |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the lighting device onto the
-network and control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the light device onto the Matter network. Run the following command
-on the CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-2`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2**
-
-Send commands to the lighting app. Here are some example commands:
-
-On
-
-```
-./chip-tool onoff on <nodeID> 1
-./chip-tool onoff toggee <nodeID> 1 (assuming the light is off)
-
-```
-
-Off
-
-```
-./chip-tool onoff off <nodeID> 1
-./chip-tool onoff toggle <nodeID> 1 (assuming the light is on)
-
-```
-
-Identify
-
-```
-./chip-tool identify identify <IdentifyTime> <nodeID> 1   e.g.  ./chip-tool identify identify 100 1 1
-
-./chip-tool identify trigger-effect <EffectIdentifier> <EffectVariant> <nodeID> <endpointID>  e.g.  ./chip-tool identify trigger-effect 0x0000 0 1 1
-
-```
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/args.gni b/examples/lighting-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 8f2c82446b1cf0..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-chip_openthread_ftd = false
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-chip_progress_logging = false
-
-#chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8005"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/build_overrides b/examples/lighting-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg b/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 88e08c63321770..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h
deleted file mode 100644
index a818b21d641875..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#define ACTUATOR_MOVEMENT_PERIOD_MS 1000
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h
deleted file mode 100644
index 9c55e1bf674531..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppEvent.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-        kEventType_Light,
-        kEventType_Timer,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventIdentifyType
-    {
-        kAppEventIdentifyType_Blink = 0,
-        kAppEventIdentifyType_Breathe,
-        kAppEventIdentifyType_Okay,
-        kAppEventIdentifyType_Finish,
-        kAppEventIdentifyType_Stop,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } TimerEvent;
-
-        struct
-        {
-            uint8_t Action;
-            int32_t Actor;
-            void * Context;
-        } LightEvent;
-
-        struct
-        {
-            enum AppEventIdentifyType Type;
-        } IdentifyEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp
deleted file mode 100644
index 7d84e656927d09..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/clusters/on-off-server/on-off-server.h>
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-#include <app/util/attribute-storage.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-#define IDENTIFY_TRIGGER_EFFECT_BLINK 0
-#define IDENTIFY_TRIGGER_EFFECT_BREATHE 1
-#define IDENTIFY_TRIGGER_EFFECT_OKAY 2
-#define IDENTIFY_TRIGGER_EFFECT_FINISH_STOP 3
-
-static uint32_t identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-
-#define LIGHTING_APPLICATION_IDENTIFY_ENDPOINT 1
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-::Identify stIdentify = { LIGHTING_APPLICATION_IDENTIFY_ENDPOINT, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (1)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (1)
-            ;
-    }
-    return ret;
-}
-
-// Action initiated callback
-void uiTurnOn(void)
-{
-    PLAT_LOG("Light On initiated");
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-// Action completed callback
-void uiTurnedOn(void)
-{
-    PLAT_LOG("Light On completed");
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-}
-
-// Action initiated callback
-void uiTurnOff(void)
-{
-    PLAT_LOG("Light Off initiated");
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-// Action completed callback
-void uiTurnedOff(void)
-{
-    PLAT_LOG("Light Off completed");
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOff(sAppRedHandle);
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (1)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (1)
-            ;
-    }
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (1)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (1)
-            ;
-    }
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    ret = LightMgr().Init();
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("LightMgr().Init() failed");
-        while (1)
-            ;
-    }
-
-    LightMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (1)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
-{
-    if (aAction == LightingManager::ON_ACTION)
-    {
-        uiTurnOn();
-    }
-    else if (aAction == LightingManager::OFF_ACTION)
-    {
-        uiTurnOff();
-    }
-}
-
-void AppTask::ActionCompleted(LightingManager::Action_t aAction)
-{
-    if (aAction == LightingManager::ON_ACTION)
-    {
-        uiTurnedOn();
-    }
-    else if (aAction == LightingManager::OFF_ACTION)
-    {
-        uiTurnedOff();
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (sAppEventQueue != NULL)
-    {
-        BaseType_t status;
-        if (xPortIsInsideInterrupt())
-        {
-            BaseType_t higherPrioTaskWoken = pdFALSE;
-            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
-
-#ifdef portYIELD_FROM_ISR
-            portYIELD_FROM_ISR(higherPrioTaskWoken);
-#elif portEND_SWITCHING_ISR // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-            portEND_SWITCHING_ISR(higherPrioTaskWoken);
-#else                       // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-#error "Must have portYIELD_FROM_ISR or portEND_SWITCHING_ISR"
-#endif // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-        }
-        else
-        {
-            status = xQueueSend(sAppEventQueue, aEvent, 1);
-        }
-
-        if (status != pdTRUE)
-        {
-            PLAT_LOG("Failed to post event to app task event queue");
-        }
-    }
-    else
-    {
-        PLAT_LOG("Event Queue is NULL should never happen");
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    int32_t actor;
-
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_Light: {
-        actor = aEvent->LightEvent.Actor;
-        LightMgr().IsLightOn() ? LightMgr().InitiateAction(actor, LightingManager::OFF_ACTION)
-                               : LightMgr().InitiateAction(actor, LightingManager::ON_ACTION);
-    }
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            actor = AppEvent::kEventType_ButtonLeft;
-            LightMgr().InitiateAction(actor, LightingManager::ON_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            actor = AppEvent::kEventType_ButtonRight;
-            LightMgr().InitiateAction(actor, LightingManager::OFF_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        switch (identify_trigger_effect)
-        {
-        case IDENTIFY_TRIGGER_EFFECT_BLINK:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 1000, LED_BLINK_FOREVER);
-            break;
-        case IDENTIFY_TRIGGER_EFFECT_BREATHE:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 100, LED_BLINK_FOREVER);
-            break;
-        case IDENTIFY_TRIGGER_EFFECT_OKAY:
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-            LED_startBlinking(sAppGreenHandle, 500, LED_BLINK_FOREVER);
-            break;
-        default:
-            break;
-        }
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_BLINK;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Starting breathe identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_BREATHE;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Starting okay identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_OKAY;
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-        IdentifyStopHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        identify_trigger_effect = IDENTIFY_TRIGGER_EFFECT_FINISH_STOP;
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h b/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h
deleted file mode 100644
index c82a122fef4ea8..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/AppTask.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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 <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "LightingManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-// Application-defined error codes in the CHIP_ERROR space.
-#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
-#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
-#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
-#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
-#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
-#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
-#define APP_ERROR_ALLOCATION_FAILED CHIP_APPLICATION_ERROR(0x07)
-struct Identify;
-
-class AppTask
-{
-
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    static AppTask & GetAppTask() { return sAppTask; }
-
-    void PostLightActionRequest(int32_t aActor, LightingManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(LightingManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(LightingManager::Action_t aAction);
-
-    void DispatchEvent(AppEvent * event);
-    static void UpdateClusterState(intptr_t context);
-    static void SingleButtonEventHandler(AppEvent * aEvent);
-    static void ButtonTimerEventHandler(AppEvent * aEvent);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp
deleted file mode 100644
index ed5fc52e7e5638..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "LightingManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include <FreeRTOS.h>
-
-using namespace chip;
-using namespace ::chip::DeviceLayer;
-
-LightingManager LightingManager::sLight;
-
-TimerHandle_t sLightTimer;
-
-CHIP_ERROR LightingManager::Init()
-{
-    // Create FreeRTOS sw timer for light timer.
-    sLightTimer = xTimerCreate("lightTmr",       // Just a text name, not used by the RTOS kernel
-                               1,                // == default timer period (mS)
-                               false,            // no timer reload (==one-shot)
-                               (void *) this,    // init timer id = light obj context
-                               TimerEventHandler // timer callback handler
-    );
-
-    if (sLightTimer == NULL)
-    {
-        PLAT_LOG("sLightTimer timer create failed");
-    }
-
-    bool currentLedState;
-    // read current on/off value on endpoint one.
-    OnOffServer::Instance().getOnOffValue(1, &currentLedState);
-
-    mState = currentLedState ? kState_OnCompleted : kState_OffCompleted;
-
-    return CHIP_NO_ERROR;
-}
-
-void LightingManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool LightingManager::IsActionInProgress()
-{
-    return (mState == kState_OffInitiated || mState == kState_OnInitiated);
-}
-
-bool LightingManager::IsLightOn()
-{
-    return (mState == kState_OnCompleted);
-}
-
-bool LightingManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Turn On/Off Action only when the previous one is complete.
-    if (mState == kState_OffCompleted && aAction == ON_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_OnInitiated;
-    }
-    else if (mState == kState_OnCompleted && aAction == OFF_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_OffInitiated;
-    }
-
-    if (action_initiated)
-    {
-        StartTimer(ACTUATOR_MOVEMENT_PERIOD_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void LightingManager::StartTimer(uint32_t aTimeoutMs)
-{
-    if (xTimerIsTimerActive(sLightTimer))
-    {
-        PLAT_LOG("app timer already started!");
-        CancelTimer();
-    }
-
-    // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
-    // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLightTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
-    {
-        PLAT_LOG("sLightTimer timer start() failed");
-    }
-}
-
-void LightingManager::CancelTimer(void)
-{
-    if (xTimerStop(sLightTimer, 0) == pdFAIL)
-    {
-        PLAT_LOG("sLightTimer stop() failed");
-    }
-}
-
-void LightingManager::TimerEventHandler(TimerHandle_t xTimer)
-{
-    // Get light obj context from timer id.
-    LightingManager * light = static_cast<LightingManager *>(pvTimerGetTimerID(xTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sLightTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type               = AppEvent::kEventType_AppEvent;
-    event.LightEvent.Context = light;
-
-    event.Handler = ActuatorMovementTimerEventHandler;
-
-    AppTask::GetAppTask().PostEvent(&event);
-}
-
-void LightingManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    LightingManager * light = static_cast<LightingManager *>(aEvent->LightEvent.Context);
-
-    if (light->mState == kState_OffInitiated)
-    {
-        light->mState   = kState_OffCompleted;
-        actionCompleted = OFF_ACTION;
-        OnOffServer::Instance().setOnOffValue(1, 0, false);
-    }
-    else if (light->mState == kState_OnInitiated)
-    {
-        light->mState   = kState_OnCompleted;
-        actionCompleted = ON_ACTION;
-        OnOffServer::Instance().setOnOffValue(1, 1, false);
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (light->mActionCompleted_CB)
-        {
-            light->mActionCompleted_CB(actionCompleted);
-        }
-    }
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h b/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h
deleted file mode 100644
index 818feed45ee87a..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/LightingManager.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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 <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-#include "timers.h" // provides FreeRTOS timer support
-#include <app/clusters/on-off-server/on-off-server.h>
-
-#include <lib/core/CHIPError.h>
-
-class LightingManager
-{
-public:
-    enum Action_t
-    {
-        ON_ACTION = 0,
-        OFF_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_OffInitiated = 0,
-        kState_OffCompleted,
-        kState_OnInitiated,
-        kState_OnCompleted,
-    } State;
-
-    CHIP_ERROR Init();
-    bool IsLightOn();
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-    static void OnTriggerOffWithEffect(OnOffEffect * effect);
-
-private:
-    friend LightingManager & LightMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    void CancelTimer(void);
-    void StartTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t xTimer);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-    static void OffEffectTimerEventHandler(AppEvent * aEvent);
-
-    static LightingManager sLight;
-};
-
-inline LightingManager & LightMgr(void)
-{
-    return LightingManager::sLight;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
deleted file mode 100644
index 7bb20a45944545..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,75 +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.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "LightingManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-
-    if (clusterId == OnOff::Id && attributeId == OnOff::Attributes::OnOff::Id)
-    {
-        LightMgr().InitiateAction(AppEvent::kEventType_Light, *value ? LightingManager::ON_ACTION : LightingManager::OFF_ACTION);
-    }
-    else if (clusterId == Identify::Id)
-    {
-        ChipLogProgress(Zcl, "Identify attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
-                        ChipLogValueMEI(attributeId), type, *value, size);
-    }
-    else if (clusterId == Groups::Id)
-    {
-        ChipLogProgress(Zcl, "Groups attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
-                        ChipLogValueMEI(attributeId), type, *value, size);
-    }
-}
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    // TODO: implement any additional Cluster Server init actions
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp b/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp
deleted file mode 100644
index 4fdb88703acab6..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/src/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc600)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (1)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (1)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (1)
-        ;
-}
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/lighting-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/lock-app/cc13x2x7_26x2x7/.gn b/examples/lock-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/BUILD.gn b/examples/lock-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 8cf4f38dc771f2..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/lock-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-  public_configs = [ ":lock_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("lock_app") {
-  output_name = "chip-${ti_simplelink_board}-lock-example.out"
-
-  sources = [
-    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
-    "${project_dir}/src/AppTask.cpp",
-    "${project_dir}/src/LockManager.cpp",
-    "${project_dir}/src/ZclCallbacks.cpp",
-    "${project_dir}/src/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/lock-app/lock-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${chip_root}/examples/providers/",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":lock_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 7b056d2cab29b5..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,326 +0,0 @@
-# Matter Lock Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Lock Example Application](#matter-lock-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX lock example application provides a working demonstration of a
-connected door lock device. This uses the open-source Matter implementation and
-the Texas Instruments SimpleLinkā„¢ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The lock example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                            |
-| ------------------------------------------------ | ---------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | Change state to unlocked                 |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Change state to locked                   |
-| Left Button (`BTN-1`) Press (more than 1000 ms)  | Factory Reset                            |
-| Right Button (`BTN-2`) Press (more than 1000 ms) | BLE Advertisement (Enable/Disable)       |
-| Red & Green LED Blinking State                   | Lock state transition to locked/unlocked |
-| Red LED On State                                 | Lock state locked                        |
-| Red & Green LED Off State                        | Lock state unlocked                      |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-2`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** The example Doorlock cluster operations have the following format:
-
-```
-./chip-tool doorlock   <attribute-name> <attribute-values> <destination-id> <endpoint-id-ignored-for-group-commands>
-./chip-tool doorlock set-user <OperationType> <UserIndex> <UserName> <UserUniqueId> <UserStatus> <UserType> <CredentialRule> <destination-id> <endpoint-id-ignored-for-group-commands>
-./chip-tool <doorlock set-credential> <OperationType> <Credential> <CredentialData> <UserIndex> <UserStatus> <UserType> <destination-id> <endpoint-id-ignored-for-group-commands>
-```
-
-Send commands to the lock-app. Here are some example commands:
-
-Set a new user "`TST`" with user index of 1 with a default pin of 123456
-
-```
-./chip-tool doorlock set-user 0 1 `TST` 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
-./chip-tool doorlock set-credential 0 '{ "credentialType" : 1 , "credentialIndex" : 1 }' 123456 1 null null 1 1 --timedInteractionTimeoutMs 1000
-```
-
-Require a pin mode for lock operations:
-
-```
-./chip-tool doorlock write require-pinfor-remote-operation 1 1 1
-```
-
-Lock the Door
-
-```
-./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
-```
-
-Unlock the door
-
-```
-./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-2` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index b10e4def1a1a7c..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-chip_openthread_ftd = false
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-chip_progress_logging = false
-
-#chip_detail_logging = false
-#chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/lock-app/cc13x2x7_26x2x7/build_overrides b/examples/lock-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg b/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 6e6a2562178da4..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h
deleted file mode 100644
index a818b21d641875..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#define ACTUATOR_MOVEMENT_PERIOD_MS 1000
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h
deleted file mode 100644
index dc4ce143338e1e..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppEvent.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } BoltLockEvent;
-
-        struct
-        {
-            uint8_t Action;
-            int32_t Actor;
-        } LockEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp
deleted file mode 100644
index 380b05e32ca668..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <DeviceInfoProviderImpl.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app-common/zap-generated/attributes/Accessors.h>
-
-#include <app/clusters/door-lock-server/door-lock-server.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-#include <app/util/attribute-storage.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-using namespace ::chip::app::Clusters::DoorLock;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-static DeviceInfoProviderImpl sExampleDeviceInfoProvider;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-::Identify stIdentify = { 0, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (1)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (1)
-            ;
-    }
-    return ret;
-}
-
-void uiLocking(void)
-{
-    PLAT_LOG("Lock initiated");
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void uiLocked(void)
-{
-    PLAT_LOG("Lock completed");
-    LED_stopBlinking(sAppGreenHandle);
-    LED_setOff(sAppGreenHandle);
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-}
-
-void uiUnlocking(void)
-{
-    PLAT_LOG("Unlock initiated");
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void uiUnlocked(void)
-{
-    PLAT_LOG("Unlock completed");
-    LED_stopBlinking(sAppGreenHandle);
-    LED_setOff(sAppGreenHandle);
-    LED_stopBlinking(sAppRedHandle);
-    LED_setOff(sAppRedHandle);
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (1)
-            ;
-    }
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (1)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (1)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (1)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    // Initialize info provider
-    sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
-    SetDeviceInfoProvider(&sExampleDeviceInfoProvider);
-
-    Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    PlatformMgr().LockChipStack();
-    {
-        uint8_t numberOfCredentialsPerUser      = 0;
-        uint16_t numberOfUsers                  = 0;
-        uint8_t numberOfWeekdaySchedulesPerUser = 0;
-        uint8_t numberOfYeardaySchedulesPerUser = 0;
-        uint8_t numberOfHolidaySchedules        = 0;
-        chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state;
-        EndpointId endpointId{ 1 };
-
-        if (!DoorLockServer::Instance().GetNumberOfCredentialsSupportedPerUser(endpointId, numberOfCredentialsPerUser))
-        {
-            numberOfCredentialsPerUser = 5;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfUserSupported(endpointId, numberOfUsers))
-        {
-            numberOfUsers = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfWeekDaySchedulesPerUserSupported(endpointId, numberOfWeekdaySchedulesPerUser))
-        {
-            numberOfWeekdaySchedulesPerUser = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfYearDaySchedulesPerUserSupported(endpointId, numberOfYeardaySchedulesPerUser))
-        {
-            numberOfYeardaySchedulesPerUser = 10;
-        }
-
-        if (!DoorLockServer::Instance().GetNumberOfHolidaySchedulesSupported(endpointId, numberOfHolidaySchedules))
-        {
-            numberOfHolidaySchedules = 10;
-        }
-
-        Attributes::LockState::Get(endpointId, state);
-        ret = LockMgr().Init(state,
-                             CC13X2_26X2DoorLock::LockInitParams::ParamBuilder()
-                                 .SetNumberOfUsers(numberOfUsers)
-                                 .SetNumberOfCredentialsPerUser(numberOfCredentialsPerUser)
-                                 .SetNumberOfWeekdaySchedulesPerUser(numberOfWeekdaySchedulesPerUser)
-                                 .SetNumberOfYeardaySchedulesPerUser(numberOfYeardaySchedulesPerUser)
-                                 .SetNumberOfHolidaySchedules(numberOfHolidaySchedules)
-                                 .GetLockParam());
-
-        if (state.Value() == DlLockState::kLocked)
-        {
-            uiLocked();
-        }
-        else
-        {
-            uiUnlocked();
-        }
-    }
-
-    PlatformMgr().UnlockChipStack();
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("LockMgr().Init() failed");
-        while (1)
-            ;
-    }
-
-    LockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    LockMgr().ReadConfigValues();
-
-    while (1)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGCLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(LockManager::Action_t aAction)
-{
-    if (aAction == LockManager::LOCK_ACTION)
-    {
-        uiLocking();
-    }
-    else if (aAction == LockManager::UNLOCK_ACTION)
-    {
-        uiUnlocking();
-    }
-}
-
-void AppTask::ActionCompleted(LockManager::Action_t aAction)
-{
-    if (aAction == LockManager::LOCK_ACTION)
-    {
-        uiLocked();
-    }
-    else if (aAction == LockManager::UNLOCK_ACTION)
-    {
-        uiUnlocked();
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (sAppEventQueue != NULL)
-    {
-        BaseType_t status;
-        if (xPortIsInsideInterrupt())
-        {
-            BaseType_t higherPrioTaskWoken = pdFALSE;
-            status                         = xQueueSendFromISR(sAppEventQueue, aEvent, &higherPrioTaskWoken);
-
-#ifdef portYIELD_FROM_ISR
-            portYIELD_FROM_ISR(higherPrioTaskWoken);
-#elif portEND_SWITCHING_ISR // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-            portEND_SWITCHING_ISR(higherPrioTaskWoken);
-#else                       // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-#error "Must have portYIELD_FROM_ISR or portEND_SWITCHING_ISR"
-#endif // portYIELD_FROM_ISR or portEND_SWITCHING_ISR
-        }
-        else
-        {
-            status = xQueueSend(sAppEventQueue, aEvent, 1);
-        }
-
-        if (status != pdTRUE)
-        {
-            PLAT_LOG("Failed to post event to app task event queue");
-        }
-    }
-    else
-    {
-        PLAT_LOG("Event Queue is NULL should never happen");
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            LockMgr().InitiateAction(LockManager::UNLOCK_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            LockMgr().InitiateAction(LockManager::LOCK_ACTION);
-        }
-        else if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
-        {
-            // Enable BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, 500, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        LED_setOff(sAppGreenHandle);
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h b/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h
deleted file mode 100644
index 7778fd5f2a5e1f..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/AppTask.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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 <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "LockManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-// Application-defined error codes in the CHIP_ERROR space.
-#define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
-#define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)
-#define APP_ERROR_UNHANDLED_EVENT CHIP_APPLICATION_ERROR(0x03)
-#define APP_ERROR_CREATE_TIMER_FAILED CHIP_APPLICATION_ERROR(0x04)
-#define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
-#define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
-#define APP_ERROR_ALLOCATION_FAILED CHIP_APPLICATION_ERROR(0x07)
-
-struct Identify;
-
-class AppTask
-{
-
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostLockActionRequest(int32_t aActor, LockManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    // should this be done by BoltLock Manager? I don't want to unravel this spaghetti quite yet
-    static void ActionInitiated(LockManager::Action_t aAction);
-    static void ActionCompleted(LockManager::Action_t aAction);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-    bool mSyncClusterToButtonAction;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp
deleted file mode 100644
index babc79cfc5b5f7..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.cpp
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "LockManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "platform/KeyValueStoreManager.h"
-#include <FreeRTOS.h>
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <cstring>
-#include <lib/support/logging/CHIPLogging.h>
-
-LockManager LockManager::sLock;
-
-TimerHandle_t sLockTimer;
-
-using namespace CC13X2_26X2DoorLock::LockInitParams;
-using namespace chip::DeviceLayer::PersistedStorage;
-
-// persisted storage keys
-const char LockUser[]         = "a/lu";
-const char Credential[]       = "a/c";
-const char LockUserName[]     = "a/lun";
-const char CredentialData[]   = "a/cd";
-const char UserCredentials[]  = "a/uc";
-const char WeekDaySchedules[] = "a/wds";
-const char YearDaySchedules[] = "a/yds";
-const char HolidaySchedules[] = "a/hs";
-
-CHIP_ERROR LockManager::Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state, LockParam lockParam)
-{
-
-    LockParams = lockParam;
-
-    if (LockParams.numberOfUsers > kMaxUsers)
-    {
-        PLAT_LOG("Max number of users is greater than %d, the maximum amount of users currently supported on this platform",
-                 kMaxUsers);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfCredentialsPerUser > kMaxCredentialsPerUser)
-    {
-        PLAT_LOG("Max number of credentials per user is greater than %d, the maximum amount of users currently supported on this "
-                 "platform",
-                 kMaxCredentialsPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfWeekdaySchedulesPerUser > kMaxWeekdaySchedulesPerUser)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxWeekdaySchedulesPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfYeardaySchedulesPerUser > kMaxYeardaySchedulesPerUser)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxYeardaySchedulesPerUser);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    if (LockParams.numberOfHolidaySchedules > kMaxHolidaySchedules)
-    {
-        PLAT_LOG("Max number of schedules is greater than %d, the maximum amount of schedules currently supported on this platform",
-                 kMaxHolidaySchedules);
-        return APP_ERROR_ALLOCATION_FAILED;
-    }
-
-    // Create FreeRTOS sw timer for lock timer.
-    sLockTimer = xTimerCreate("lockTmr",        // Just a text name, not used by the RTOS kernel
-                              1,                // == default timer period (mS)
-                              false,            // no timer reload (==one-shot)
-                              (void *) this,    // init timer id = lock obj context
-                              TimerEventHandler // timer callback handler
-    );
-
-    if (sLockTimer == NULL)
-    {
-        PLAT_LOG("sLockTimer timer create failed");
-        return APP_ERROR_CREATE_TIMER_FAILED;
-    }
-
-    if (state.Value() == DlLockState::kUnlocked)
-    {
-        mState = kState_UnlockCompleted;
-    }
-    else
-    {
-        mState = kState_LockCompleted;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-bool LockManager::IsValidUserIndex(uint16_t userIndex)
-{
-    return (userIndex < kMaxUsers);
-}
-
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
-{
-    if (CredentialTypeEnum::kProgrammingPIN == type)
-    {
-        return (0 == credentialIndex); // 0 is required index for Programming PIN
-    }
-    return (credentialIndex < kMaxCredentialsPerUser);
-}
-
-bool LockManager::IsValidWeekdayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxWeekdaySchedulesPerUser);
-}
-
-bool LockManager::IsValidYeardayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxYeardaySchedulesPerUser);
-}
-
-bool LockManager::IsValidHolidayScheduleIndex(uint8_t scheduleIndex)
-{
-    return (scheduleIndex < kMaxHolidaySchedules);
-}
-
-bool LockManager::ReadConfigValues()
-{
-    size_t outLen;
-    KeyValueStoreMgr().Get(LockUser, reinterpret_cast<void *>(&mLockUsers),
-                           sizeof(EmberAfPluginDoorLockUserInfo) * ArraySize(mLockUsers), &outLen);
-
-    KeyValueStoreMgr().Get(Credential, reinterpret_cast<void *>(&mLockCredentials),
-                           sizeof(EmberAfPluginDoorLockCredentialInfo) * ArraySize(mLockCredentials), &outLen);
-
-    KeyValueStoreMgr().Get(LockUserName, reinterpret_cast<void *>(mUserNames), sizeof(mUserNames), &outLen);
-
-    KeyValueStoreMgr().Get(CredentialData, reinterpret_cast<void *>(mCredentialData), sizeof(mCredentialData), &outLen);
-
-    KeyValueStoreMgr().Get(UserCredentials, reinterpret_cast<void *>(mCredentials),
-                           sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, &outLen);
-
-    KeyValueStoreMgr().Get(WeekDaySchedules, reinterpret_cast<void *>(mWeekdaySchedule),
-                           sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
-                               LockParams.numberOfUsers,
-                           &outLen);
-
-    KeyValueStoreMgr().Get(YearDaySchedules, reinterpret_cast<void *>(mYeardaySchedule),
-                           sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser *
-                               LockParams.numberOfUsers,
-                           &outLen);
-
-    KeyValueStoreMgr().Get(HolidaySchedules, reinterpret_cast<void *>(&(mHolidaySchedule)),
-                           sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules, &outLen);
-
-    return true;
-}
-
-void LockManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool LockManager::InitiateAction(Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Turn Lock/Unlock Action only when the previous one is complete.
-    if (mState == kState_LockCompleted && aAction == UNLOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_UnlockInitiated;
-    }
-    else if (mState == kState_UnlockCompleted && aAction == LOCK_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_LockInitiated;
-    }
-
-    if (action_initiated)
-    {
-
-        StartTimer(ACTUATOR_MOVEMENT_PERIOD_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction);
-        }
-    }
-
-    return action_initiated;
-}
-
-void LockManager::StartTimer(uint32_t aTimeoutMs)
-{
-    if (xTimerIsTimerActive(sLockTimer))
-    {
-        PLAT_LOG("app timer already started!");
-        CancelTimer();
-    }
-
-    // timer is not active, change its period to required value (== restart).
-    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
-    // cannot immediately be sent to the timer command queue.
-    if (xTimerChangePeriod(sLockTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
-    {
-        PLAT_LOG("sLockTimer timer start() failed");
-    }
-}
-
-void LockManager::CancelTimer(void)
-{
-    if (xTimerStop(sLockTimer, 0) == pdFAIL)
-    {
-        PLAT_LOG("sLockTimer stop() failed");
-    }
-}
-
-void LockManager::TimerEventHandler(TimerHandle_t xTimer)
-{
-    // Get lock obj context from timer id.
-    LockManager * lock = static_cast<LockManager *>(pvTimerGetTimerID(xTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sLockTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                  = AppEvent::kEventType_AppEvent;
-    event.BoltLockEvent.Context = lock;
-    event.Handler               = ActuatorMovementTimerEventHandler;
-    GetAppTask().PostEvent(&event);
-}
-
-void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    LockManager * lock = static_cast<LockManager *>(aEvent->BoltLockEvent.Context);
-
-    if (lock->mState == kState_LockInitiated)
-    {
-        lock->mState    = kState_LockCompleted;
-        actionCompleted = LOCK_ACTION;
-        DoorLockServer::Instance().SetLockState(1, DlLockState::kLocked);
-    }
-    else if (lock->mState == kState_UnlockInitiated)
-    {
-        lock->mState    = kState_UnlockCompleted;
-        actionCompleted = UNLOCK_ACTION;
-        DoorLockServer::Instance().SetLockState(1, DlLockState::kUnlocked);
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (lock->mActionCompleted_CB)
-        {
-            lock->mActionCompleted_CB(actionCompleted);
-        }
-    }
-}
-
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
-{
-    return checkPin(endpointId, DlLockState::kLocked, pin, err);
-}
-
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
-{
-    return checkPin(endpointId, DlLockState::kUnlocked, pin, err);
-}
-
-bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
-{
-    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
-
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
-
-    ChipLogProgress(Zcl, "Door Lock App: LockManager::GetUser [endpoint=%d,userIndex=%hu]", endpointId, userIndex);
-
-    const auto & userInDb = mLockUsers[userIndex];
-
-    user.userStatus = userInDb.userStatus;
-    if (UserStatusEnum::kAvailable == user.userStatus)
-    {
-        ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
-        return true;
-    }
-
-    user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
-    user.userUniqueId   = userInDb.userUniqueId;
-    user.userType       = userInDb.userType;
-    user.credentialRule = userInDb.credentialRule;
-    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
-    // source to Matter
-    user.creationSource     = DlAssetSource::kMatterIM;
-    user.createdBy          = userInDb.createdBy;
-    user.modificationSource = DlAssetSource::kMatterIM;
-    user.lastModifiedBy     = userInDb.lastModifiedBy;
-
-    ChipLogDetail(Zcl,
-                  "Found occupied user "
-                  "[endpoint=%d,name=\"%.*s\",credentialsCount=%u,uniqueId=%lx,type=%u,credentialRule=%u,"
-                  "createdBy=%d,lastModifiedBy=%d]",
-                  endpointId, static_cast<int>(user.userName.size()), user.userName.data(), user.credentials.size(),
-                  user.userUniqueId, to_underlying(user.userType), to_underlying(user.credentialRule), user.createdBy,
-                  user.lastModifiedBy);
-
-    return true;
-}
-
-bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
-                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
-{
-    ChipLogProgress(Zcl,
-                    "Door Lock App: LockManager::SetUser "
-                    "[endpoint=%d,userIndex=%d,creator=%d,modifier=%d,userName=%s,uniqueId=%ld "
-                    "userStatus=%u,userType=%u,credentialRule=%u,credentials=%p,totalCredentials=%u]",
-                    endpointId, userIndex, creator, modifier, userName.data(), uniqueId, to_underlying(userStatus),
-                    to_underlying(usertype), to_underlying(credentialRule), credentials, totalCredentials);
-
-    VerifyOrReturnValue(userIndex > 0, false); // indices are one-indexed
-
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), false);
-
-    auto & userInStorage = mLockUsers[userIndex];
-
-    if (userName.size() > DOOR_LOCK_MAX_USER_NAME_SIZE)
-    {
-        ChipLogError(Zcl, "Cannot set user - user name is too long [endpoint=%d,index=%d]", endpointId, userIndex);
-        return false;
-    }
-
-    if (totalCredentials > LockParams.numberOfCredentialsPerUser)
-    {
-        ChipLogError(Zcl, "Cannot set user - total number of credentials is too big [endpoint=%d,index=%d,totalCredentials=%u]",
-                     endpointId, userIndex, totalCredentials);
-        return false;
-    }
-
-    chip::Platform::CopyString(mUserNames[userIndex], userName);
-    userInStorage.userName       = chip::CharSpan(mUserNames[userIndex], userName.size());
-    userInStorage.userUniqueId   = uniqueId;
-    userInStorage.userStatus     = userStatus;
-    userInStorage.userType       = usertype;
-    userInStorage.credentialRule = credentialRule;
-    userInStorage.lastModifiedBy = modifier;
-    userInStorage.createdBy      = creator;
-
-    for (size_t i = 0; i < totalCredentials; ++i)
-    {
-        mCredentials[userIndex][i]                 = credentials[i];
-        mCredentials[userIndex][i].credentialType  = CredentialTypeEnum::kPin;
-        mCredentials[userIndex][i].credentialIndex = i + 1;
-    }
-
-    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
-
-    // Save user information in NVM flash
-    KeyValueStoreMgr().Put(LockUser, reinterpret_cast<const void *>(&mLockUsers),
-                           sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
-
-    KeyValueStoreMgr().Put(UserCredentials, reinterpret_cast<const void *>(mCredentials),
-                           sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
-
-    KeyValueStoreMgr().Put(LockUserName, reinterpret_cast<const void *>(mUserNames), sizeof(mUserNames));
-
-    ChipLogProgress(Zcl, "Successfully set the user [mEndpointId=%d,index=%d]", endpointId, userIndex);
-
-    return true;
-}
-
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                                EmberAfPluginDoorLockCredentialInfo & credential)
-{
-
-    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
-                            false); // programming pin index is only index allowed to contain 0
-    }
-    else
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
-    }
-
-    ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
-                    to_underlying(credentialType), credentialIndex);
-
-    const auto & credentialInStorage = mLockCredentials[credentialIndex];
-
-    credential.status = credentialInStorage.status;
-    ChipLogDetail(Zcl, "CredentialStatus: %d, CredentialIndex: %d ", (int) credential.status, credentialIndex);
-
-    if (DlCredentialStatus::kAvailable == credential.status)
-    {
-        ChipLogDetail(Zcl, "Found unoccupied credential ");
-        return true;
-    }
-    credential.credentialType = credentialInStorage.credentialType;
-    credential.credentialData = credentialInStorage.credentialData;
-    credential.createdBy      = credentialInStorage.createdBy;
-    credential.lastModifiedBy = credentialInStorage.lastModifiedBy;
-    // So far there's no way to actually create the credential outside Matter, so here we always set the creation/modification
-    // source to Matter
-    credential.creationSource     = DlAssetSource::kMatterIM;
-    credential.modificationSource = DlAssetSource::kMatterIM;
-
-    ChipLogDetail(Zcl, "Found occupied credential [type=%u,dataSize=%u]", to_underlying(credential.credentialType),
-                  credential.credentialData.size());
-
-    return true;
-}
-
-bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                                const chip::ByteSpan & credentialData)
-{
-
-    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
-                            false); // programming pin index is only index allowed to contain 0
-    }
-    else
-    {
-        VerifyOrReturnValue(IsValidCredentialIndex(--credentialIndex, credentialType), false); // otherwise, indices are one-indexed
-    }
-
-    ChipLogProgress(Zcl,
-                    "Door Lock App: LockManager::SetCredential "
-                    "[credentialStatus=%u,credentialType=%u,credentialDataSize=%u,creator=%d,modifier=%d]",
-                    to_underlying(credentialStatus), to_underlying(credentialType), credentialData.size(), creator, modifier);
-
-    auto & credentialInStorage = mLockCredentials[credentialIndex];
-
-    credentialInStorage.status         = credentialStatus;
-    credentialInStorage.credentialType = credentialType;
-    credentialInStorage.createdBy      = creator;
-    credentialInStorage.lastModifiedBy = modifier;
-
-    memcpy(mCredentialData[credentialIndex], credentialData.data(), credentialData.size());
-    credentialInStorage.credentialData = chip::ByteSpan{ mCredentialData[credentialIndex], credentialData.size() };
-
-    // Save credential information in NVM flash
-    KeyValueStoreMgr().Put(Credential, reinterpret_cast<const void *>(&mLockCredentials),
-                           sizeof(EmberAfPluginDoorLockCredentialInfo) * LockParams.numberOfCredentialsPerUser);
-
-    KeyValueStoreMgr().Put(CredentialData, reinterpret_cast<const void *>(&mCredentialData), sizeof(mCredentialData));
-
-    ChipLogProgress(Zcl, "Successfully set the credential [credentialType=%u]", to_underlying(credentialType));
-
-    return true;
-}
-
-DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         EmberAfPluginDoorLockWeekDaySchedule & schedule)
-{
-
-    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    weekdayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
-                                         uint8_t endHour, uint8_t endMinute)
-{
-
-    VerifyOrReturnValue(weekdayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    weekdayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidWeekdayScheduleIndex(weekdayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mWeekdaySchedule[userIndex][weekdayIndex];
-
-    scheduleInStorage.schedule.daysMask    = daysMask;
-    scheduleInStorage.schedule.startHour   = startHour;
-    scheduleInStorage.schedule.startMinute = startMinute;
-    scheduleInStorage.schedule.endHour     = endHour;
-    scheduleInStorage.schedule.endMinute   = endMinute;
-    scheduleInStorage.status               = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(WeekDaySchedules, reinterpret_cast<const void *>(mWeekdaySchedule),
-                           sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
-                               LockParams.numberOfUsers);
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                         EmberAfPluginDoorLockYearDaySchedule & schedule)
-{
-    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    yearDayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
-{
-    VerifyOrReturnValue(yearDayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-    VerifyOrReturnValue(userIndex > 0, DlStatus::kFailure);    // indices are one-indexed
-
-    yearDayIndex--;
-    userIndex--;
-
-    VerifyOrReturnValue(IsValidYeardayScheduleIndex(yearDayIndex), DlStatus::kFailure);
-    VerifyOrReturnValue(IsValidUserIndex(userIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mYeardaySchedule[userIndex][yearDayIndex];
-
-    scheduleInStorage.schedule.localStartTime = localStartTime;
-    scheduleInStorage.schedule.localEndTime   = localEndTime;
-    scheduleInStorage.status                  = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(YearDaySchedules, reinterpret_cast<const void *>(mYeardaySchedule),
-                           sizeof(EmberAfPluginDoorLockYearDaySchedule) * LockParams.numberOfYeardaySchedulesPerUser *
-                               LockParams.numberOfUsers);
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
-                                         EmberAfPluginDoorLockHolidaySchedule & schedule)
-{
-    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-
-    holidayIndex--;
-
-    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
-
-    const auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
-    if (DlScheduleStatus::kAvailable == scheduleInStorage.status)
-    {
-        return DlStatus::kNotFound;
-    }
-
-    schedule = scheduleInStorage.schedule;
-
-    return DlStatus::kSuccess;
-}
-
-DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
-{
-    VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
-
-    holidayIndex--;
-
-    VerifyOrReturnValue(IsValidHolidayScheduleIndex(holidayIndex), DlStatus::kFailure);
-
-    auto & scheduleInStorage = mHolidaySchedule[holidayIndex];
-
-    scheduleInStorage.schedule.localStartTime = localStartTime;
-    scheduleInStorage.schedule.localEndTime   = localEndTime;
-    scheduleInStorage.schedule.operatingMode  = operatingMode;
-    scheduleInStorage.status                  = status;
-
-    // Save schedule information in NVM flash
-    KeyValueStoreMgr().Put(HolidaySchedules, reinterpret_cast<const void *>(&(mHolidaySchedule)),
-                           sizeof(EmberAfPluginDoorLockHolidaySchedule) * LockParams.numberOfHolidaySchedules);
-
-    return DlStatus::kSuccess;
-}
-
-const char * LockManager::lockStateToString(DlLockState lockState) const
-{
-    switch (lockState)
-    {
-    case DlLockState::kNotFullyLocked:
-        return "Not Fully Locked";
-    case DlLockState::kLocked:
-        return "Locked";
-    case DlLockState::kUnlocked:
-        return "Unlocked";
-    case DlLockState::kUnlatched:
-        return "Unlatched";
-    case DlLockState::kUnknownEnumValue:
-        break;
-    default:
-        break;
-    }
-
-    return "Unknown";
-}
-
-bool LockManager::checkPin(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                           OperationErrorEnum & err)
-{
-    // Assume pin is required until told otherwise
-    bool requirePin = true;
-    chip::app::Clusters::DoorLock::Attributes::RequirePINforRemoteOperation::Get(endpointId, &requirePin);
-
-    // If a pin code is not given
-    if (!pin.HasValue())
-    {
-        ChipLogDetail(Zcl, "Door Lock App: PIN code is not specified [endpointId=%d]", endpointId);
-
-        // If a pin code is not required
-        if (!requirePin)
-        {
-            ChipLogDetail(Zcl, "Door Lock App: setting door lock state to \"%s\" [endpointId=%d]", lockStateToString(lockState),
-                          endpointId);
-
-            return true;
-        }
-
-        ChipLogError(Zcl, "Door Lock App: PIN code is not specified, but it is required [endpointId=%d]", endpointId);
-
-        err = OperationErrorEnum::kInvalidCredential;
-        DoorLockServer::Instance().HandleWrongCodeEntry(endpointId);
-        return false;
-    }
-
-    // Check the PIN code
-    for (uint8_t i = 0; i < kMaxCredentials; i++)
-    {
-        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
-            mLockCredentials[i].status == DlCredentialStatus::kAvailable)
-        {
-            continue;
-        }
-
-        if (mLockCredentials[i].credentialData.data_equal(pin.Value()))
-        {
-            ChipLogDetail(Zcl,
-                          "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
-                          lockStateToString(lockState), endpointId);
-
-            return true;
-        }
-    }
-
-    ChipLogDetail(Zcl,
-                  "Door Lock App: specified PIN code was not found in the database, ignoring command to set lock state to \"%s\" "
-                  "[endpointId=%d]",
-                  lockStateToString(lockState), endpointId);
-
-    err = OperationErrorEnum::kInvalidCredential;
-    DoorLockServer::Instance().HandleWrongCodeEntry(endpointId);
-    return false;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h b/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h
deleted file mode 100644
index 74129260bd9172..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/LockManager.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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 <app/clusters/door-lock-server/door-lock-server.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include "FreeRTOS.h"
-#include "timers.h" // provides FreeRTOS timer support
-
-#include <lib/core/CHIPError.h>
-
-struct WeekDaysScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockWeekDaySchedule schedule;
-};
-
-struct YearDayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockYearDaySchedule schedule;
-};
-
-struct HolidayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockHolidaySchedule schedule;
-};
-
-namespace CC13X2_26X2DoorLock {
-namespace ResourceRanges {
-// Used to size arrays
-static constexpr uint16_t kMaxUsers                  = 10;
-static constexpr uint8_t kMaxCredentialsPerUser      = 10;
-static constexpr uint8_t kMaxWeekdaySchedulesPerUser = 10;
-static constexpr uint8_t kMaxYeardaySchedulesPerUser = 10;
-static constexpr uint8_t kMaxHolidaySchedules        = 10;
-static constexpr uint8_t kMaxCredentialSize          = 8;
-
-// Indices received for user/credential/schedules are 1-indexed
-static constexpr uint8_t kStartIndexValue = 1;
-
-static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
-} // namespace ResourceRanges
-
-namespace LockInitParams {
-
-struct LockParam
-{
-    // Read from zap attributes
-    uint16_t numberOfUsers                  = 0;
-    uint8_t numberOfCredentialsPerUser      = 0;
-    uint8_t numberOfWeekdaySchedulesPerUser = 0;
-    uint8_t numberOfYeardaySchedulesPerUser = 0;
-    uint8_t numberOfHolidaySchedules        = 0;
-};
-
-class ParamBuilder
-{
-public:
-    ParamBuilder & SetNumberOfUsers(uint16_t numberOfUsers)
-    {
-        lockParam_.numberOfUsers = numberOfUsers;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfCredentialsPerUser(uint8_t numberOfCredentialsPerUser)
-    {
-        lockParam_.numberOfCredentialsPerUser = numberOfCredentialsPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfWeekdaySchedulesPerUser(uint8_t numberOfWeekdaySchedulesPerUser)
-    {
-        lockParam_.numberOfWeekdaySchedulesPerUser = numberOfWeekdaySchedulesPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfYeardaySchedulesPerUser(uint8_t numberOfYeardaySchedulesPerUser)
-    {
-        lockParam_.numberOfYeardaySchedulesPerUser = numberOfYeardaySchedulesPerUser;
-        return *this;
-    }
-    ParamBuilder & SetNumberOfHolidaySchedules(uint8_t numberOfHolidaySchedules)
-    {
-        lockParam_.numberOfHolidaySchedules = numberOfHolidaySchedules;
-        return *this;
-    }
-    LockParam GetLockParam() { return lockParam_; }
-
-private:
-    LockParam lockParam_;
-};
-
-} // namespace LockInitParams
-} // namespace CC13X2_26X2DoorLock
-
-using namespace ::chip;
-using namespace CC13X2_26X2DoorLock::ResourceRanges;
-
-class LockManager
-{
-public:
-    enum Action_t
-    {
-        LOCK_ACTION = 0,
-        UNLOCK_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_LockInitiated = 0,
-        kState_LockCompleted,
-        kState_UnlockInitiated,
-        kState_UnlockCompleted,
-    } State;
-
-    CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                    CC13X2_26X2DoorLock::LockInitParams::LockParam lockParam);
-    bool InitiateAction(Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t);
-    typedef void (*Callback_fn_completed)(Action_t);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
-
-    bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
-    bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
-                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
-
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                       EmberAfPluginDoorLockCredentialInfo & credential);
-
-    bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
-                       const chip::ByteSpan & credentialData);
-
-    DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                EmberAfPluginDoorLockWeekDaySchedule & schedule);
-
-    DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
-
-    DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                EmberAfPluginDoorLockYearDaySchedule & schedule);
-
-    DlStatus SetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                uint32_t localStartTime, uint32_t localEndTime);
-
-    DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
-
-    DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, OperatingModeEnum operatingMode);
-
-    bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
-    bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
-    bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
-    bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
-
-    bool checkPin(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                  OperationErrorEnum & err);
-    const char * lockStateToString(DlLockState lockState) const;
-
-    bool ReadConfigValues();
-
-private:
-    friend LockManager & LockMgr();
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    void CancelTimer(void);
-    void StartTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t xTimer);
-    static void AutoLockTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    EmberAfPluginDoorLockUserInfo mLockUsers[kMaxUsers];
-    EmberAfPluginDoorLockCredentialInfo mLockCredentials[kMaxCredentials];
-    WeekDaysScheduleInfo mWeekdaySchedule[kMaxUsers][kMaxWeekdaySchedulesPerUser];
-    YearDayScheduleInfo mYeardaySchedule[kMaxUsers][kMaxYeardaySchedulesPerUser];
-    HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
-
-    char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
-    uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
-
-    static LockManager sLock;
-    CC13X2_26X2DoorLock::LockInitParams::LockParam LockParams;
-};
-
-inline LockManager & LockMgr()
-{
-    return LockManager::sLock;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
deleted file mode 100644
index 1777326dc4d017..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/ZclCallbacks.cpp
+++ /dev/null
@@ -1,154 +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.
- */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
-#include "AppConfig.h"
-#include "LockManager.h"
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/data-model/Nullable.h>
-#include <lib/core/DataModelTypes.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip::app::Clusters;
-using namespace ::chip::DeviceLayer::Internal;
-using ::chip::app::DataModel::Nullable;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    ClusterId clusterId     = attributePath.mClusterId;
-    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-
-    if (clusterId == DoorLock::Id && attributeId == DoorLock::Attributes::LockState::Id)
-    {
-        ChipLogProgress(Zcl, "Door lock cluster: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
-    }
-}
-
-/** @brief DoorLock Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- */
-void emberAfDoorLockClusterInitCallback(EndpointId endpoint) {}
-
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                            const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                            OperationErrorEnum & err)
-{
-    ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
-    bool status = LockMgr().Lock(endpointId, pinCode, err);
-    if (status == true)
-    {
-        LockMgr().InitiateAction(LockManager::LOCK_ACTION);
-    }
-    return status;
-}
-
-bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Nullable<chip::FabricIndex> & fabricIdx,
-                                              const Nullable<chip::NodeId> & nodeId, const Optional<ByteSpan> & pinCode,
-                                              OperationErrorEnum & err)
-{
-    ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
-    bool status = LockMgr().Unlock(endpointId, pinCode, err);
-    if (status == true)
-    {
-        LockMgr().InitiateAction(LockManager::UNLOCK_ACTION);
-    }
-
-    return status;
-}
-
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
-                                        EmberAfPluginDoorLockCredentialInfo & credential)
-{
-    return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
-}
-
-bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                        chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
-{
-    return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
-                                   credentialData);
-}
-
-bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user)
-{
-    return LockMgr().GetUser(endpointId, userIndex, user);
-}
-
-bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
-                                  chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
-                                  const CredentialStruct * credentials, size_t totalCredentials)
-{
-
-    return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
-                             credentials, totalCredentials);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          EmberAfPluginDoorLockWeekDaySchedule & schedule)
-{
-    return LockMgr().GetWeekdaySchedule(endpointId, weekdayIndex, userIndex, schedule);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                          EmberAfPluginDoorLockYearDaySchedule & schedule)
-{
-    return LockMgr().GetYeardaySchedule(endpointId, yearDayIndex, userIndex, schedule);
-}
-
-DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex,
-                                          EmberAfPluginDoorLockHolidaySchedule & holidaySchedule)
-{
-    return LockMgr().GetHolidaySchedule(endpointId, holidayIndex, holidaySchedule);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
-                                          uint8_t endHour, uint8_t endMinute)
-{
-    return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
-                                        endMinute);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime)
-{
-    return LockMgr().SetYeardaySchedule(endpointId, yearDayIndex, userIndex, status, localStartTime, localEndTime);
-}
-
-DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
-{
-    return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp b/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp
deleted file mode 100644
index 4fdb88703acab6..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/src/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc600)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (1)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (1)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (1)
-        ;
-}
diff --git a/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/lock-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
index 535a414e588178..b8b43d6ec6a218 100644
--- a/examples/lock-app/cc13x4_26x4/README.md
+++ b/examples/lock-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
index 1b65334c47f886..ec6a1d048c0276 100644
--- a/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
+++ b/examples/lock-app/cc13x4_26x4/src/AppTask.cpp
@@ -267,7 +267,7 @@ int AppTask::Init()
 
         Attributes::LockState::Get(endpointId, state);
         ret = LockMgr().Init(state,
-                             CC13X2_26X2DoorLock::LockInitParams::ParamBuilder()
+                             CC13X4_26X4DoorLock::LockInitParams::ParamBuilder()
                                  .SetNumberOfUsers(numberOfUsers)
                                  .SetNumberOfCredentialsPerUser(numberOfCredentialsPerUser)
                                  .SetNumberOfWeekdaySchedulesPerUser(numberOfWeekdaySchedulesPerUser)
diff --git a/examples/lock-app/cc13x4_26x4/src/LockManager.cpp b/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
index 57cd1964dd92a1..5f4d6e2ff1c578 100644
--- a/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
+++ b/examples/lock-app/cc13x4_26x4/src/LockManager.cpp
@@ -31,7 +31,7 @@ LockManager LockManager::sLock;
 
 TimerHandle_t sLockTimer;
 
-using namespace CC13X2_26X2DoorLock::LockInitParams;
+using namespace CC13X4_26X4DoorLock::LockInitParams;
 using namespace chip::DeviceLayer::PersistedStorage;
 
 // persisted storage keys
diff --git a/examples/lock-app/cc13x4_26x4/src/LockManager.h b/examples/lock-app/cc13x4_26x4/src/LockManager.h
index 74129260bd9172..13b30b2eccadb0 100644
--- a/examples/lock-app/cc13x4_26x4/src/LockManager.h
+++ b/examples/lock-app/cc13x4_26x4/src/LockManager.h
@@ -48,7 +48,7 @@ struct HolidayScheduleInfo
     EmberAfPluginDoorLockHolidaySchedule schedule;
 };
 
-namespace CC13X2_26X2DoorLock {
+namespace CC13X4_26X4DoorLock {
 namespace ResourceRanges {
 // Used to size arrays
 static constexpr uint16_t kMaxUsers                  = 10;
@@ -111,10 +111,10 @@ class ParamBuilder
 };
 
 } // namespace LockInitParams
-} // namespace CC13X2_26X2DoorLock
+} // namespace CC13X4_26X4DoorLock
 
 using namespace ::chip;
-using namespace CC13X2_26X2DoorLock::ResourceRanges;
+using namespace CC13X4_26X4DoorLock::ResourceRanges;
 
 class LockManager
 {
@@ -136,7 +136,7 @@ class LockManager
     } State;
 
     CHIP_ERROR Init(chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> state,
-                    CC13X2_26X2DoorLock::LockInitParams::LockParam lockParam);
+                    CC13X4_26X4DoorLock::LockInitParams::LockParam lockParam);
     bool InitiateAction(Action_t aAction);
 
     typedef void (*Callback_fn_initiated)(Action_t);
@@ -212,7 +212,7 @@ class LockManager
     CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
-    CC13X2_26X2DoorLock::LockInitParams::LockParam LockParams;
+    CC13X4_26X4DoorLock::LockInitParams::LockParam LockParams;
 };
 
 inline LockManager & LockMgr()
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/.gn b/examples/persistent-storage/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index 3d48789e30ab3d..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,28 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn b/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 0a8930dff1adb2..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,94 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/persistent-storage/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/include" ]
-
-  defines = []
-  if (is_debug) {
-    defines += [ "BUILD_RELEASE=0" ]
-  } else {
-    defines += [ "BUILD_RELEASE=1" ]
-  }
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "${project_dir}/chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("persistent_storage") {
-  output_name = "chip-${ti_simplelink_board}-persistent_storage.out"
-
-  sources = [
-    "${project_dir}/../KeyValueStorageTest.cpp",
-    "${project_dir}/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/src/lib",
-  ]
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/..",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":persistent_storage" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 87e4add6701eca..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,255 +0,0 @@
-# Matter Persistent Storage Example Application
-
-An example test application showing the persistent storage system for
-[Matter][matter] on the Texas Instruments CC13X2_26X2 family of Wireless MCUs.
-
----
-
--   [Matter Persistent Storage Application](#matter-persistent-storage-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Viewing Logging Output](#viewing-logging-output)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-This example serves to test the key value storage implementation and API and
-offers information on proper usage of the KVS system.
-
-This example is enabled to build for CC2652R7 devices. This upcoming devices are
-currently not yet in full production. For more information on device
-availability or early access to an engineering build of our Matter-enabled SDK,
-please reach out [here][ti_cc13x2_26x2_r7_matter_request].
-
-## Device UI
-
-Over the debug UART connection you should see the output:
-
-```
-Running Tests:
-TestEmptyString(): PASSED
-TestString(): PASSED
-TestUint32(): PASSED
-TestArray(): PASSED
-TestStruct(): PASSED
-TestUpdateValue(): PASSED
-TestMultiRead(): PASSED
-```
-
-This indicates a successful run of the test suite.
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   An engineering SDK from TI is required. Please request access for it
-    [here][ti_cc13x2_26x2_r7_matter_request].
-
-    -   Follow the default installation instructions when executing the
-        installer.
-
-    -   The version of OpenThread used in this repository is newer than the one
-        packaged with the TI SDK. Check the following section for a list of
-        changes needed.
-
--   Download and install [SysConfig][sysconfig].
-
-    -   This may have already been installed with your SimpleLink SDK install.
-
--   If you have installed different versions, the build defaults will need to be
-    changed to reflect this in
-    `${chip_root}/examples/build_overrides/ti_simplelink_sdk.gni`.
-
--   Install Python 3.8 for the GN build system:
-
-    ```
-    # Linux
-    $ sudo apt-get install python3.8 python3.8-distutils python3.8-dev python3.8-venv
-    # Distutils listed due to a package manager error on Ubuntu 18.04
-
-    ```
-
-    -   You will have to ensure that the default version of Python 3 is Python
-        3.8.
-
-        -   Check python3 version:
-
-        ```
-        $ python3 --version
-        Python 3.8.0
-        ```
-
-        -   If it is not Python 3.8:
-
-        ```
-        $ sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
-        ```
-
-            -   This may affect your environment in other ways if there was a
-                specific dependency on the prior python3 version (e.g. apt).
-                After completing the build process for this example, you can
-                revert the python3 version, for instance:
-
-                ```
-                $ sudo update-alternatives --config python3
-                There are 2 choices for the alternative python3 (providing /usr/bin/python3).
-
-                  Selection    Path                Priority    Status
-                -------------------------------------------------------------
-                  0            /usr/bin/python3.8   1          auto mode
-                  1            /usr/bin/python3.6   1          manual mode
-                * 2            /usr/bin/python3.8   1          manual mode
-
-                Press <enter> to keep the current choice[*], or type selection number: 1
-                update-alternatives: using /usr/bin/python3.6 to provide /usr/bin/python3 (python3) in manual mode
-                ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2
-    $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\""
-    $ ninja -C out/debug
-
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Viewing Logging Output
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_cc13x2_26x2_r7_matter_request]: https://ti.com/chip_sdk
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni b/examples/persistent-storage/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index ad8a3f88326649..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# use -Os instead of -Og
-#optimize_debug_level = "s"
-#lwip_debug = false
-
-# BLE options
-chip_config_network_layer_ble = true
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides b/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg b/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h
deleted file mode 100644
index 77f2cc37421d36..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13x2_26x2LogInit(void);
-void cc13x2_26x2Log(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13x2_26x2Log(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 2bcf489732b312..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-#if BUILD_RELEASE // release build
-
-// Security and Authentication enabled for release build.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#else // development build
-
-// Security and Authentication disabled for development build.
-// For convenience, enable CHIP Security Test Mode and disable the requirement for
-// authentication in various protocols.
-// WARNING: These options make it possible to circumvent basic CHIP security functionality,
-// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-#endif // BUILD_RELEASE
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- *
- * 0xFFF1: Test vendor.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- *
- * 0x8009: example persistent-storage
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8009
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- *
- * A string identifying the software version running on the device.
- * CHIP currently expects the software version to be in the format
- * {MAJOR_VERSION}.0d{MINOR_VERSION}
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "1.0d1"
-#endif
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h
deleted file mode 100644
index 4079b251280ddc..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#ifndef OPENTHREAD_PLATFORM_CONFIG_H
-#define OPENTHREAD_PLATFORM_CONFIG_H
-
-// Disable the Nordic-supplied OpenThread logging facilities and use
-// the facilities provided by the CHIP Device Layer
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 1
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
-
-#endif // OPENTHREAD_PLATFORM_CONFIG_H
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp b/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp
deleted file mode 100644
index 15e439fddb667b..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/main.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include "KeyValueStorageTest.h"
-#include <AppConfig.h>
-
-#include <FreeRTOS.h>
-#include <task.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/NVS.h>
-#include <ti/drivers/UART.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xf000)
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-
-static TaskHandle_t sTestTaskHandle;
-void TestTask(void * pvParameter)
-{
-    cc13x2_26x2LogInit();
-
-    chip::DeviceLayer::Internal::CC13X2_26X2Config().Init();
-
-    while (true)
-    {
-        PLAT_LOG("Running Tests:");
-        chip::RunKvsTest();
-        vTaskDelay(60 * configTICK_RATE_HZ); // Run every minute
-    }
-}
-
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    NVS_init();
-
-    UART_init();
-
-    // Run tests
-    xTaskCreate(TestTask, "Test", 2048, NULL, 1, &sTestTaskHandle);
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/persistent-storage/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/platform/cc13x2_26x2/BUILD.gn b/examples/platform/cc13x2_26x2/BUILD.gn
deleted file mode 100644
index 06beceb9d75d01..00000000000000
--- a/examples/platform/cc13x2_26x2/BUILD.gn
+++ /dev/null
@@ -1,44 +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.
-
-import("//build_overrides/chip.gni")
-
-config("chip_examples_project_config") {
-  include_dirs = [ "project_include" ]
-}
-
-source_set("openthread_core_config_cc13x2_26x2_chip_examples") {
-  sources = [ "project_include/OpenThreadConfig.h" ]
-  public_configs = [ ":chip_examples_project_config" ]
-}
-
-config("attestation-credentials-config") {
-  include_dirs = [ "${chip_root}" ]
-
-  defines = [ "CC13X2_26X2_ATTESTATION_CREDENTIALS" ]
-}
-
-source_set("cc13x2_26x2-attestation-credentials") {
-  sources = [
-    "CC13X2_26X2DeviceAttestationCreds.cpp",
-    "CC13X2_26X2DeviceAttestationCreds.h",
-  ]
-
-  public_deps = [
-    "${chip_root}/src/credentials",
-    "${chip_root}/src/platform:platform_base",
-  ]
-
-  public_configs = [ ":attestation-credentials-config" ]
-}
diff --git a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp b/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp
deleted file mode 100644
index aa3469b030f4c7..00000000000000
--- a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 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.
- */
-#include "CC13X2_26X2DeviceAttestationCreds.h"
-#include <crypto/CHIPCryptoPAL.h>
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/Span.h>
-
-extern uint32_t __attestation_credentials_base;
-
-namespace chip {
-namespace Credentials {
-namespace CC13X2_26X2 {
-
-namespace {
-typedef struct
-{
-    const uint32_t len;
-    uint8_t const * data;
-} data_ptr;
-
-typedef struct
-{
-    data_ptr dac_priv_key;
-    data_ptr dac_pub_key;
-    data_ptr dac_cert;
-    data_ptr pai_cert;
-} factoryData;
-
-const uint8_t gDacPrivKey[] = {
-    0x50, 0x5a, 0x21, 0x1d, 0xbd, 0xa8, 0x71, 0x33, 0x0d, 0x63, 0x5d, 0xa3, 0xb0, 0x7e, 0xb1, 0xc5,
-    0x08, 0x8a, 0x8f, 0xc7, 0x01, 0x24, 0xfb, 0xb3, 0x3e, 0x93, 0xd5, 0x06, 0x05, 0x82, 0xc7, 0xc5,
-};
-
-const uint8_t gDacPubKey[] = {
-    0x04, 0xc5, 0x65, 0xfd, 0xad, 0xfd, 0x16, 0xdd, 0x62, 0xe4, 0x3f, 0x19, 0x60, 0xb9, 0x93, 0xbb, 0x57,
-    0x2c, 0xfd, 0xd8, 0x1f, 0x6d, 0x71, 0x67, 0x67, 0x1b, 0x77, 0x45, 0xdc, 0xbe, 0x6f, 0x65, 0xaf, 0x66,
-    0x5a, 0x1d, 0x93, 0x1c, 0x05, 0xb9, 0xf9, 0xa3, 0xe9, 0x45, 0x66, 0x85, 0x60, 0x2c, 0x05, 0xc6, 0x96,
-    0x46, 0xb8, 0xf7, 0x59, 0x98, 0xdb, 0xaa, 0x68, 0x7a, 0x5c, 0x56, 0x49, 0x02, 0xda,
-};
-
-const uint8_t gDacCert[] = {
-    0x30, 0x82, 0x01, 0xf7, 0x30, 0x82, 0x01, 0x9d, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x46, 0x88, 0xeb, 0x94, 0xad, 0x32,
-    0xb2, 0xe4, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x4d, 0x31, 0x1f, 0x30, 0x1d, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x16, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d,
-    0x65, 0x6e, 0x74, 0x20, 0x50, 0x41, 0x49, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c,
-    0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2,
-    0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x36, 0x32, 0x38, 0x31, 0x34,
-    0x32, 0x33, 0x34, 0x33, 0x5a, 0x18, 0x0f, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39,
-    0x5a, 0x30, 0x52, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x1b, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20,
-    0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x30, 0x30, 0x30, 0x31,
-    0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31,
-    0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30,
-    0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-    0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0xc5, 0x65, 0xfd, 0xad, 0xfd, 0x16, 0xdd, 0x62, 0xe4, 0x3f, 0x19, 0x60, 0xb9, 0x93,
-    0xbb, 0x57, 0x2c, 0xfd, 0xd8, 0x1f, 0x6d, 0x71, 0x67, 0x67, 0x1b, 0x77, 0x45, 0xdc, 0xbe, 0x6f, 0x65, 0xaf, 0x66, 0x5a, 0x1d,
-    0x93, 0x1c, 0x05, 0xb9, 0xf9, 0xa3, 0xe9, 0x45, 0x66, 0x85, 0x60, 0x2c, 0x05, 0xc6, 0x96, 0x46, 0xb8, 0xf7, 0x59, 0x98, 0xdb,
-    0xaa, 0x68, 0x7a, 0x5c, 0x56, 0x49, 0x02, 0xda, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01,
-    0xff, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x07, 0x80,
-    0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x9b, 0x40, 0x60, 0x6f, 0x9e, 0x04, 0x7f, 0xb8, 0x60, 0x78,
-    0x8e, 0x3d, 0xc1, 0x12, 0xd7, 0x5e, 0x87, 0x95, 0x77, 0x68, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16,
-    0x80, 0x14, 0x43, 0x34, 0x57, 0x12, 0xba, 0x2c, 0x87, 0xef, 0x25, 0x49, 0x7b, 0x11, 0xd7, 0x98, 0x58, 0x9b, 0x84, 0x35, 0x7f,
-    0x88, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x48, 0x00, 0x30, 0x45, 0x02, 0x21, 0x00,
-    0xb9, 0x28, 0xf9, 0x3e, 0xe3, 0x87, 0xef, 0x3e, 0x00, 0x72, 0x88, 0x22, 0x84, 0xbd, 0x8a, 0xdd, 0x5c, 0xd6, 0xd0, 0x55, 0x81,
-    0xbf, 0xcc, 0x55, 0x17, 0xcf, 0x9e, 0x9b, 0xcd, 0xd4, 0x37, 0xda, 0x02, 0x20, 0x10, 0x07, 0x9c, 0xcf, 0x7f, 0x1f, 0x2d, 0xda,
-    0x46, 0xac, 0xe9, 0x67, 0xae, 0x5b, 0xe9, 0x66, 0xe7, 0xf2, 0x8a, 0xdf, 0xa0, 0x28, 0xb8, 0xf8, 0x7f, 0x93, 0x9e, 0xd4, 0x15,
-    0x8d, 0xc0, 0xf8,
-};
-
-const uint8_t gPaiCert[] = {
-    0x30, 0x82, 0x01, 0xdc, 0x30, 0x82, 0x01, 0x81, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x08, 0x7f, 0x7e, 0xf3, 0xdb, 0x08, 0xa3,
-    0x8f, 0x68, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30, 0x30, 0x31, 0x18, 0x30, 0x16, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x0f, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50, 0x41, 0x41,
-    0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c, 0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46,
-    0x31, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x36, 0x32, 0x38, 0x31, 0x34, 0x32, 0x33, 0x34, 0x33, 0x5a, 0x18, 0x0f, 0x39,
-    0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x4d, 0x31, 0x1f, 0x30, 0x1d, 0x06,
-    0x03, 0x55, 0x04, 0x03, 0x0c, 0x16, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d,
-    0x65, 0x6e, 0x74, 0x20, 0x50, 0x41, 0x49, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2, 0x7c,
-    0x02, 0x01, 0x0c, 0x04, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xa2,
-    0x7c, 0x02, 0x02, 0x0c, 0x04, 0x38, 0x30, 0x30, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02,
-    0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04, 0x42, 0x93, 0x55, 0x77, 0x35, 0x35,
-    0x15, 0xce, 0xfa, 0x8f, 0x0e, 0x30, 0xe2, 0x34, 0x7e, 0x90, 0xee, 0xd6, 0xfd, 0x51, 0x5b, 0xe8, 0x82, 0xd1, 0xbc, 0xba, 0x74,
-    0x83, 0xd7, 0xff, 0x6e, 0xf4, 0xde, 0xdf, 0x98, 0xf7, 0xf7, 0x4f, 0x17, 0x42, 0x1d, 0xe5, 0x45, 0x0c, 0xff, 0xfb, 0x3e, 0x7f,
-    0x6d, 0x4f, 0x62, 0x28, 0x53, 0x41, 0x14, 0xfb, 0xb8, 0x5c, 0x2d, 0x52, 0xd1, 0x82, 0xb6, 0x6a, 0xa3, 0x66, 0x30, 0x64, 0x30,
-    0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x00, 0x30, 0x0e,
-    0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e,
-    0x04, 0x16, 0x04, 0x14, 0x43, 0x34, 0x57, 0x12, 0xba, 0x2c, 0x87, 0xef, 0x25, 0x49, 0x7b, 0x11, 0xd7, 0x98, 0x58, 0x9b, 0x84,
-    0x35, 0x7f, 0x88, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x6a, 0xfd, 0x22, 0x77, 0x1f,
-    0x51, 0x1f, 0xec, 0xbf, 0x16, 0x41, 0x97, 0x67, 0x10, 0xdc, 0xdc, 0x31, 0xa1, 0x71, 0x7e, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86,
-    0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x49, 0x00, 0x30, 0x46, 0x02, 0x21, 0x00, 0xff, 0x25, 0xf1, 0xd1, 0x54, 0xc3, 0x13,
-    0x7e, 0x0e, 0x08, 0x6d, 0x82, 0xab, 0x0b, 0x11, 0xb5, 0x66, 0x18, 0x39, 0xb7, 0x12, 0xb1, 0x34, 0x2c, 0x6c, 0xde, 0x94, 0xfb,
-    0xe3, 0x18, 0xa9, 0x2b, 0x02, 0x21, 0x00, 0x92, 0xe2, 0x81, 0xf9, 0x8a, 0x2f, 0xcc, 0x14, 0xcd, 0xf4, 0x07, 0x50, 0xd2, 0x80,
-    0xd7, 0xdf, 0xea, 0x3f, 0x4d, 0xa4, 0x6f, 0x35, 0x7a, 0xfe, 0xac, 0xb8, 0x9b, 0x26, 0x77, 0x06, 0xd2, 0x8a,
-};
-
-const factoryData gFactoryData =
-{
-    .dac_priv_key = {
-        .len = sizeof(gDacPrivKey),
-        .data = gDacPrivKey,
-    },
-    .dac_pub_key = {
-        .len = sizeof(gDacPubKey),
-        .data = gDacPubKey,
-    },
-    .dac_cert = {
-        .len = sizeof(gDacCert),
-        .data = gDacCert,
-    },
-    .pai_cert = {
-        .len = sizeof(gPaiCert),
-        .data = gPaiCert,
-    },
-};
-
-CHIP_ERROR LoadKeypairFromRaw(ByteSpan private_key, ByteSpan public_key, Crypto::P256Keypair & keypair)
-{
-    Crypto::P256SerializedKeypair serialized_keypair;
-    ReturnErrorOnFailure(serialized_keypair.SetLength(private_key.size() + public_key.size()));
-    memcpy(serialized_keypair.Bytes(), public_key.data(), public_key.size());
-    memcpy(serialized_keypair.Bytes() + public_key.size(), private_key.data(), private_key.size());
-    return keypair.Deserialize(serialized_keypair);
-}
-
-class DeviceAttestationCredsCC13X2_26X2 : public DeviceAttestationCredentialsProvider
-{
-
-public:
-    CHIP_ERROR GetCertificationDeclaration(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer) override;
-    CHIP_ERROR GetDeviceAttestationCert(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR GetProductAttestationIntermediateCert(MutableByteSpan & out_buffer) override;
-    CHIP_ERROR SignWithDeviceAttestationKey(const ByteSpan & message_to_sign, MutableByteSpan & out_buffer) override;
-
-private:
-    factoryData const * mFactoryData = &gFactoryData;
-};
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetCertificationDeclaration(MutableByteSpan & out_buffer)
-{
-    //-> format_version = 1
-    //-> vendor_id = 0xFFF1
-    //-> product_id_array = [ 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007, 0x8008, 0x8009, 0x800A, 0x800B,
-    // 0x800C, 0x800D, 0x800E, 0x800F, 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017, 0x8018, 0x8019, 0x801A,
-    // 0x801B, 0x801C, 0x801D, 0x801E, 0x801F, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 0x8026, 0x8027, 0x8028, 0x8029,
-    // 0x802A, 0x802B, 0x802C, 0x802D, 0x802E, 0x802F, 0x8030, 0x8031, 0x8032, 0x8033, 0x8034, 0x8035, 0x8036, 0x8037, 0x8038,
-    // 0x8039, 0x803A, 0x803B, 0x803C, 0x803D, 0x803E, 0x803F, 0x8040, 0x8041, 0x8042, 0x8043, 0x8044, 0x8045, 0x8046, 0x8047,
-    // 0x8048, 0x8049, 0x804A, 0x804B, 0x804C, 0x804D, 0x804E, 0x804F, 0x8050, 0x8051, 0x8052, 0x8053, 0x8054, 0x8055, 0x8056,
-    // 0x8057, 0x8058, 0x8059, 0x805A, 0x805B, 0x805C, 0x805D, 0x805E, 0x805F, 0x8060, 0x8061, 0x8062, 0x8063 ]
-    //-> device_type_id = 0x0016
-    //-> certificate_id = "ZIG20142ZB330003-24"
-    //-> security_level = 0
-    //-> security_information = 0
-    //-> version_number = 0x2694
-    //-> certification_type = 0
-    //-> dac_origin_vendor_id is not present
-    //-> dac_origin_product_id is not present
-    static const uint8_t kCdForAllExamples[] = {
-        0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,
-        0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
-        0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x01, 0x62,
-        0x04, 0x82, 0x01, 0x5e, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf1, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80, 0x05, 0x01, 0x80,
-        0x05, 0x02, 0x80, 0x05, 0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05, 0x07, 0x80, 0x05, 0x08,
-        0x80, 0x05, 0x09, 0x80, 0x05, 0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d, 0x80, 0x05, 0x0e, 0x80, 0x05,
-        0x0f, 0x80, 0x05, 0x10, 0x80, 0x05, 0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80, 0x05, 0x14, 0x80, 0x05, 0x15, 0x80,
-        0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05, 0x18, 0x80, 0x05, 0x19, 0x80, 0x05, 0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c,
-        0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05, 0x1f, 0x80, 0x05, 0x20, 0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05,
-        0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05, 0x26, 0x80, 0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80,
-        0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05, 0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30,
-        0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33, 0x80, 0x05, 0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05,
-        0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80, 0x05, 0x3a, 0x80, 0x05, 0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80,
-        0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05, 0x40, 0x80, 0x05, 0x41, 0x80, 0x05, 0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44,
-        0x80, 0x05, 0x45, 0x80, 0x05, 0x46, 0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05, 0x49, 0x80, 0x05, 0x4a, 0x80, 0x05,
-        0x4b, 0x80, 0x05, 0x4c, 0x80, 0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05, 0x50, 0x80, 0x05, 0x51, 0x80,
-        0x05, 0x52, 0x80, 0x05, 0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05, 0x57, 0x80, 0x05, 0x58,
-        0x80, 0x05, 0x59, 0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05, 0x5e, 0x80, 0x05,
-        0x5f, 0x80, 0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16, 0x2c, 0x04,
-        0x13, 0x5a, 0x49, 0x47, 0x32, 0x30, 0x31, 0x34, 0x32, 0x5a, 0x42, 0x33, 0x33, 0x30, 0x30, 0x30, 0x33, 0x2d, 0x32, 0x34,
-        0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x25, 0x07, 0x94, 0x26, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7d, 0x30, 0x7b, 0x02, 0x01,
-        0x03, 0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04,
-        0xf3, 0x71, 0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08,
-        0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x47, 0x30, 0x45, 0x02, 0x20, 0x24, 0xe5, 0xd1, 0xf4, 0x7a, 0x7d,
-        0x7b, 0x0d, 0x20, 0x6a, 0x26, 0xef, 0x69, 0x9b, 0x7c, 0x97, 0x57, 0xb7, 0x2d, 0x46, 0x90, 0x89, 0xde, 0x31, 0x92, 0xe6,
-        0x78, 0xc7, 0x45, 0xe7, 0xf6, 0x0c, 0x02, 0x21, 0x00, 0xf8, 0xaa, 0x2f, 0xa7, 0x11, 0xfc, 0xb7, 0x9b, 0x97, 0xe3, 0x97,
-        0xce, 0xda, 0x66, 0x7b, 0xae, 0x46, 0x4e, 0x2b, 0xd3, 0xff, 0xdf, 0xc3, 0xcc, 0xed, 0x7a, 0xa8, 0xca, 0x5f, 0x4c, 0x1a,
-        0x7c,
-    };
-
-    return CopySpanToMutableSpan(ByteSpan{ kCdForAllExamples }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer)
-{
-    out_firmware_info_buffer.reduce_size(0);
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetDeviceAttestationCert(MutableByteSpan & out_buffer)
-{
-    ReturnErrorCodeIf(out_buffer.size() < mFactoryData->dac_cert.len, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(!mFactoryData->dac_cert.data, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
-
-    return CopySpanToMutableSpan(ByteSpan{ mFactoryData->dac_cert.data, mFactoryData->dac_cert.len }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::GetProductAttestationIntermediateCert(MutableByteSpan & out_buffer)
-{
-    ReturnErrorCodeIf(out_buffer.size() < mFactoryData->pai_cert.len, CHIP_ERROR_BUFFER_TOO_SMALL);
-    ReturnErrorCodeIf(!mFactoryData->pai_cert.data, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
-
-    return CopySpanToMutableSpan(ByteSpan{ mFactoryData->pai_cert.data, mFactoryData->pai_cert.len }, out_buffer);
-}
-
-CHIP_ERROR DeviceAttestationCredsCC13X2_26X2::SignWithDeviceAttestationKey(const ByteSpan & message_to_sign,
-                                                                           MutableByteSpan & out_buffer)
-{
-    Crypto::P256ECDSASignature signature;
-    Crypto::P256Keypair keypair;
-
-    VerifyOrReturnError(!out_buffer.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(!message_to_sign.empty(), CHIP_ERROR_INVALID_ARGUMENT);
-    VerifyOrReturnError(out_buffer.size() >= signature.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    // In a non-exemplary implementation, the public key is not needed here. It is used here merely because
-    // Crypto::P256Keypair is only (currently) constructable from raw keys if both private/public keys are present.
-    ReturnErrorOnFailure(LoadKeypairFromRaw(ByteSpan(mFactoryData->dac_priv_key.data, mFactoryData->dac_priv_key.len),
-                                            ByteSpan(mFactoryData->dac_pub_key.data, mFactoryData->dac_pub_key.len), keypair));
-    ReturnErrorOnFailure(keypair.ECDSA_sign_msg(message_to_sign.data(), message_to_sign.size(), signature));
-
-    return CopySpanToMutableSpan(ByteSpan{ signature.ConstBytes(), signature.Length() }, out_buffer);
-}
-
-} // namespace
-
-DeviceAttestationCredentialsProvider * GetCC13X2_26X2DacProvider()
-{
-    static DeviceAttestationCredsCC13X2_26X2 dac_provider;
-    return &dac_provider;
-}
-
-} // namespace CC13X2_26X2
-} // namespace Credentials
-} // namespace chip
diff --git a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h b/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h
deleted file mode 100644
index 37edd157a228ce..00000000000000
--- a/examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 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 <credentials/DeviceAttestationCredsProvider.h>
-
-namespace chip {
-namespace Credentials {
-namespace CC13X2_26X2 {
-
-/**
- * @brief Get implementation of a sample DAC provider to validate device
- *        attestation procedure.
- *
- * @returns a singleton DeviceAttestationCredentialsProvider that relies on no
- *          storage abstractions.
- */
-DeviceAttestationCredentialsProvider * GetCC13X2_26X2DacProvider();
-
-} // namespace CC13X2_26X2
-} // namespace Credentials
-} // namespace chip
diff --git a/examples/platform/cc13x2_26x2/args.gni b/examples/platform/cc13x2_26x2/args.gni
deleted file mode 100644
index ff1f8159857fc6..00000000000000
--- a/examples/platform/cc13x2_26x2/args.gni
+++ /dev/null
@@ -1,26 +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.
-
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni")
-
-openthread_config_file = "<OpenThreadConfig.h>"
-openthread_core_config_deps = [ "${chip_root}/examples/platform/cc13x2_26x2:openthread_core_config_cc13x2_26x2_chip_examples" ]
-
-chip_ble_project_config_include = "<CHIPProjectConfig.h>"
-chip_device_project_config_include = "<CHIPProjectConfig.h>"
-chip_project_config_include = "<CHIPProjectConfig.h>"
-chip_inet_project_config_include = "<CHIPProjectConfig.h>"
-chip_system_project_config_include = "<CHIPProjectConfig.h>"
diff --git a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h b/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
deleted file mode 100644
index dea83922096149..00000000000000
--- a/examples/platform/cc13x2_26x2/project_include/OpenThreadConfig.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-#ifdef DeviceFamily_CC13X2_CC26X2
-
-/* Number of message buffers reduced to fit into CC26x2x3 RAM */
-#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22
-
-#endif // DeviceFamily_CC13X2_CC26X2
-
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
-// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_SERVICE_DISCOVERY_ENABLE 1
-
-#define OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE 0
-#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 0
-#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
-
-#define OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS 0
-// TCP disabled until OpenThread has a GN/Ninja build for the tcplp library
-#define OPENTHREAD_CONFIG_TCP_ENABLE 0
-
-#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3
-
-// #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1
-// #define OPENTHREAD_CONFIG_COAP_API_ENABLE 1
-#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
-#define OPENTHREAD_CONFIG_COAP_API_ENABLE 0
-#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
-#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_DIAG_ENABLE 0
-#define OPENTHREAD_CONFIG_DNSSD_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_DUA_ENABLE 1
-#define OPENTHREAD_CONFIG_LINK_RAW_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_FILTER_ENABLE 0
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_ACK_TIMEOUT_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_CSMA_BACKOFF_ENABLE 1
-#define OPENTHREAD_CONFIG_MAC_SOFTWARE_RETRANSMIT_ENABLE 1
-#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE 1
-#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE 1
-#define OPENTHREAD_CONFIG_MLR_ENABLE 1
-#define OPENTHREAD_CONFIG_NETDATA_PUBLISHER_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_AUTO_START_DEFAULT_MODE 1
-#define OPENTHREAD_CONFIG_SRP_SERVER_ENABLE 0
-#define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13xx_cc26xx-config-matter.h"
diff --git a/examples/pump-app/cc13x2x7_26x2x7/.gn b/examples/pump-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/BUILD.gn b/examples/pump-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 02e87a04f067f0..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,118 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/pump-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":pump_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("pump_app") {
-  output_name = "chip-${ti_simplelink_board}-pump-example.out"
-
-  sources = [
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/CHIPDeviceManager.cpp",
-    "${project_dir}/main/DeviceCallbacks.cpp",
-    "${project_dir}/main/PumpManager.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/pump-app/pump-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":pump_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 6bfb8feee4665f..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,310 +0,0 @@
-# Matter Pump Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Pump Example Application](#matter-pump-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX pump example application provides a working demonstration of a
-connected pump device. This uses the open-source Matter implementation and the
-Texas Instruments SimpleLinkā„¢ CC13XX and CC26XX software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The pump example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | BLE Advertisement (Enable/Disable)     |
-| Left Button (`BTN-1`) Press (more than 5000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Toggle pump state                      |
-| Red & Green LED Blinking State                   | Pump transition from either Start/Stop |
-| Red & Green LED On State                         | Pump is started                        |
-| Red & Green LED Off State                        | Pump stopped                           |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-1`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** The pump configuration & control cluster commands have the following
-formats:
-
-```
-./chip-tool pumpconfigurationandcontrol <write> <attribute-name> <attribute-values> <destination-id> <endpoint-id-ignored-for-group-commands>
-```
-
-Send commands to the pump-app. Here are some example commands:
-
-Write normal operation mode (0) to device
-
-```
-./chip-tool pumpconfigurationandcontrol write operation-mode 0 1 1
-```
-
-Get current operation mode
-
-```
-./chip-tool pumpconfigurationandcontrol read effective-operation-mode 1 1
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-1` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-app/cc13x2x7_26x2x7/args.gni b/examples/pump-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 1467940fa222ee..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,53 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-#chip_progress_logging = false
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x800A"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-chip_openthread_ftd = false
-
-custom_factory_data = true
diff --git a/examples/pump-app/cc13x2x7_26x2x7/build_overrides b/examples/pump-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg
deleted file mode 100644
index b46e258311e19b..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg
deleted file mode 100644
index 85dc32c0530acc..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg
deleted file mode 100644
index f1563f8933b01c..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg
deleted file mode 100644
index a3d63e4dfcd944..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg
deleted file mode 100644
index ad07cbf180d1d0..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg
deleted file mode 100644
index 43010467f37d95..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg
deleted file mode 100644
index 119886b184c7c5..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg
deleted file mode 100644
index 4bd4776f692973..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg
deleted file mode 100644
index 33cb488a6541ec..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg
deleted file mode 100644
index 66a2855628808b..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg
deleted file mode 100644
index d0270ecaaedf9f..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg
deleted file mode 100644
index 73f21c9a69d118..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg
deleted file mode 100644
index 36a34f4a5e12e3..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg
deleted file mode 100644
index e6a4e04371a369..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg
deleted file mode 100644
index 6a38f067e4fc4c..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg
deleted file mode 100644
index 6a2a9a8a813ce0..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg b/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg
deleted file mode 100644
index c6e6dd2249f498..00000000000000
Binary files a/examples/pump-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg and /dev/null differ
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md b/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md
deleted file mode 100644
index ac31ab8bbea1f0..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-ccs.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Programming and Debugging with CCS
-
--   Download and install [Code Composer Studio][ccs].
-
--   Use `xdsdfu` to determine the XDS110 serial number to identify the device.
-    This may be skipped if there is only one LaunchPad connected to your PC, but
-    it is recommended.
-
-    ```
-    C:\>cd \ti\ccs1010\ccs\ccs_base\common\uscif\xds110
-
-    C:\ti\ccs1010\ccs\ccs_base\common\uscif\xds110>xdsdfu.exe -e
-
-    USB Device Firmware Upgrade Utility
-    Copyright (c) 2008-2019 Texas Instruments Incorporated.  All rights reserved.
-
-    Scanning USB buses for supported XDS110 devices...
-    ```
-
-<<<< Device 0 >>>>
-
-VID: 0x0451 PID: 0xbef3 Device Name: XDS110 Embed with CMSIS-DAP Version:
-3.0.0.13 Manufacturer: Texas Instruments Serial Num: L4100652 Mode: Runtime
-Configuration: Standard
-
-Found 1 device.
-
-```
-In this example, my LaunchPad's XDS110 has a serial number of `L4100652`.
-
-- Start a new Code Composer Studio Workspace. This can be named anything you
-would like. But it is recommended that you use a blank workspace.
-
-![CCS step 1](images/ccs-1.jpg)
-
-- Create a new Target Configuration File by selecting `File` >> `New` >>
-`Target Configuration File`. This file can also be exported from UniFlash
-with the `download ccxml` function.
-
-![CCS step 2](images/ccs-2.jpg)
-
-- Name the new ccxml file a useful name. Here I use the XDS110 serial number
-from before. Leave the Location as the shared location and click `Finish` to
-create the file.
-
-![CCS step 3](images/ccs-3.jpg)
-
-- In the new ccxml, select the `Connection` and the `Board or Device`. This may
-be different for your setup, but all LaunchPads will use the `Texas
-Instruments XDS110 USB Debug Probe` for the target connection. And the and a
-`CC1352R1F3` is mounted on the `CC1352R1_LAUNCHXL` LaunchPads. Builds for
-other LaunchPads should use the corresponding SoC name.
-
-![CCS step 4](images/ccs-4.jpg)
-
-- Now set the XDS110 serial number in the advanced tab of the ccxml. First
-select the `Advanced` tab at the bottom of the window. Then select the Debug
-Probe in the connection tree. Then select `Select by serial number` in the
-`Debug Probe Selection`. Then enter the serial number from `xdsdfu` earlier
-in the `Enter the serial number` text field. Finally click `Save` to save
-your ccxml.
-
-![CCS step 5](images/ccs-5.jpg)
-
-- Clicking `Test Connection` with the LaunchPad connected will cause a JTAG
-Integrity scan with the Debug Probe. This is a nice way to check that your
-ccxml is setup correctly.
-
-![CCS step 6](images/ccs-6.jpg)
-
-- Now open the Debug Configurations dialog to setup a new debug configuration.
-Select `Run` >> `Debug Configurations...`.
-
-![CCS step 7](images/ccs-7.jpg)
-
-- Create a new launch configuration from the default CCS launch configuration.
-Select `Code Composer Studio - Device Debugging` and then create a new launch
-configuration with the `New launch configuration` button.
-
-![CCS step 8](images/ccs-8.jpg)
-
-- Name your new configuration. Update the `Target Configuration` field with the
-ccxml you created earlier. Click `Apply` to save the launch configuration.
-
-Once the launch configuration is created you do not need to re-create it
-every time. The Debug session can be started with the `Debug` button in the
-`Debug Configurations` dialog, or by selecting `Run` >> `Debug History` >>
-`<launch configuration name>`.
-
-![CCS step 9](images/ccs-9.jpg)
-
-- Now that the Debug session is started we can connect to the target. Make sure
-that the right Debug Probe is selected in the `Debug` window and click
-`Connect Target`.
-
-![CCS step 9](images/ccs-10.jpg)
-
-- The target MCU is connected. The MCU is halted on connection by default.
-Select the `Load Program...` option to select the ELF image to load.
-
-![CCS step 9](images/ccs-11.jpg)
-
-- Navigate to the ELF file
-(`${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-file) in the `Load Program` dialog. Click `OK` to begin loading the target.
-
-![CCS step 9](images/ccs-12.jpg)
-
-- After locating the source file for `main.cpp` we can step through the code
-as it executes.
-
-![CCS step 9](images/ccs-13.jpg)
-
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-```
diff --git a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md b/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
deleted file mode 100644
index f6b3acb27b9b28..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Programming with UniFlash
-
--   Download and install [UniFlash][uniflash].
-
--   Select the Device Detect option. Then select the device you wish to program.
-    Or you can create a new configuration if you know the debugger serial number
-
-    ![UniFlash step 1](images/uniflash-1.jpg)
-
--   Browse for your build image by clicking the `Browse` button. It will be at
-    `${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-
-    ![UniFlash step 2](images/uniflash-2.jpg)
-
--   Load the image by clicking the `Load Image` button. This will eventually
-    result in a success message in the console below.
-
-    ![UniFlash step 3](images/uniflash-3.jpg)
-
--   Open a terminal to the XDS110 User UART and interact with the example
-    application.
-
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 49ba5480e43f02..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include "CHIPDeviceManager.h"
-#include "DeviceCallbacks.h"
-#include <app/server/Dnssd.h>
-#include <app/server/Server.h>
-
-#include "FreeRTOS.h"
-#include <app/EventLogging.h>
-#include <app/util/af-types.h>
-#include <app/util/attribute-storage.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-#define PCC_CLUSTER_ENDPOINT 1
-#define ONOFF_CLUSTER_ENDPOINT 1
-#define EXTENDED_DISCOVERY_TIMEOUT_SEC 20
-
-using namespace chip;
-using namespace chip::app;
-using namespace chip::Credentials;
-using namespace chip::DeviceLayer;
-using namespace chip::DeviceManager;
-using namespace chip::app::Clusters;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-
-AppTask AppTask::sAppTask;
-
-static DeviceCallbacks sDeviceCallbacks;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(chip::Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-static const chip::EndpointId sIdentifyEndpointId = 0;
-static const uint32_t sIdentifyBlinkRateMs        = 500;
-
-::Identify stIdentify = { sIdentifyEndpointId, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#elif CONFIG_OPENTHREAD_MTD_SED
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGPRESSED;
-    buttonParams.longPressDuration = 5000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Initialize Pump module
-    PLAT_LOG("Initialize Pump");
-    PumpMgr().Init();
-
-    PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY
-    DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(EXTENDED_DISCOVERY_TIMEOUT_SEC);
-#endif
-
-    // Init ZCL Data Model
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    uint32_t iterationCount;
-    mFactoryDataProvider.GetSpake2pIterationCount(iterationCount);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
-
-    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
-    ret                           = deviceMgr.Init(&sDeviceCallbacks);
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("CHIPDeviceManager::Init() failed: %s", ErrorStr(ret));
-        while (true)
-            ;
-    }
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGPRESSED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongPressed;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // If the action has been initiated by the pump, update the pump trait
-    // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start initiated");
-        ; // TODO
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Stop initiated");
-        ; // TODO
-    }
-
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void AppTask::ActionCompleted(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // if the action has been completed by the pump, update the pump trait.
-    // Turn on the pump state LED if in a STARTED state OR
-    // Turn off the pump state LED if in an STOPPED state.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-        // Signal to the PCC cluster, that the pump is running
-        sAppTask.UpdateClusterState();
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Pump stop completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOff(sAppRedHandle);
-        // Signal to the PCC cluster, that the pump is NOT running
-        sAppTask.UpdateClusterState();
-    }
-    if (aActor == AppEvent::kEventType_ButtonLeft)
-    {
-        sAppTask.UpdateClusterState();
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle Pump state
-            if (!PumpMgr().IsStopped())
-            {
-                PumpMgr().InitiateAction(0, PumpManager::STOP_ACTION);
-            }
-            else
-            {
-                PumpMgr().InitiateAction(0, PumpManager::START_ACTION);
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Post event for demonstration purposes, we must ensure that the
-            // LogEvent is called in the right context which is the Matter mainloop
-            // thru ScheduleWork()
-            chip::DeviceLayer::PlatformMgr().ScheduleWork(sAppTask.PostEvents, reinterpret_cast<intptr_t>(nullptr));
-
-            // Toggle BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisements");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        else if (AppEvent::kAppEventButtonType_LongPressed == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, sIdentifyBlinkRateMs, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        if (!PumpMgr().IsStopped())
-        {
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        }
-        else
-        {
-            LED_setOff(sAppGreenHandle);
-        }
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::InitOnOffClusterState()
-{
-
-    Protocols::InteractionModel::Status status;
-
-    ChipLogProgress(NotSpecified, "Init On/Off clusterstate");
-
-    // Write false as pump always boots in stopped mode
-    status = OnOff::Attributes::OnOff::Set(ONOFF_CLUSTER_ENDPOINT, false);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Init On/Off state  %x", to_underlying(status));
-    }
-}
-
-void AppTask::InitPCCClusterState() {}
-
-void AppTask::UpdateClusterState(void)
-{
-    // We must ensure that the Cluster accessors gets called in the right context
-    // which is the Matter mainloop thru ScheduleWork()
-    chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateCluster, reinterpret_cast<intptr_t>(nullptr));
-}
-
-void AppTask::UpdateCluster(intptr_t context)
-{
-    Protocols::InteractionModel::Status status;
-    BitMask<PumpConfigurationAndControl::PumpStatusBitmap> pumpStatus;
-
-    ChipLogProgress(NotSpecified, "Update Cluster State");
-
-    // Update the PumpStatus
-    PumpConfigurationAndControl::Attributes::PumpStatus::Get(PCC_CLUSTER_ENDPOINT, &pumpStatus);
-    if (PumpMgr().IsStopped())
-    {
-        pumpStatus.Clear(PumpConfigurationAndControl::PumpStatusBitmap::kRunning);
-    }
-    else
-    {
-        pumpStatus.Set(PumpConfigurationAndControl::PumpStatusBitmap::kRunning);
-    }
-    PumpConfigurationAndControl::Attributes::PumpStatus::Set(PCC_CLUSTER_ENDPOINT, pumpStatus);
-
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(PCC_CLUSTER_ENDPOINT,
-                                                                       PumpConfigurationAndControl::ControlModeEnum::kConstantFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Flow error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantPressure);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Pressure error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Speed error  %x", to_underlying(status));
-    }
-    status = PumpConfigurationAndControl::Attributes::ControlMode::Set(
-        PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantTemperature);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Constant Temperature error  %x", to_underlying(status));
-    }
-
-    // Write the new values
-    bool onOffState = !PumpMgr().IsStopped();
-    status          = OnOff::Attributes::OnOff::Set(ONOFF_CLUSTER_ENDPOINT, onOffState);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating On/Off state  %x", to_underlying(status));
-    }
-
-    int16_t maxPressure = PumpMgr().GetMaxPressure();
-    status              = PumpConfigurationAndControl::Attributes::MaxPressure::Set(PCC_CLUSTER_ENDPOINT, maxPressure);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxPressure  %x", to_underlying(status));
-    }
-
-    uint16_t maxSpeed = PumpMgr().GetMaxSpeed();
-    status            = PumpConfigurationAndControl::Attributes::MaxSpeed::Set(PCC_CLUSTER_ENDPOINT, maxSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t maxFlow = PumpMgr().GetMaxFlow();
-    status           = PumpConfigurationAndControl::Attributes::MaxFlow::Set(PCC_CLUSTER_ENDPOINT, maxFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxFlow  %x", to_underlying(status));
-    }
-
-    int16_t minConstPress = PumpMgr().GetMinConstPressure();
-    status                = PumpConfigurationAndControl::Attributes::MinConstPressure::Set(PCC_CLUSTER_ENDPOINT, minConstPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstPressure  %x", to_underlying(status));
-    }
-
-    int16_t maxConstPress = PumpMgr().GetMaxConstPressure();
-    status                = PumpConfigurationAndControl::Attributes::MaxConstPressure::Set(PCC_CLUSTER_ENDPOINT, maxConstPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstPressure  %x", to_underlying(status));
-    }
-
-    int16_t minCompPress = PumpMgr().GetMinCompPressure();
-    status               = PumpConfigurationAndControl::Attributes::MinCompPressure::Set(PCC_CLUSTER_ENDPOINT, minCompPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinCompPressure  %x", to_underlying(status));
-    }
-
-    int16_t maxCompPress = PumpMgr().GetMaxCompPressure();
-    status               = PumpConfigurationAndControl::Attributes::MaxCompPressure::Set(PCC_CLUSTER_ENDPOINT, maxCompPress);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxCompPressure  %x", to_underlying(status));
-    }
-
-    uint16_t minConstSpeed = PumpMgr().GetMinConstSpeed();
-    status                 = PumpConfigurationAndControl::Attributes::MinConstSpeed::Set(PCC_CLUSTER_ENDPOINT, minConstSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t maxConstSpeed = PumpMgr().GetMaxConstSpeed();
-    status                 = PumpConfigurationAndControl::Attributes::MaxConstSpeed::Set(PCC_CLUSTER_ENDPOINT, maxConstSpeed);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstSpeed  %x", to_underlying(status));
-    }
-
-    uint16_t minConstFlow = PumpMgr().GetMinConstFlow();
-    status                = PumpConfigurationAndControl::Attributes::MinConstFlow::Set(PCC_CLUSTER_ENDPOINT, minConstFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstFlow  %x", to_underlying(status));
-    }
-
-    uint16_t maxConstFlow = PumpMgr().GetMaxConstFlow();
-    status                = PumpConfigurationAndControl::Attributes::MaxConstFlow::Set(PCC_CLUSTER_ENDPOINT, maxConstFlow);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstFlow  %x", to_underlying(status));
-    }
-
-    int16_t minConstTemp = PumpMgr().GetMinConstTemp();
-    status               = PumpConfigurationAndControl::Attributes::MinConstTemp::Set(PCC_CLUSTER_ENDPOINT, minConstTemp);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MinConstTemp  %x", to_underlying(status));
-    }
-
-    int16_t maxConstTemp = PumpMgr().GetMaxConstTemp();
-    status               = PumpConfigurationAndControl::Attributes::MaxConstTemp::Set(PCC_CLUSTER_ENDPOINT, maxConstTemp);
-    if (status != Protocols::InteractionModel::Status::Success)
-    {
-        ChipLogError(NotSpecified, "ERR: Updating MaxConstTemp  %x", to_underlying(status));
-    }
-}
-
-void AppTask::PostEvents(intptr_t context)
-{
-    // Example on posting events - here we post the general fault event on endpoints with PCC Server enabled
-    for (auto endpoint : EnabledEndpointsWithServerCluster(PumpConfigurationAndControl::Id))
-    {
-        PumpConfigurationAndControl::Events::GeneralFault::Type event;
-        EventNumber eventNumber;
-
-        ChipLogProgress(Zcl, "AppTask: Post PCC GeneralFault event");
-        // Using default priority for the event
-        if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
-        {
-            ChipLogError(Zcl, "AppTask: Failed to record GeneralFault event");
-        }
-    }
-}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
deleted file mode 100644
index 11a8fbbd69b2a6..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 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.
- */
-
-/**
- *    @file
- *      This file implements the CHIP Device Interface that is used by
- *      applications to interact with the CHIP stack
- *
- */
-
-#include <stdlib.h>
-
-#include "AppConfig.h"
-#include "CHIPDeviceManager.h"
-
-#include <app/ConcreteAttributePath.h>
-#include <app/util/basic-types.h>
-#include <lib/core/ErrorStr.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CodeUtils.h>
-#include <setup_payload/SetupPayload.h>
-
-using namespace ::chip;
-
-namespace chip {
-namespace DeviceManager {
-
-using namespace ::chip::DeviceLayer;
-
-void CHIPDeviceManager::CommonDeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
-{
-    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
-    if (cb != nullptr)
-    {
-        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
-    }
-}
-
-CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
-{
-    mCB = cb;
-
-    // Register a function to receive events from the CHIP device layer.  Note that calls to
-    // this function will happen on the CHIP event loop thread, not the app_main thread.
-    PlatformMgr().AddEventHandler(CHIPDeviceManager::CommonDeviceEventHandler, reinterpret_cast<intptr_t>(cb));
-
-    // Start a task to run the CHIP Device event loop.
-    return PlatformMgr().StartEventLoopTask();
-}
-} // namespace DeviceManager
-} // namespace chip
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
-        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
-    if (cb != nullptr)
-    {
-        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type, size,
-                                        value);
-    }
-}
-
-chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                           uint8_t type, uint16_t size, uint8_t * value)
-{
-    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
-        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
-    if (cb != nullptr)
-    {
-        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type,
-                                              size, value);
-    }
-
-    return chip::Protocols::InteractionModel::Status::Success;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
deleted file mode 100644
index 9bcfec5a6f8b51..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- * @file DeviceCallbacks.cpp
- *
- * Implements all the callbacks to the application from the CHIP Stack
- *
- **/
-
-#include "DeviceCallbacks.h"
-#include "AppConfig.h"
-#include "PumpManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/server/Dnssd.h>
-#include <app/util/util.h>
-#include <lib/support/CodeUtils.h>
-
-using namespace chip;
-using namespace chip::Inet;
-using namespace chip::System;
-using namespace chip::DeviceLayer;
-using namespace chip::app::Clusters;
-
-void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    switch (event->Type)
-    {
-    case DeviceEventType::kThreadConnectivityChange:
-        OnThreadConnectivityChange(event);
-        break;
-
-    case DeviceEventType::kInternetConnectivityChange:
-        OnInternetConnectivityChange(event);
-        break;
-
-    case DeviceEventType::kServiceProvisioningChange:
-        PLAT_LOG("## Service provisioning state change (%d,%d)", event->ServiceProvisioningChange.IsServiceProvisioned,
-                 event->ServiceProvisioningChange.ServiceConfigUpdated);
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionEstablished:
-        PLAT_LOG("CHIPoBLE connection established");
-        break;
-
-    case DeviceEventType::kCHIPoBLEConnectionClosed:
-        PLAT_LOG("CHIPoBLE disconnected");
-        break;
-
-    case DeviceEventType::kThreadStateChange:
-        PLAT_LOG("## Thread stack state change (%x)", event->ThreadStateChange.OpenThread.Flags);
-        break;
-
-    case DeviceEventType::kCommissioningComplete:
-        PLAT_LOG("Commissioning complete for fabric 0x%x", event->CommissioningComplete.fabricIndex);
-        break;
-
-    case DeviceEventType::kOperationalNetworkEnabled:
-        PLAT_LOG("## Operational network enabled");
-        break;
-
-    case DeviceEventType::kDnssdInitialized:
-        PLAT_LOG("## Dnssd platform initialized");
-        break;
-
-    case DeviceEventType::kFailSafeTimerExpired:
-        PLAT_LOG("## Failsafe timer expired...");
-        break;
-
-    case DeviceEventType::kInterfaceIpAddressChanged:
-        PLAT_LOG("*** Interface IP address changed ***");
-        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
-            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
-        {
-            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
-            // will not trigger a 'internet connectivity change' as there is no internet
-            // connectivity. MDNS still wants to refresh its listening interfaces to include the
-            // newly selected address.
-            chip::app::DnssdServer::Instance().StartServer();
-        }
-        break;
-    }
-}
-
-chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCallback(chip::EndpointId endpointId,
-                                                                                      chip::ClusterId clusterId,
-                                                                                      chip::AttributeId attributeId, uint8_t type,
-                                                                                      uint16_t size, uint8_t * value)
-{
-    PLAT_LOG("PreAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
-             endpointId, attributeId);
-
-    switch (clusterId)
-    {
-    case PumpConfigurationAndControl::Id:
-        break;
-
-    case OnOff::Id:
-        break;
-
-    case LevelControl::Id:
-        break;
-
-    default:
-        PLAT_LOG("Unhandled cluster ID: %d", clusterId);
-        break;
-    }
-
-    return chip::Protocols::InteractionModel::Status::Success;
-}
-
-void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
-                                                  uint16_t size, uint8_t * value)
-{
-    PLAT_LOG("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
-             endpointId, attributeId);
-
-    switch (clusterId)
-    {
-    case PumpConfigurationAndControl::Id:
-        break;
-
-    case OnOff::Id:
-        OnOnOffPostAttributeChangeCallback(endpointId, attributeId, value);
-        break;
-
-    case LevelControl::Id:
-        OnLevelControlAttributeChangeCallback(endpointId, attributeId, value);
-        break;
-
-    default:
-        PLAT_LOG("Unhandled cluster ID: %d", clusterId);
-        break;
-    }
-}
-
-void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
-{
-    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
-    {
-        PLAT_LOG("Server ready at: %s:%d", event->InternetConnectivityChange.ipAddress, CHIP_PORT);
-        chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
-    {
-        PLAT_LOG("Lost IPv4 connectivity...");
-    }
-    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
-    {
-        PLAT_LOG("IPv6 Server ready...");
-        chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
-    {
-        PLAT_LOG("Lost IPv6 connectivity...");
-    }
-}
-
-void DeviceCallbacks::OnThreadConnectivityChange(const ChipDeviceEvent * event)
-{
-    if (event->ThreadConnectivityChange.Result == kConnectivity_Established)
-    {
-        PLAT_LOG("## Thread connectivity established...");
-    }
-    else if (event->ThreadConnectivityChange.Result == kConnectivity_Lost)
-    {
-        PLAT_LOG("## Thread connectivity lost...");
-    }
-    else if (event->ThreadConnectivityChange.Result == kConnectivity_NoChange)
-    {
-        PLAT_LOG("## No change in Thread connectivity...");
-    }
-}
-
-void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    VerifyOrExit(attributeId == OnOff::Attributes::OnOff::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    PumpMgr().InitiateAction(0, *value ? PumpManager::START_ACTION : PumpManager::STOP_ACTION);
-
-exit:
-    return;
-}
-
-void DeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
-{
-    VerifyOrExit(attributeId == LevelControl::Attributes::CurrentLevel::Id,
-                 PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId));
-    VerifyOrExit(endpointId == 1, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId));
-
-    ChipLogProgress(Zcl, "[pump-app] Cluster LevelControl: attribute CurrentLevel set to %u", *value);
-
-exit:
-    return;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp
deleted file mode 100644
index 0e7e90e27aba40..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/PumpManager.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "PumpManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "FreeRTOS.h"
-
-#define ACTUATOR_MOVEMENT_PERIOS_MS 500
-
-PumpManager PumpManager::sPump;
-
-int PumpManager::Init()
-{
-    int ret = 0;
-
-    mTimerHandle = xTimerCreate("BLT_TIMER", pdMS_TO_TICKS(ACTUATOR_MOVEMENT_PERIOS_MS), pdFALSE, this, TimerEventHandler);
-    if (NULL == mTimerHandle)
-    {
-        PLAT_LOG("failed to create pump timer");
-        while (true)
-            ;
-    }
-
-    mState               = kState_StopCompleted;
-    mAutoStartTimerArmed = false;
-    mAutoRestart         = false;
-    mAutoStartDuration   = 0;
-
-    return ret;
-}
-
-void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool PumpManager::IsActionInProgress()
-{
-    return (mState == kState_StartInitiated || mState == kState_StopInitiated);
-}
-
-bool PumpManager::IsStopped()
-{
-    return (mState == kState_StopCompleted);
-}
-
-void PumpManager::EnableAutoRestart(bool aOn)
-{
-    mAutoRestart = aOn;
-}
-
-void PumpManager::SetAutoStartDuration(uint32_t aDurationInSecs)
-{
-    mAutoStartDuration = aDurationInSecs;
-}
-
-bool PumpManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Start/Stop Action only when the previous one is complete.
-    if (mState == kState_StartCompleted && aAction == STOP_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StopInitiated;
-    }
-    else if (mState == kState_StopCompleted && aAction == START_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StartInitiated;
-    }
-
-    if (action_initiated)
-    {
-        if (mAutoStartTimerArmed && new_state == kState_StartInitiated)
-        {
-            // If auto start timer has been armed and someone initiates start,
-            // cancel the timer and continue as normal.
-            mAutoStartTimerArmed = false;
-
-            CancelTimer();
-        }
-
-        PumpTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-    return action_initiated;
-}
-
-void PumpManager::PumpTimer(uint32_t aTimeoutMs)
-{
-    xTimerChangePeriod(mTimerHandle, pdMS_TO_TICKS(aTimeoutMs), 100);
-    xTimerStart(mTimerHandle, 100);
-}
-
-void PumpManager::CancelTimer(void)
-{
-    xTimerStop(mTimerHandle, 100);
-}
-
-void PumpManager::TimerEventHandler(TimerHandle_t aTimer)
-{
-    PumpManager * pump = static_cast<PumpManager *>(pvTimerGetTimerID(aTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sPumpTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                   = AppEvent::kEventType_AppEvent;
-    event.PumpStateEvent.Context = static_cast<PumpManager *>(pump);
-    if (pump->mAutoStartTimerArmed)
-    {
-        event.Handler = AutoRestartTimerEventHandler;
-    }
-    else
-    {
-        event.Handler = ActuatorMovementTimerEventHandler;
-    }
-    GetAppTask().PostEvent(&event);
-}
-
-void PumpManager::AutoRestartTimerEventHandler(AppEvent * aEvent)
-{
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-    int32_t actor      = 0;
-
-    // Make sure auto start timer is still armed.
-    if (!pump->mAutoStartTimerArmed)
-    {
-        return;
-    }
-
-    pump->mAutoStartTimerArmed = false;
-
-    PLAT_LOG("Auto Re-Start has been triggered!");
-
-    pump->InitiateAction(actor, START_ACTION);
-}
-
-void PumpManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-
-    if (pump->mState == kState_StartInitiated)
-    {
-        pump->mState    = kState_StartCompleted;
-        actionCompleted = START_ACTION;
-    }
-    else if (pump->mState == kState_StopInitiated)
-    {
-        pump->mState    = kState_StopCompleted;
-        actionCompleted = STOP_ACTION;
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (pump->mActionCompleted_CB)
-        {
-            pump->mActionCompleted_CB(actionCompleted, pump->mCurrentActor);
-        }
-
-        if (pump->mAutoRestart && actionCompleted == STOP_ACTION)
-        {
-            // Start the timer for auto restart
-            pump->PumpTimer(pump->mAutoStartDuration * 1000);
-
-            pump->mAutoStartTimerArmed = true;
-
-            PLAT_LOG("Auto Re-start enabled. Will be triggered in %u seconds", pump->mAutoStartDuration);
-        }
-    }
-}
-
-int16_t PumpManager::GetMaxPressure()
-{
-    // 1.6.1. MaxPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 2000.0 kPa as Max Pressure
-    return 20000;
-}
-
-uint16_t PumpManager::GetMaxSpeed()
-{
-    // 1.6.2. MaxSpeed Attribute
-    // Range 0 RPM to 65534 RPM (steps of 1 RPM)
-    // 65535 is invalid value - perhaps 'null'
-
-    // Return 1000 RPM as MaxSpeed
-    return 1000;
-}
-
-uint16_t PumpManager::GetMaxFlow()
-{
-    // 1.6.3. MaxFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 200.0 m3/h as MaxFlow
-    return 2000;
-}
-
-int16_t PumpManager::GetMinConstPressure()
-{
-    // 1.6.4. MinConstPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return -100.0 kPa as MinConstPressure
-    return -1000;
-}
-
-int16_t PumpManager::GetMaxConstPressure()
-{
-    // 1.6.5. MaxConstPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 100.0 kPa as MaxConstPressure
-    return 1000;
-}
-
-int16_t PumpManager::GetMinCompPressure()
-{
-    // 1.6.6. MinCompPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return -20.0 kPa as MinCompPressure
-    return -200;
-}
-
-int16_t PumpManager::GetMaxCompPressure()
-{
-    // 1.6.7. MaxCompPressure Attribute
-    // Range -3276.7 kPa to 3276.7 kPa (steps of 0.1 kPa)
-    // -3276.8 is invalid value - perhaps 'null'
-
-    // Return 20.0 kPa as MaxCompPressure
-    return 200;
-}
-
-uint16_t PumpManager::GetMinConstSpeed()
-{
-    // 1.6.8. MinConstSpeed Attribute
-    // Range 0 to 65534 RPM (steps of 1 RPM)
-    // 65535 RPM is invalid valud - perhaps 'null'
-
-    // Return 200 RPM as MinConstSpeed
-    return 200;
-}
-
-uint16_t PumpManager::GetMaxConstSpeed()
-{
-    // 1.6.9. MaxConstSpeed Attribute
-    // Range 0 to 65534 RPM (steps of 1 RPM)
-    // 65535 RPM is invalid valud - perhaps 'null'
-
-    // Return 2000 RPM as MaxConstSpeed
-    return 2000;
-}
-
-uint16_t PumpManager::GetMinConstFlow()
-{
-    // 1.6.10. MinConstFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 12.5 m3/h as MinConstFlow
-    return 125;
-}
-
-uint16_t PumpManager::GetMaxConstFlow()
-{
-    // 1.6.11. MaxConstFlow Attribute
-    // Range 0 m3/h to 6553.4 m3/h (steps of 0.1 m3/h)
-    // 6553.5 m3/h is invalid value - perhaps 'null'
-
-    // Return 655.7 m3/h as MaxConstFlow
-    return 6557;
-}
-
-int16_t PumpManager::GetMinConstTemp()
-{
-    // 1.6.12. MinConstTemp Attribute
-    // Range -273.15 C to 327.67 C (steps of 0.01 C)
-    // All other values are invalid values - perhaps 'null'
-
-    // Return 30.00 C as MinConstTemp
-    return 3000;
-}
-
-int16_t PumpManager::GetMaxConstTemp()
-{
-    // 1.6.13. MaxConstTemp Attribute
-    // Range -273.15 C to 327.67 C (steps of 0.01 C)
-    // All other values are invalid values - perhaps 'null'
-
-    // Return 56.00 C as MaxConstTemp
-    return 5600;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index 54faa0db6e7314..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,55 +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.
- */
-
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "PumpManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    GetAppTask().InitOnOffClusterState();
-}
-
-void emberAfPumpConfigurationAndControlClusterInitCallback(chip::EndpointId endpoint)
-{
-    GetAppTask().InitPCCClusterState();
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index b925344ddb4c9a..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index 3a9c606e95c330..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-        kAppEventButtonType_LongPressed,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } PumpStateEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index 47b4fd56f2d671..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "PumpManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-struct Identify;
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostStartActionRequest(int32_t aActor, PumpManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-    void UpdateClusterState();
-    void InitOnOffClusterState();
-    void InitPCCClusterState();
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(PumpManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PumpManager::Action_t aAction, int32_t aActor);
-
-    static void UpdateCluster(intptr_t context);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-    static void PostEvents(intptr_t context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
deleted file mode 100644
index da1214d2995f6e..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 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.
- */
-
-/**
- *    @file
- *      This file contains definitions for the CHIP DeviceManager Interface
- *
- *      This object will co-ordinate multiple activities such as
- *      initialisation, rendezvous, session mgmt and other such
- *      activities within the CHIP stack. This is a singleton object.
- */
-
-#pragma once
-
-#include <lib/core/CHIPCore.h>
-#include <lib/core/CHIPError.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <lib/support/DLLUtil.h>
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include <app/util/af-types.h>
-
-namespace chip {
-namespace DeviceManager {
-
-/**
- * @brief
- *   This class provides a skeleton for all the callback functions. The functions will be
- *   called by other objects within the CHIP stack for specific events.
- *   Applications interested in receiving specific callbacks can specialize this class and handle
- *   these events in their implementation of this class.
- */
-class DLL_EXPORT CHIPDeviceManagerCallbacks
-{
-public:
-    /**
-     * @brief
-     *   Called when CHIP Device events (PublicEventTypes) are triggered.
-     *
-     * @param event   ChipDeviceEvent that occurred
-     * @param arg     arguments specific to the event, if any
-     */
-    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-    /**
-     * @brief
-     *   Called after an attribute has been changed
-     *
-     * @param endpoint           endpoint id
-     * @param clusterID          cluster id
-     * @param attributeId        attribute id that was changed
-     * @param mask               mask of the attribute
-     * @param manufacturerCode   manufacturer code
-     * @param type               attribute type
-     * @param size               size of the attribute
-     * @param value              pointer to the new value
-     */
-    virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t type, uint16_t size, uint8_t * value)
-    {}
-    /**
-     * @brief
-     *   Called just before an attribute will be changed
-     *
-     * @param endpoint           endpoint id
-     * @param clusterID          cluster id
-     * @param attributeId        attribute id that was changed
-     * @param mask               mask of the attribute
-     * @param manufacturerCode   manufacturer code
-     * @param type               attribute type
-     * @param size               size of the attribute
-     * @param value              pointer to the new value
-     *
-     * @return Success if the attribute can be changed, otherwise Failed.
-     */
-    virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpoint,
-                                                                                 chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t type,
-                                                                                 uint16_t size, uint8_t * value)
-    {
-        return chip::Protocols::InteractionModel::Status::Success;
-    }
-    virtual ~CHIPDeviceManagerCallbacks() {}
-};
-
-/**
- * @brief
- *   A common class that drives other components of the CHIP stack
- */
-class DLL_EXPORT CHIPDeviceManager
-{
-public:
-    CHIPDeviceManager(const CHIPDeviceManager &)             = delete;
-    CHIPDeviceManager(const CHIPDeviceManager &&)            = delete;
-    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
-
-    static CHIPDeviceManager & GetInstance()
-    {
-        static CHIPDeviceManager instance;
-        return instance;
-    }
-
-    /**
-     * @brief
-     *   Initialise CHIPDeviceManager
-     *
-     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
-     */
-    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
-    /**
-     * @brief
-     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
-     *
-     */
-    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
-
-    /**
-     * Use internally for registration of the ChipDeviceEvents
-     */
-    static void CommonDeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-
-private:
-    CHIPDeviceManagerCallbacks * mCB = nullptr;
-    CHIPDeviceManager() {}
-};
-
-} // namespace DeviceManager
-} // namespace chip
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index e10a37616e6360..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-// Security and Authentication always enabled
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- *
- * TODO: (#17080) 1 should be OK since almost all commands are synchronous, should be some larger number after we resolved the issue
- * of the large memory footprint of ReadHandler.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 1
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- *
- * TODO: (#17080) 1 should be OK since most write requests can be synchronous (not chunked), should be some larger number after we
- * resolved the issue of the large memory footprint of ReadHandler.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 1
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
deleted file mode 100644
index 7e2633b54bb9db..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- * @file DeviceCallbacks.h
- *
- * Implementations for the DeviceManager callbacks for this application
- *
- **/
-
-#pragma once
-
-#include "CHIPDeviceManager.h"
-#include <app/util/af-types.h>
-#include <platform/CHIPDeviceLayer.h>
-
-class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
-{
-public:
-    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-    virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpointId,
-                                                                                 chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t type,
-                                                                                 uint16_t size, uint8_t * value);
-    virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t type, uint16_t size, uint8_t * value);
-
-private:
-    void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
-    void OnThreadConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
-    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-    void OnLevelControlAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
-};
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
deleted file mode 100644
index 30f5633cc3bc7f..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h
deleted file mode 100644
index ea742c22acb765..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/PumpManager.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef PUMP_MANAGER_H
-#define PUMP_MANAGER_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include <FreeRTOS.h>
-#include <timers.h>
-
-class PumpManager
-{
-public:
-    enum Action_t
-    {
-        START_ACTION = 0,
-        STOP_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_StartInitiated = 0,
-        kState_StartCompleted,
-        kState_StopInitiated,
-        kState_StopCompleted,
-    } State;
-
-    int Init();
-    bool IsStopped();
-    void EnableAutoRestart(bool aOn);
-    void SetAutoStartDuration(uint32_t aDurationInSecs);
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    int16_t GetMaxPressure();
-    uint16_t GetMaxSpeed();
-    uint16_t GetMaxFlow();
-    int16_t GetMinConstPressure();
-    int16_t GetMaxConstPressure();
-    int16_t GetMinCompPressure();
-    int16_t GetMaxCompPressure();
-    uint16_t GetMinConstSpeed();
-    uint16_t GetMaxConstSpeed();
-    uint16_t GetMinConstFlow();
-    uint16_t GetMaxConstFlow();
-    int16_t GetMinConstTemp();
-    int16_t GetMaxConstTemp();
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t, int32_t aActor);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-private:
-    friend PumpManager & PumpMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    bool mAutoRestart;
-    uint32_t mAutoStartDuration;
-    bool mAutoStartTimerArmed;
-    TimerHandle_t mTimerHandle;
-    int32_t mCurrentActor;
-
-    void CancelTimer(void);
-    void PumpTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t aTimer);
-    static void AutoRestartTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    static PumpManager sPump;
-};
-
-inline PumpManager & PumpMgr(void)
-{
-    return PumpManager::sPump;
-}
-
-#endif // PUMP_MANAGER_H
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 2b4be76e9c33da..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xC700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/pump-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
index 61a6a0fdca18ef..9c46aa697263ce 100644
--- a/examples/pump-app/cc13x4_26x4/README.md
+++ b/examples/pump-app/cc13x4_26x4/README.md
@@ -92,8 +92,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index cf974b2eb1df22..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,30 +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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-  pw_build_PIP_REQUIREMENTS +=
-      [ "${chip_root}/scripts/setup/requirements.ti.txt" ]
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/BUILD.gn b/examples/pump-controller-app/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 2d66a7f993158b..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,117 +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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-project_dir = "${chip_root}/examples/pump-controller-app/cc13x2x7_26x2x7"
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "${project_dir}/main/include" ]
-  public_configs = [ ":pump_controller_app_config" ]
-}
-
-ti_sysconfig("sysconfig") {
-  outputs = [
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-  ]
-
-  if (chip_enable_ota_requestor) {
-    sources = [ "${project_dir}/chip_ota.syscfg" ]
-  } else {
-    sources = [ "${project_dir}/chip.syscfg" ]
-    outputs += [
-      "ti_devices_config.c",
-      "ti_devices_config.h",
-    ]
-  }
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("pump_controller_app") {
-  output_name = "chip-${ti_simplelink_board}-pump-controller-example.out"
-
-  sources = [
-    "${project_dir}/main/AppTask.cpp",
-    "${project_dir}/main/PumpManager.cpp",
-    "${project_dir}/main/ZclCallbacks.cpp",
-    "${project_dir}/main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/pump-controller-app/pump-controller-common",
-    "${chip_root}/src/lib",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "${project_dir}",
-    "${project_dir}/main",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":pump_controller_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index f20a3151e912a2..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,296 +0,0 @@
-# Matter Pump Controller Example Application
-
-An example application showing the use of [Matter][matter] on the Texas
-Instruments CC13XX_26XX family of Wireless MCUs.
-
----
-
--   [Matter Pump Controller Example Application](#matter-pump-controller-example-application)
-    -   [Introduction](#introduction)
-        -   [Device UI](#device-ui)
-    -   [Building](#building)
-        -   [Preparation](#preparation)
-        -   [Compilation](#compilation)
-    -   [Programming](#programming)
-        -   [Code Composer Studio](#code-composer-studio)
-        -   [UniFlash](#uniflash)
-    -   [Running the Example](#running-the-example)
-        -   [Provisioning](#provisioning)
-            -   [Bluetooth LE Advertising](#bluetooth-le-advertising)
-            -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
-    -   [TI Support](#ti-support)
-
----
-
-## Introduction
-
-The CC13XX_26XX pump controller example application provides a working
-demonstration of a connected pump controller device. This uses the open-source
-Matter implementation and the Texas Instruments SimpleLinkā„¢ CC13XX and CC26XX
-software development kit.
-
-This example is enabled to build for CC2652R7 devices.
-
-The pump example is intended to serve both as a means to explore the workings of
-Matter, as well as a template for creating real products based on the Texas
-Instruments devices.
-
-## Device UI
-
-| Action                                           | Functionality                          |
-| ------------------------------------------------ | -------------------------------------- |
-| Left Button (`BTN-1`) Press (less than 1000 ms)  | BLE Advertisement (Enable/Disable)     |
-| Left Button (`BTN-1`) Press (more than 5000 ms)  | Factory Reset                          |
-| Right Button (`BTN-2`) Press (less than 1000 ms) | Toggle pump state                      |
-| Red & Green LED Blinking State                   | Pump transition from either Start/Stop |
-| Red & LED On State                               | Pump is started                        |
-| Red & Green LED Off State                        | Pump stopped                           |
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension. For OTA enabled applications, the standalone image will instead end
-with the `*-bim.hex` file extension. This this is a combined image with
-application and and `BIM` included. The flag to enable or disable the OTA
-feature is determined by "chip_enable_ota_requestor" in the application's
-args.gni file.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-The steps below should be followed to commission the device onto the network and
-control it once it has been commissioned.
-
-**Step 0**
-
-Set up the CHIP tool by following the instructions outlined in our [Matter
-Getting Started Guide][matter-e2e-faq].
-
-**Step 1**
-
-Commission the device onto the Matter network. Run the following command on the
-CHIP tool:
-
-```
-
-./chip-tool pairing ble-thread <nodeID - e.g. 1> hex:<complete dataset from starting the OTBR> 20202021 3840
-
-```
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network. To provision this example onto a
-Matter network, the device must be discoverable over Bluetooth LE.
-
-On the LaunchPad, press and hold the right button, labeled `BTN-1`, for more
-than 1 second. Upon release, the Bluetooth LE advertising will begin. Once the
-device is fully provisioned, BLE advertising will stop.
-
-Once the device has been successfully commissioned, you will see the following
-message on the CHIP tool output:
-
-```
-
-[1677648218.370754][39785:39790] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-[1677648218.370821][39785:39790] CHIP:CTL: Successfully finished commissioning step 'SendComplete'
-
-```
-
-An accompanying message will be seen from the device:
-
-```
-
-Commissioning complete, notify platform driver to persist network credentials.
-
-```
-
-**Step 2** Read generic vendor name from Basic cluster
-
-```
-./chip-tool basic read vendor-name 1 0
-```
-
-### Provisioning
-
-Interacting with the application begins by enabling BLE advertisements and then
-pairing the device into a Thread network.
-
-#### Bluetooth LE Advertising
-
-To provision this example onto a Thread network, the device must be discoverable
-over Bluetooth LE. BLE advertising is started by long pressing the right button
-(greater than 1000ms), labeled `BTN-1` on the silkscreen. Once the device is
-fully provisioned, BLE advertising will stop.
-
-#### Bluetooth LE Rendezvous
-
-Pairing this application with `ble-thread` can be done with any of the enabled
-[CHIP Controller](../../../src/controller/README.md) applications. Use the
-information printed on the console to aide in pairing the device. The controller
-application can also be used to control the example app with the cluster
-commands.
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni b/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index d78851719f1fb5..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,51 +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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-optimize_debug_level = "s"
-lwip_debug = false
-
-chip_enable_ota_requestor = true
-
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-#chip_progress_logging = false
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8011"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides b/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index d190703b5322b7..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg b/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg
deleted file mode 100644
index 995ad22af6b435..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/chip_ota.syscfg
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var Button      = scripting.addModule("/ti/drivers/apps/Button");
-var LED         = scripting.addModule("/ti/drivers/apps/LED");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom    = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var Button1     = Button.addInstance();
-var Button2     = Button.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var LED1        = LED.addInstance();
-var LED2        = LED.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* Left Button */
-Button1.$name                       = "CONFIG_BTN_LEFT";
-Button1.$hardware                   = system.deviceData.board.components["BTN-1"];
-Button1.gpioPin.$name               = "CONFIG_GPIO_BTN1";
-Button1.gpioPin.pull                = "Pull Up";
-Button1.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* Left Button */
-Button2.$name                       = "CONFIG_BTN_RIGHT";
-Button2.$hardware                   = system.deviceData.board.components["BTN-2"];
-Button2.gpioPin.$name               = "CONFIG_GPIO_BTN2";
-Button2.gpioPin.pull                = "Pull Up";
-Button2.gpioPin.interruptTrigger    = "Falling Edge";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-// Disable CCFG generation, this is added by the BIM project
-CCFG.enableCodeGeneration = false;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Red LED */
-LED1.$name                      = "CONFIG_LED_RED";
-LED1.$hardware                  = system.deviceData.board.components.LED_RED;
-LED1.gpioPin.$name              = "CONFIG_GPIO_RLED";
-LED1.gpioPin.mode               = "Output";
-LED1.gpioPin.callbackFunction   = "";
-
-/* Green LED */
-LED2.$name                      = "CONFIG_LED_GREEN";
-LED2.$hardware                  = system.deviceData.board.components.LED_GREEN;
-LED2.gpioPin.$name              = "CONFIG_GPIO_GLED";
-LED2.gpioPin.mode               = "Output";
-LED2.gpioPin.callbackFunction   = "";
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART2_DEBUG";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg
deleted file mode 100644
index b46e258311e19b..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/cc1352r1_launchxl.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg
deleted file mode 100644
index 85dc32c0530acc..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-1.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg
deleted file mode 100644
index f1563f8933b01c..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-10.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg
deleted file mode 100644
index a3d63e4dfcd944..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-11.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg
deleted file mode 100644
index ad07cbf180d1d0..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-12.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg
deleted file mode 100644
index 43010467f37d95..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-13.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg
deleted file mode 100644
index 119886b184c7c5..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-2.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg
deleted file mode 100644
index 4bd4776f692973..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-3.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg
deleted file mode 100644
index 33cb488a6541ec..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-4.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg
deleted file mode 100644
index 66a2855628808b..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-5.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg
deleted file mode 100644
index d0270ecaaedf9f..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-6.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg
deleted file mode 100644
index 73f21c9a69d118..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-7.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg
deleted file mode 100644
index 36a34f4a5e12e3..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-8.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg
deleted file mode 100644
index e6a4e04371a369..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/ccs-9.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg
deleted file mode 100644
index 6a38f067e4fc4c..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-1.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg
deleted file mode 100644
index 6a2a9a8a813ce0..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-2.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg
deleted file mode 100644
index c6e6dd2249f498..00000000000000
Binary files a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/images/uniflash-3.jpg and /dev/null differ
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md
deleted file mode 100644
index ac31ab8bbea1f0..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-ccs.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Programming and Debugging with CCS
-
--   Download and install [Code Composer Studio][ccs].
-
--   Use `xdsdfu` to determine the XDS110 serial number to identify the device.
-    This may be skipped if there is only one LaunchPad connected to your PC, but
-    it is recommended.
-
-    ```
-    C:\>cd \ti\ccs1010\ccs\ccs_base\common\uscif\xds110
-
-    C:\ti\ccs1010\ccs\ccs_base\common\uscif\xds110>xdsdfu.exe -e
-
-    USB Device Firmware Upgrade Utility
-    Copyright (c) 2008-2019 Texas Instruments Incorporated.  All rights reserved.
-
-    Scanning USB buses for supported XDS110 devices...
-    ```
-
-<<<< Device 0 >>>>
-
-VID: 0x0451 PID: 0xbef3 Device Name: XDS110 Embed with CMSIS-DAP Version:
-3.0.0.13 Manufacturer: Texas Instruments Serial Num: L4100652 Mode: Runtime
-Configuration: Standard
-
-Found 1 device.
-
-```
-In this example, my LaunchPad's XDS110 has a serial number of `L4100652`.
-
-- Start a new Code Composer Studio Workspace. This can be named anything you
-would like. But it is recommended that you use a blank workspace.
-
-![CCS step 1](images/ccs-1.jpg)
-
-- Create a new Target Configuration File by selecting `File` >> `New` >>
-`Target Configuration File`. This file can also be exported from UniFlash
-with the `download ccxml` function.
-
-![CCS step 2](images/ccs-2.jpg)
-
-- Name the new ccxml file a useful name. Here I use the XDS110 serial number
-from before. Leave the Location as the shared location and click `Finish` to
-create the file.
-
-![CCS step 3](images/ccs-3.jpg)
-
-- In the new ccxml, select the `Connection` and the `Board or Device`. This may
-be different for your setup, but all LaunchPads will use the `Texas
-Instruments XDS110 USB Debug Probe` for the target connection. And the and a
-`CC1352R1F3` is mounted on the `CC1352R1_LAUNCHXL` LaunchPads. Builds for
-other LaunchPads should use the corresponding SoC name.
-
-![CCS step 4](images/ccs-4.jpg)
-
-- Now set the XDS110 serial number in the advanced tab of the ccxml. First
-select the `Advanced` tab at the bottom of the window. Then select the Debug
-Probe in the connection tree. Then select `Select by serial number` in the
-`Debug Probe Selection`. Then enter the serial number from `xdsdfu` earlier
-in the `Enter the serial number` text field. Finally click `Save` to save
-your ccxml.
-
-![CCS step 5](images/ccs-5.jpg)
-
-- Clicking `Test Connection` with the LaunchPad connected will cause a JTAG
-Integrity scan with the Debug Probe. This is a nice way to check that your
-ccxml is setup correctly.
-
-![CCS step 6](images/ccs-6.jpg)
-
-- Now open the Debug Configurations dialog to setup a new debug configuration.
-Select `Run` >> `Debug Configurations...`.
-
-![CCS step 7](images/ccs-7.jpg)
-
-- Create a new launch configuration from the default CCS launch configuration.
-Select `Code Composer Studio - Device Debugging` and then create a new launch
-configuration with the `New launch configuration` button.
-
-![CCS step 8](images/ccs-8.jpg)
-
-- Name your new configuration. Update the `Target Configuration` field with the
-ccxml you created earlier. Click `Apply` to save the launch configuration.
-
-Once the launch configuration is created you do not need to re-create it
-every time. The Debug session can be started with the `Debug` button in the
-`Debug Configurations` dialog, or by selecting `Run` >> `Debug History` >>
-`<launch configuration name>`.
-
-![CCS step 9](images/ccs-9.jpg)
-
-- Now that the Debug session is started we can connect to the target. Make sure
-that the right Debug Probe is selected in the `Debug` window and click
-`Connect Target`.
-
-![CCS step 9](images/ccs-10.jpg)
-
-- The target MCU is connected. The MCU is halted on connection by default.
-Select the `Load Program...` option to select the ELF image to load.
-
-![CCS step 9](images/ccs-11.jpg)
-
-- Navigate to the ELF file
-(`${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-file) in the `Load Program` dialog. Click `OK` to begin loading the target.
-
-![CCS step 9](images/ccs-12.jpg)
-
-- After locating the source file for `main.cpp` we can step through the code
-as it executes.
-
-![CCS step 9](images/ccs-13.jpg)
-
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-```
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md b/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
deleted file mode 100644
index f6b3acb27b9b28..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/doc/programming-uniflash.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Programming with UniFlash
-
--   Download and install [UniFlash][uniflash].
-
--   Select the Device Detect option. Then select the device you wish to program.
-    Or you can create a new configuration if you know the debugger serial number
-
-    ![UniFlash step 1](images/uniflash-1.jpg)
-
--   Browse for your build image by clicking the `Browse` button. It will be at
-    `${connectedhomeip}/examples/lock-app/cc13x2_26x2/out/debug/chip-cc13x2_26x2-lock-example.out`
-
-    ![UniFlash step 2](images/uniflash-2.jpg)
-
--   Load the image by clicking the `Load Image` button. This will eventually
-    result in a success message in the console below.
-
-    ![UniFlash step 3](images/uniflash-3.jpg)
-
--   Open a terminal to the XDS110 User UART and interact with the example
-    application.
-
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index f2442efdb876a6..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include "AppConfig.h"
-#include "AppEvent.h"
-#include <app/server/Server.h>
-
-#include "FreeRTOS.h"
-#include <credentials/DeviceAttestationCredsProvider.h>
-
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#include <app/util/af-types.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/clusters/identify-server/identify-server.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-#include <ti/drivers/apps/Button.h>
-#include <ti/drivers/apps/LED.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-#define APP_EVENT_QUEUE_SIZE 10
-
-using namespace ::chip;
-using namespace ::chip::app;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-
-static TaskHandle_t sAppTaskHandle;
-static QueueHandle_t sAppEventQueue;
-
-static LED_Handle sAppRedHandle;
-static LED_Handle sAppGreenHandle;
-static Button_Handle sAppLeftHandle;
-static Button_Handle sAppRightHandle;
-
-AppTask AppTask::sAppTask;
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(chip::Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-static const chip::EndpointId sIdentifyEndpointId = 0;
-static const uint32_t sIdentifyBlinkRateMs        = 500;
-
-::Identify stIdentify = { sIdentifyEndpointId, AppTask::IdentifyStartHandler, AppTask::IdentifyStopHandler,
-                          Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator, AppTask::TriggerIdentifyEffectHandler };
-
-int AppTask::StartAppTask()
-{
-    int ret = 0;
-
-    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
-    if (sAppEventQueue == NULL)
-    {
-        PLAT_LOG("Failed to allocate app event queue");
-        while (true)
-            ;
-    }
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        PLAT_LOG("Failed to create app task");
-        while (true)
-            ;
-    }
-    return ret;
-}
-
-int AppTask::Init()
-{
-    LED_Params ledParams;
-    Button_Params buttonParams;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    chip::Platform::MemoryInit();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().InitChipStack() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().InitThreadStack() failed");
-        while (true)
-            ;
-    }
-
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#elif CONFIG_OPENTHREAD_MTD_SED
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
-        while (true)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("PlatformMgr().StartEventLoopTask() failed");
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        PLAT_LOG("ThreadStackMgr().StartThreadTask() failed");
-        while (true)
-            ;
-    }
-
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-    // Initialize LEDs
-    PLAT_LOG("Initialize LEDs");
-    LED_init();
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
-    LED_setOff(sAppRedHandle);
-
-    LED_Params_init(&ledParams); // default PWM LED
-    sAppGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
-    LED_setOff(sAppGreenHandle);
-
-    // Initialize buttons
-    PLAT_LOG("Initialize buttons");
-    Button_init();
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGPRESSED;
-    buttonParams.longPressDuration = 5000U; // ms
-    sAppLeftHandle                 = Button_open(CONFIG_BTN_LEFT, &buttonParams);
-    Button_setCallback(sAppLeftHandle, ButtonLeftEventHandler);
-
-    Button_Params_init(&buttonParams);
-    buttonParams.buttonEventMask   = Button_EV_CLICKED;
-    buttonParams.longPressDuration = 1000U; // ms
-    sAppRightHandle                = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
-    Button_setCallback(sAppRightHandle, ButtonRightEventHandler);
-
-    // Initialize Pump module
-    PLAT_LOG("Initialize Pump");
-    PumpMgr().Init();
-
-    PumpMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-
-    ConfigurationMgr().LogDeviceConfig();
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-
-    // QR code will be used with CHIP Tool
-    PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
-
-    return 0;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    AppEvent event;
-
-    sAppTask.Init();
-
-    while (true)
-    {
-        /* Task pend until we have stuff to do */
-        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
-        {
-            sAppTask.DispatchEvent(&event);
-        }
-    }
-}
-
-void AppTask::PostEvent(const AppEvent * aEvent)
-{
-    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonLeft;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    else if (events & Button_EV_LONGPRESSED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongPressed;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_ButtonRight;
-
-    if (events & Button_EV_CLICKED)
-    {
-        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
-    }
-    // button callbacks are in ISR context
-    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
-    {
-        /* Failed to post the message */
-    }
-}
-
-void AppTask::ActionInitiated(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // If the action has been initiated by the pump, update the pump trait
-    // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start initiated");
-        ; // TODO
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Stop initiated");
-        ; // TODO
-    }
-
-    LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppGreenHandle, 50 /* ms */, LED_BLINK_FOREVER);
-    LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    LED_startBlinking(sAppRedHandle, 110 /* ms */, LED_BLINK_FOREVER);
-}
-
-void AppTask::ActionCompleted(PumpManager::Action_t aAction, int32_t aActor)
-{
-    // if the action has been completed by the pump, update the pump trait.
-    // Turn on the pump state LED if in a STARTED state OR
-    // Turn off the pump state LED if in an STOPPED state.
-    if (aAction == PumpManager::START_ACTION)
-    {
-        PLAT_LOG("Pump start completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOn(sAppRedHandle, LED_BRIGHTNESS_MAX);
-    }
-    else if (aAction == PumpManager::STOP_ACTION)
-    {
-        PLAT_LOG("Pump stop completed");
-        LED_stopBlinking(sAppGreenHandle);
-        LED_setOff(sAppGreenHandle);
-        LED_stopBlinking(sAppRedHandle);
-        LED_setOff(sAppRedHandle);
-    }
-    if (aActor == AppEvent::kEventType_ButtonLeft)
-    {
-        sAppTask.UpdateClusterState();
-    }
-}
-
-void AppTask::DispatchEvent(AppEvent * aEvent)
-{
-    switch (aEvent->Type)
-    {
-    case AppEvent::kEventType_ButtonRight:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle Pump state
-            if (!PumpMgr().IsStopped())
-            {
-                PumpMgr().InitiateAction(0, PumpManager::STOP_ACTION);
-            }
-            else
-            {
-                PumpMgr().InitiateAction(0, PumpManager::START_ACTION);
-            }
-        }
-        break;
-
-    case AppEvent::kEventType_ButtonLeft:
-        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
-        {
-            // Toggle BLE advertisements
-            if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
-            {
-                if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() == CHIP_NO_ERROR)
-                {
-                    PLAT_LOG("Enabled BLE Advertisement");
-                }
-                else
-                {
-                    PLAT_LOG("OpenBasicCommissioningWindow() failed");
-                }
-            }
-            else
-            {
-                // Disable BLE advertisements
-                ConnectivityMgr().SetBLEAdvertisingEnabled(false);
-                PLAT_LOG("Disabled BLE Advertisements");
-            }
-        }
-        else if (AppEvent::kAppEventButtonType_LongPressed == aEvent->ButtonEvent.Type)
-        {
-            chip::Server::GetInstance().ScheduleFactoryReset();
-        }
-        break;
-
-    case AppEvent::kEventType_IdentifyStart:
-        LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        LED_startBlinking(sAppGreenHandle, sIdentifyBlinkRateMs, LED_BLINK_FOREVER);
-        PLAT_LOG("Identify started");
-        break;
-
-    case AppEvent::kEventType_IdentifyStop:
-        LED_stopBlinking(sAppGreenHandle);
-
-        if (!PumpMgr().IsStopped())
-        {
-            LED_setOn(sAppGreenHandle, LED_BRIGHTNESS_MAX);
-        }
-        else
-        {
-            LED_setOff(sAppGreenHandle);
-        }
-        PLAT_LOG("Identify stopped");
-        break;
-
-    case AppEvent::kEventType_AppEvent:
-        if (NULL != aEvent->Handler)
-        {
-            aEvent->Handler(aEvent);
-        }
-        break;
-
-    case AppEvent::kEventType_None:
-    default:
-        break;
-    }
-}
-
-void AppTask::UpdateClusterState() {}
-
-void AppTask::IdentifyStartHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStart;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::IdentifyStopHandler(::Identify *)
-{
-    AppEvent event;
-    event.Type = AppEvent::kEventType_IdentifyStop;
-    sAppTask.PostEvent(&event);
-}
-
-void AppTask::TriggerIdentifyEffectHandler(::Identify * identify)
-{
-    switch (identify->mCurrentEffectIdentifier)
-    {
-    case Clusters::Identify::EffectIdentifierEnum::kBlink:
-        PLAT_LOG("Starting blink identifier effect");
-        IdentifyStartHandler(identify);
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
-        PLAT_LOG("Breathe identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kOkay:
-        PLAT_LOG("Okay identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
-        PLAT_LOG("Channel Change identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kFinishEffect:
-        PLAT_LOG("Finish identifier effect not implemented");
-        break;
-    case Clusters::Identify::EffectIdentifierEnum::kStopEffect:
-        PLAT_LOG("Stop identifier effect");
-        IdentifyStopHandler(identify);
-        break;
-    default:
-        PLAT_LOG("No identifier effect");
-    }
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp
deleted file mode 100644
index 2afc7fd7b37ded..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/PumpManager.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "PumpManager.h"
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "FreeRTOS.h"
-
-#define ACTUATOR_MOVEMENT_PERIOS_MS 500
-
-PumpManager PumpManager::sPump;
-
-int PumpManager::Init()
-{
-    int ret = 0;
-
-    mTimerHandle = xTimerCreate("BLT_TIMER", pdMS_TO_TICKS(ACTUATOR_MOVEMENT_PERIOS_MS), pdFALSE, this, TimerEventHandler);
-    if (NULL == mTimerHandle)
-    {
-        PLAT_LOG("failed to create pump timer");
-        while (true)
-            ;
-    }
-
-    mState               = kState_StopCompleted;
-    mAutoStartTimerArmed = false;
-    mAutoRestart         = false;
-    mAutoStartDuration   = 0;
-
-    return ret;
-}
-
-void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB)
-{
-    mActionInitiated_CB = aActionInitiated_CB;
-    mActionCompleted_CB = aActionCompleted_CB;
-}
-
-bool PumpManager::IsActionInProgress()
-{
-    return (mState == kState_StartInitiated || mState == kState_StopInitiated);
-}
-
-bool PumpManager::IsStopped()
-{
-    return (mState == kState_StopCompleted);
-}
-
-void PumpManager::EnableAutoRestart(bool aOn)
-{
-    mAutoRestart = aOn;
-}
-
-void PumpManager::SetAutoStartDuration(uint32_t aDurationInSecs)
-{
-    mAutoStartDuration = aDurationInSecs;
-}
-
-bool PumpManager::InitiateAction(int32_t aActor, Action_t aAction)
-{
-    bool action_initiated = false;
-    State_t new_state;
-
-    // Initiate Start/Stop Action only when the previous one is complete.
-    if (mState == kState_StartCompleted && aAction == STOP_ACTION)
-    {
-        action_initiated = true;
-
-        new_state = kState_StopInitiated;
-    }
-    else if (mState == kState_StopCompleted && aAction == START_ACTION)
-    {
-        action_initiated = true;
-        mCurrentActor    = aActor;
-        new_state        = kState_StartInitiated;
-    }
-
-    if (action_initiated)
-    {
-        if (mAutoStartTimerArmed && new_state == kState_StartInitiated)
-        {
-            // If auto start timer has been armed and someone initiates start,
-            // cancel the timer and continue as normal.
-            mAutoStartTimerArmed = false;
-
-            CancelTimer();
-        }
-
-        PumpTimer(ACTUATOR_MOVEMENT_PERIOS_MS);
-
-        // Since the timer started successfully, update the state and trigger callback
-        mState = new_state;
-
-        if (mActionInitiated_CB)
-        {
-            mActionInitiated_CB(aAction, aActor);
-        }
-    }
-
-    return action_initiated;
-}
-
-void PumpManager::PumpTimer(uint32_t aTimeoutMs)
-{
-    xTimerChangePeriod(mTimerHandle, pdMS_TO_TICKS(aTimeoutMs), 100);
-    xTimerStart(mTimerHandle, 100);
-}
-
-void PumpManager::CancelTimer(void)
-{
-    xTimerStop(mTimerHandle, 100);
-}
-
-void PumpManager::TimerEventHandler(TimerHandle_t aTimer)
-{
-    PumpManager * pump = static_cast<PumpManager *>(pvTimerGetTimerID(aTimer));
-
-    // The timer event handler will be called in the context of the timer task
-    // once sPumpTimer expires. Post an event to apptask queue with the actual handler
-    // so that the event can be handled in the context of the apptask.
-    AppEvent event;
-    event.Type                   = AppEvent::kEventType_AppEvent;
-    event.PumpStateEvent.Context = static_cast<PumpManager *>(pump);
-    if (pump->mAutoStartTimerArmed)
-    {
-        event.Handler = AutoRestartTimerEventHandler;
-    }
-    else
-    {
-        event.Handler = ActuatorMovementTimerEventHandler;
-    }
-    GetAppTask().PostEvent(&event);
-}
-
-void PumpManager::AutoRestartTimerEventHandler(AppEvent * aEvent)
-{
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-    int32_t actor      = 0;
-
-    // Make sure auto start timer is still armed.
-    if (!pump->mAutoStartTimerArmed)
-    {
-        return;
-    }
-
-    pump->mAutoStartTimerArmed = false;
-
-    PLAT_LOG("Auto Re-Start has been triggered!");
-
-    pump->InitiateAction(actor, START_ACTION);
-}
-
-void PumpManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
-{
-    Action_t actionCompleted = INVALID_ACTION;
-
-    PumpManager * pump = static_cast<PumpManager *>(aEvent->PumpStateEvent.Context);
-
-    if (pump->mState == kState_StartInitiated)
-    {
-        pump->mState    = kState_StartCompleted;
-        actionCompleted = START_ACTION;
-    }
-    else if (pump->mState == kState_StopInitiated)
-    {
-        pump->mState    = kState_StopCompleted;
-        actionCompleted = STOP_ACTION;
-    }
-
-    if (actionCompleted != INVALID_ACTION)
-    {
-        if (pump->mActionCompleted_CB)
-        {
-            pump->mActionCompleted_CB(actionCompleted, pump->mCurrentActor);
-        }
-
-        if (pump->mAutoRestart && actionCompleted == STOP_ACTION)
-        {
-            // Start the timer for auto restart
-            pump->PumpTimer(pump->mAutoStartDuration * 1000);
-
-            pump->mAutoStartTimerArmed = true;
-
-            PLAT_LOG("Auto Re-start enabled. Will be triggered in %u seconds", pump->mAutoStartDuration);
-        }
-    }
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
deleted file mode 100644
index e450a4b233eddb..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp
+++ /dev/null
@@ -1,69 +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.
- */
-
-#include <lib/support/logging/CHIPLogging.h>
-
-#include "AppConfig.h"
-#include "AppTask.h"
-#include "PumpManager.h"
-
-#include <app-common/zap-generated/ids/Attributes.h>
-#include <app-common/zap-generated/ids/Clusters.h>
-#include <app/ConcreteAttributePath.h>
-#include <lib/support/logging/CHIPLogging.h>
-
-using namespace ::chip;
-using namespace ::chip::app::Clusters;
-
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                       uint8_t * value)
-{
-    if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id)
-    {
-        PumpMgr().InitiateAction(0, *value ? PumpManager::START_ACTION : PumpManager::STOP_ACTION);
-    }
-    else if (attributePath.mClusterId == LevelControl::Id &&
-             attributePath.mAttributeId == LevelControl::Attributes::CurrentLevel::Id)
-    {
-        ChipLogProgress(Zcl, "[pump-app] Cluster LevelControl: attribute CurrentLevel set to %u", *value);
-    }
-    else
-    {
-        ChipLogProgress(Zcl, "Unknown attribute ID: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mAttributeId));
-        return;
-    }
-}
-
-/** @brief OnOff Cluster Init
- *
- * This function is called when a specific cluster is initialized. It gives the
- * application an opportunity to take care of cluster initialization procedures.
- * It is called exactly once for each endpoint where cluster is present.
- *
- * @param endpoint   Ver.: always
- *
- * TODO Issue #3841
- * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
- * attributes to the default value.
- * The logic here expects something similar to the deprecated Plugins callback
- * emberAfPluginOnOffClusterServerPostInitCallback.
- *
- */
-void emberAfOnOffClusterInitCallback(EndpointId endpoint)
-{
-    GetAppTask().UpdateClusterState();
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h
deleted file mode 100644
index b925344ddb4c9a..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppConfig.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
-
-// Logging
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cc13xx_26xxLogInit(void);
-void cc13xx_26xxLog(const char * aFormat, ...);
-#define PLAT_LOG(...) cc13xx_26xxLog(__VA_ARGS__);
-
-#ifdef __cplusplus
-}
-#endif
-#endif // APP_CONFIG_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h
deleted file mode 100644
index 3a9c606e95c330..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppEvent.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_EVENT_H
-#define APP_EVENT_H
-
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
-
-struct AppEvent
-{
-    enum AppEventType
-    {
-        kEventType_None = 0,
-        kEventType_ButtonLeft,
-        kEventType_ButtonRight,
-        kEventType_AppEvent,
-        kEventType_IdentifyStart,
-        kEventType_IdentifyStop,
-    };
-
-    enum AppEventButtonType
-    {
-        kAppEventButtonType_None = 0,
-        kAppEventButtonType_Clicked,
-        kAppEventButtonType_LongClicked,
-        kAppEventButtonType_LongPressed,
-    };
-
-    enum AppEventType Type;
-
-    union
-    {
-        struct
-        {
-            enum AppEventButtonType Type;
-        } ButtonEvent;
-
-        struct
-        {
-            void * Context;
-        } PumpStateEvent;
-    };
-
-    EventHandler Handler;
-};
-
-#endif // APP_EVENT_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h
deleted file mode 100644
index bb815585471add..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/AppTask.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef APP_TASK_H
-#define APP_TASK_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include "AppEvent.h"
-#include "PumpManager.h"
-
-#include <ti/drivers/apps/Button.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-struct Identify;
-
-class AppTask
-{
-public:
-    int StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-    void PostStartActionRequest(int32_t aActor, PumpManager::Action_t aAction);
-    void PostEvent(const AppEvent * event);
-    void UpdateClusterState();
-
-    static void IdentifyStartHandler(::Identify *);
-    static void IdentifyStopHandler(::Identify *);
-    static void TriggerIdentifyEffectHandler(::Identify * identify);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    int Init();
-
-    static void ActionInitiated(PumpManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(PumpManager::Action_t aAction, int32_t aActor);
-
-    void DispatchEvent(AppEvent * event);
-
-    static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
-    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
-    static void TimerEventHandler(void * p_context);
-
-    enum Function_t
-    {
-        kFunction_NoneSelected   = 0,
-        kFunction_SoftwareUpdate = 0,
-        kFunction_FactoryReset,
-
-        kFunction_Invalid
-    } Function;
-
-    Function_t mFunction;
-    bool mFunctionTimerActive;
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
-
-#endif // APP_TASK_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
deleted file mode 100644
index e8329c75ae9e29..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#ifndef CHIP_PROJECT_CONFIG_H
-#define CHIP_PROJECT_CONFIG_H
-
-// Security and Authentication always enabled
-#define CHIP_CONFIG_SECURITY_TEST_MODE 0
-
-#if BUILD_RELEASE // release build
-// Note: Default Pairing/PIN/Serial Numbers being used. These should not be enabled for production builds
-#endif // BUILD_RELEASE
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 1
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
-
-#endif // CHIP_PROJECT_CONFIG_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
deleted file mode 100644
index 30f5633cc3bc7f..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h
deleted file mode 100644
index 40a3961dd09161..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/PumpManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2019 Google LLC.
- *    All rights reserved.
- *
- *    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.
- */
-
-#ifndef PUMP_MANAGER_H
-#define PUMP_MANAGER_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "AppEvent.h"
-
-#include <FreeRTOS.h>
-#include <timers.h>
-
-class PumpManager
-{
-public:
-    enum Action_t
-    {
-        START_ACTION = 0,
-        STOP_ACTION,
-
-        INVALID_ACTION
-    } Action;
-
-    enum State_t
-    {
-        kState_StartInitiated = 0,
-        kState_StartCompleted,
-        kState_StopInitiated,
-        kState_StopCompleted,
-    } State;
-
-    int Init();
-    bool IsStopped();
-    void EnableAutoRestart(bool aOn);
-    void SetAutoStartDuration(uint32_t aDurationInSecs);
-    bool IsActionInProgress();
-    bool InitiateAction(int32_t aActor, Action_t aAction);
-
-    typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor);
-    typedef void (*Callback_fn_completed)(Action_t, int32_t aActor);
-    void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
-
-private:
-    friend PumpManager & PumpMgr(void);
-    State_t mState;
-
-    Callback_fn_initiated mActionInitiated_CB;
-    Callback_fn_completed mActionCompleted_CB;
-
-    bool mAutoRestart;
-    uint32_t mAutoStartDuration;
-    bool mAutoStartTimerArmed;
-    TimerHandle_t mTimerHandle;
-    int32_t mCurrentActor;
-
-    void CancelTimer(void);
-    void PumpTimer(uint32_t aTimeoutMs);
-
-    static void TimerEventHandler(TimerHandle_t aTimer);
-    static void AutoRestartTimerEventHandler(AppEvent * aEvent);
-    static void ActuatorMovementTimerEventHandler(AppEvent * aEvent);
-
-    static PumpManager sPump;
-};
-
-inline PumpManager & PumpMgr(void)
-{
-    return PumpManager::sPump;
-}
-
-#endif // PUMP_MANAGER_H
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 2b4be76e9c33da..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppConfig.h>
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xC700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    int ret = GetAppTask().StartAppTask();
-    if (ret != 0)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
index d61857024dfc88..bff60fdd3b1169 100644
--- a/examples/pump-controller-app/cc13x4_26x4/README.md
+++ b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -93,8 +93,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\""
     $ ninja -C out/debug
diff --git a/examples/shell/cc13x2x7_26x2x7/.gn b/examples/shell/cc13x2x7_26x2x7/.gn
deleted file mode 100644
index 540d01ce0b2bfd..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/.gn
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2022 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.
-
-import("//build_overrides/build.gni")
-
-# The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
-
-# CHIP uses angle bracket includes.
-check_system_includes = true
-
-default_args = {
-  target_cpu = "arm"
-  target_os = "freertos"
-
-  import("//args.gni")
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/BUILD.gn b/examples/shell/cc13x2x7_26x2x7/BUILD.gn
deleted file mode 100644
index 80e342313aaca6..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/BUILD.gn
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2022 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.
-
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-import("//build_overrides/openthread.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-import("${build_root}/config/defaults.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
-import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
-
-assert(current_os == "freertos")
-
-ti_simplelink_sdk("sdk") {
-  include_dirs = [ "include" ]
-
-  defines = []
-}
-
-ti_sysconfig("sysconfig") {
-  sources = [ "chip.syscfg" ]
-
-  outputs = [
-    "ti_devices_config.c",
-    "ti_radio_config.c",
-    "ti_radio_config.h",
-    "ti_drivers_config.c",
-    "ti_drivers_config.h",
-    "ti_ble_config.c",
-    "ti_ble_config.h",
-    "ti_dmm_application_policy.c",
-    "ti_dmm_application_policy.h",
-
-    # disabled until upstream generation is aligned
-    #"tiop_config.h",
-    #"tiop_config.c",
-
-    # not traditional source files
-    #"ti_utils_build_linker.cmd.genlibs",
-    #"syscfg_c.rov.xs",
-    #"ti_utils_runtime_model.gv",
-    #"ti_utils_runtime_Makefile",
-    #"ti_ble_app_config.opt",
-    #"ti_build_config.opt",
-  ]
-
-  public_configs = [ ":sdk_cc13x2x7_26x2x7_dmm_config" ]
-
-  cflags = [
-    "-Wno-comment",
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_ble_app_config.opt",
-                      root_build_dir),
-    "@" + rebase_path("${target_gen_dir}/sysconfig/ti_build_config.opt",
-                      root_build_dir),
-  ]
-}
-
-ti_simplelink_executable("shell_app") {
-  output_name = "chip-${ti_simplelink_board}-shell-example.out"
-
-  sources = [
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "main/AppTask.cpp",
-    "main/main.cpp",
-  ]
-
-  deps = [
-    ":sdk",
-    ":sysconfig",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common",
-    "${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
-    "${chip_root}/examples/shell/shell_common:shell_common",
-    "${chip_root}/src/lib",
-    "${chip_root}/src/lib/shell:shell",
-    "${chip_root}/src/setup_payload",
-  ]
-
-  if (chip_openthread_ftd) {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-  } else {
-    deps += [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-  }
-
-  if (custom_factory_data) {
-    defines = [ "CC13XX_26XX_FACTORY_DATA" ]
-  }
-
-  include_dirs = [
-    "include",
-    "main",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-  ]
-
-  cflags = [
-    "-Wno-implicit-fallthrough",
-    "-Wno-sign-compare",
-    "-Wconversion",
-  ]
-
-  output_dir = root_out_dir
-}
-
-group("cc13x2x7_26x2x7") {
-  deps = [ ":shell_app" ]
-}
-
-group("default") {
-  deps = [ ":cc13x2x7_26x2x7" ]
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md
deleted file mode 100644
index 69fdf781446afd..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/README.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Matter Shell Application
-
-A [chip-shell](../README.md) project on the Texas Instruments CC13XX_26XX family
-of Wireless MCUs.
-
-## Building
-
-### Preparation
-
-Some initial setup is necessary for preparing the build environment. This
-section will need to be done when migrating to new versions of the SDK. This
-guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
-
--   Download and install [SysConfig][sysconfig]. This can be done simply with
-    the following commands.
-
-    ```
-    $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
-    $ chmod +x sysconfig-1.16.2_3028-setup.run
-    $ ./sysconfig-1.16.2_3028-setup.run
-    ```
-
--   Run the bootstrap script to setup the build environment.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/bootstrap.sh
-
-    ```
-
-### Compilation
-
-It is necessary to activate the environment in every new shell. Then run GN and
-Ninja to build the executable.
-
--   Activate the build environment with the repository activate script.
-
-    ```
-    $ cd ~/connectedhomeip
-    $ source ./scripts/activate.sh
-
-    ```
-
--   Run the build to produce a default executable. By default on Linux both the
-    TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
-    home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
-    `C:\ti`. Take note of this install path, as it will be used in the next
-    step.
-
-    ```
-    $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
-    OR
-    $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
-
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
-    $ ninja -C out/debug
-
-    ```
-
-    If you would like to define arguments on the command line you may add them
-    to the GN call.
-
-    ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
-    ```
-
-## Programming
-
-Loading the built image onto a LaunchPad is supported through two methods;
-Uniflash and Code Composer Studio (CCS). UniFlash can be used to load the image.
-Code Composer Studio can be used to load the image and debug the source code.
-
-### Code Composer Studio
-
-Programming with CCS will allow for a full debug environment within the IDE.
-This is accomplished by creating a target connection to the XDS110 debugger and
-starting a project-less debug session. The CCS IDE will attempt to find the
-source files on the local machine based on the debug information embedded within
-the ELF. CCS may prompt you to find the source code if the image was built on
-another machine or the source code is located in a different location than is
-recorded within the ELF.
-
-Download and install [Code Composer Studio][ccs].
-
-First open CCS and create a new workspace.
-
-Create a target connection (sometimes called the CCXML) for your target SoC and
-debugger as described in the [Manual Method][ccs_manual_method] section of the
-CCS User's Guide.
-
-Next initiate a project-less debug session as described in the [Manual
-Launch][ccs_manual_launch] section of the CCS User's Guide.
-
-CCS should switch to the debug view described in the [After
-Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
-be disconnected and symbols will not be loaded. Connect to the core as described
-in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
-is connected, use the `Load` button on the toolbar to load the ELF image.
-
-Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
-the full 4-wire JTAG connection to match the default jumper configuration of the
-LaunchPad.
-
-### UniFlash
-
-Uniflash is Texas Instrument's uniform programming tool for embedded processors.
-This will allow you to erase, flash, and inspect the SoC without setting up a
-debugging environment.
-
-Download and install [UniFlash][uniflash].
-
-First open UniFlash. Debug probes connected to the computer will usually be
-displayed under the Detected Devices due to the automatic device detection
-feature. If your device does not show up in this view it my be disconnected, or
-you may have to create a New Configuration. If you already have a CCXML for your
-SoC and debug connection you can use that in the section at the bottom. Once
-your device is selected, click the `Start` button within the section to launch
-the session.
-
-Select the ELF image to load on the device with the `Browse` button. This file
-is placed in the `out/debug` folder by this guide and ends with the `*.out` file
-extension.
-
-Finally click the `Load Image` button to load the executable image onto the
-device. You should be able to see the log output over the XDS110 User UART.
-
-Note that programming the device through JTAG sets the Halt-in-Boot flag and may
-cause issues when performing a software reset. This flag can be reset by
-power-cycling the LaunchPad.
-
-## Running the Example
-
-By default the log output will be sent to the Application/User UART. Open a
-terminal emulator to that port to see the output with the following options:
-
-| Parameter    | Value    |
-| ------------ | -------- |
-| Speed (baud) | `115200` |
-| Data bits    | `8`      |
-| Stop bits    | `1`      |
-| Parity       | `None`   |
-| Flow control | `None`   |
-
-## Running the Example
-
-Once a device has been flashed with this example, it can now join and operate in
-an existing Matter network. The following sections assume that a Matter network
-is already active, and has at least one [OpenThread Border
-Router][ot_border_router_setup].
-
-For insight into what other components are needed to run this example, please
-refer to our [Matter Getting Started Guide][matter-e2e-faq].
-
-For help with the shell itself, refer to the
-[shell example README](../README.md).
-
-## TI Support
-
-For technical support, please consider creating a post on TI's [E2E forum][e2e].
-Additionally, we welcome any feedback.
-
-[matter]: https://csa-iot.org/all-solutions/matter/
-[ccs]: https://www.ti.com/tool/CCSTUDIO
-[ccs_after_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#after-launch
-[ccs_debug_view]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#debug-view
-[ccs_manual_launch]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-launch
-[ccs_manual_method]:
-    https://software-dl.ti.com/ccs/esd/documents/users_guide/ccs_debug-main.html?configuration#manual-method
-[e2e]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum
-[matter-e2e-faq]:
-    https://e2e.ti.com/support/wireless-connectivity/zigbee-thread-group/zigbee-and-thread/f/zigbee-thread-forum/1082428/faq-cc2652r7-matter----getting-started-guide
-[sysconfig]: https://www.ti.com/tool/SYSCONFIG
-[ti_thread_dnd]:
-    https://www.ti.com/wireless-connectivity/thread/design-development.html
-[ot_border_router_setup]: https://openthread.io/guides/border-router/build
-[uniflash]: https://www.ti.com/tool/download/UNIFLASH
diff --git a/examples/shell/cc13x2x7_26x2x7/args.gni b/examples/shell/cc13x2x7_26x2x7/args.gni
deleted file mode 100644
index 7a2a55a580dd24..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/args.gni
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2022 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.
-
-import("//build_overrides/chip.gni")
-import("${chip_root}/config/standalone/args.gni")
-import("${chip_root}/examples/platform/cc13x2_26x2/args.gni")
-
-ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
-ti_simplelink_sysconfig_target =
-    get_label_info(":sysconfig", "label_no_toolchain")
-
-ti_simplelink_board = "LP_CC2652R7"
-
-# Size Optimizations
-# use -Os instead of -Og, LWIP release build
-is_debug = false
-
-chip_enable_ota_requestor = false
-
-# Disable FTD Build for all-clusters app to save Flash
-chip_openthread_ftd = false
-openthread_external_platform = "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2"
-
-# Disable CHIP Logging
-chip_progress_logging = false
-chip_detail_logging = false
-chip_automation_logging = false
-
-# BLE options
-chip_config_network_layer_ble = true
-
-chip_build_libshell = true
-
-# Disable lock tracking, since our FreeRTOS configuration does not set
-# INCLUDE_xSemaphoreGetMutexHolder
-chip_stack_lock_tracking = "none"
-
-matter_device_vid = "0xFFF1"
-matter_device_pid = "0x8006"
-matter_software_ver = "0x0001"
-matter_software_ver_str = "1.0d1"
-
-custom_factory_data = true
diff --git a/examples/shell/cc13x2x7_26x2x7/build_overrides b/examples/shell/cc13x2x7_26x2x7/build_overrides
deleted file mode 120000
index e578e73312ebd1..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides
\ No newline at end of file
diff --git a/examples/shell/cc13x2x7_26x2x7/chip.syscfg b/examples/shell/cc13x2x7_26x2x7/chip.syscfg
deleted file mode 100644
index ed0e4a5c8d5fd6..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/chip.syscfg
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-
-/* Modules */
-var AESCCM      = scripting.addModule("/ti/drivers/AESCCM");
-var AESECB      = scripting.addModule("/ti/drivers/AESECB");
-var NVS         = scripting.addModule("/ti/drivers/NVS");
-var RF          = scripting.addModule("/ti/drivers/RF");
-var RFDesign    = scripting.addModule("ti/devices/radioconfig/rfdesign");
-var RFCustom  = scripting.addModule("/ti/devices/radioconfig/custom");
-var TRNG        = scripting.addModule("/ti/drivers/TRNG");
-var SHA2        = scripting.addModule("/ti/drivers/SHA2");
-var UART2       = scripting.addModule("/ti/drivers/UART2");
-var ble         = scripting.addModule("/ti/ble5stack/ble");
-var dmm         = scripting.addModule("/ti/dmm/dmm");
-var AESCTRDRBG  = scripting.addModule("/ti/drivers/AESCTRDRBG");
-var ECDH        = scripting.addModule("/ti/drivers/ECDH");
-
-/* Instances */
-var AESCCM1     = AESCCM.addInstance();
-var AESECB1     = AESECB.addInstance();
-var AESECB2     = AESECB.addInstance();
-var NVS1        = NVS.addInstance();
-var NVS2        = NVS.addInstance();
-var SHA21       = SHA2.addInstance();
-var TRNG1       = TRNG.addInstance();
-var TRNG2       = TRNG.addInstance();
-var TRNG3       = TRNG.addInstance();
-var UART2      = UART2.addInstance();
-var AESCTRDRBG1 = AESCTRDRBG.addInstance();
-var ECDH1       = ECDH.addInstance();
-
-AESCTRDRBG1.$name              = "CONFIG_AESCTRDRBG_0";
-
-AESCCM1.$name = "CONFIG_AESCCM0";
-
-AESECB1.$name = "CONFIG_AESECB0";
-AESECB2.$name = "CONFIG_AESECB_1";
-
-ECDH1.$name = "CONFIG_ECDH0";
-
-/* ======== CCFG ======== */
-var CCFG  = scripting.addModule("/ti/devices/CCFG");
-const ccfgSettings = system.getScript("/ti/common/lprf_ccfg_settings.js").ccfgSettings;
-for(var setting in ccfgSettings)
-{
-    CCFG[setting] = ccfgSettings[setting];
-}
-
-CCFG.enableCodeGeneration = true;
-
-/* NVS */
-NVS1.$name                      = "CONFIG_NVSINTERNAL";
-NVS1.internalFlash.regionBase = 0xAA000;
-NVS1.internalFlash.regionSize = 0x4000;
-
-NVS2.$name                                 = "CONFIG_NVSEXTERNAL";
-NVS2.nvsType                               = "External"; // NVS Region Type
-NVS2.$hardware                             = system.deviceData.board.components.MX25R8035F;
-
-/* RF */
-/* if an antenna component exists, assign it to the rf instance */
-if (system.deviceData.board && system.deviceData.board.components.RF) {
-    RF.$hardware = system.deviceData.board.components.RF;
-}
-
-const rfDesignSettings = system.getScript("/ti/common/lprf_rf_design_settings.js").rfDesignSettings;
-for(var setting in rfDesignSettings)
-{
-    RFDesign[setting] = rfDesignSettings[setting];
-}
-
-
-/* Handling for RF frontend characterization */
-if(RFDesign.rfDesign.match(/LP_CC2652PSIP/))
-{
-    RFCustom.ieee = ["ieee154p10"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154p10.codeExportConfig
-}
-else
-{
-    RFCustom.ieee = ["ieee154"];
-    var rfCodeExportConfig = RFCustom.radioConfigieee154.codeExportConfig
-}
-
-var cmdList = [
-    "cmdIeeeTx",
-    "cmdIeeeRx",
-    "cmdIeeeCsma",
-    "cmdIeeeEdScan",
-    "cmdIeeeRxAck",
-    "cmdTxTest"
-];
-
-rfCodeExportConfig.useConst     = true;
-rfCodeExportConfig.useMulti     = true;
-rfCodeExportConfig.symGenMethod = "Custom";
-
-const deviceId = system.deviceData.deviceId;
-
-// Add high PA options if present
-if(deviceId.match(/CC(265[12]R|2674R|1352R1|1354R)/))
-{
-    cmdList.push("cmdRadioSetup");
-    rfCodeExportConfig.cmdRadioSetup = "RF_cmdIeeeRadioSetup";
-}
-else if(deviceId.match(/CC(265[12]P|2674P|1352P)/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    rfCodeExportConfig.paExport = "combined";
-}
-else if(deviceId.match(/CC(265[34]|1354)P/))
-{
-    cmdList.push("cmdRadioSetupPa");
-    rfCodeExportConfig.cmdRadioSetupPa = "RF_cmdIeeeRadioSetup";
-    // currently not characterized for high PA
-}
-else
-{
-    throw new Error("Could not match platform to any known platform types");
-}
-
-rfCodeExportConfig.cmdList_ieee_15_4 = cmdList;
-
-/* Debug UART  */
-UART2.$hardware     = system.deviceData.board.components.XDS110UART;
-UART2.$name         = "CONFIG_UART_STREAMER";
-
-/* TRNG */
-TRNG1.$name     = "CONFIG_TRNG_0";
-TRNG2.$name     = "CONFIG_TRNG_THREAD";
-TRNG3.$name     = "CONFIG_TRNG_APP";
-
-/* BLE */
-ble.addressMode                                           = "ADDRMODE_RP_WITH_PUBLIC_ID";
-ble.maxConnNum                                            = 1;
-ble.numOfAdvSets                                          = 1;
-ble.lockProject                                           = true;
-ble.oneLibSizeOpt                                         = true;
-ble.maxPDUSize                                            = 255;
-ble.radioConfig.codeExportConfig.$name                    = "ti_devices_radioconfig_code_export_param2";
-ble.connUpdateParamsPeripheral.$name                      = "ti_ble5stack_general_ble_conn_update_params0";
-ble.connUpdateParamsPeripheral.reqMinConnInt               = 30;
-ble.connUpdateParamsPeripheral.reqMaxConnInt               = 50;
-
-ble.advSet1.$name                                         = "ti_ble5stack_broadcaster_advertisement_set0";
-ble.advSet1.advParam1.$name                               = "ti_ble5stack_broadcaster_advertisement_params0";
-
-/* DMM */
-dmm.project                                          = "ti_thread_thermostat_remote_display";
-dmm.stackRoles                                       = ["blePeripheral","threadFTD"];
-dmm.lockStackRoles                                   = true;
-dmm.numApplicationStates                             = 10;
-dmm.applicationState0                                = "ANY";
-dmm.applicationState1                                = "DMMPOLICY_BLE_IDLE";
-dmm.applicationState2                                = "DMMPOLICY_BLE_ADV";
-dmm.applicationState3                                = "DMMPOLICY_BLE_CONNECTING";
-dmm.applicationState4                                = "DMMPOLICY_BLE_HIGH_BANDWIDTH";
-dmm.applicationState5                                = "DMMPOLICY_BLE_CONNECTED";
-dmm.applicationState6                                = "DMMPOLICY_BLE_OAD";
-dmm.applicationState7                                = "DMMPOLICY_THREAD_IDLE";
-dmm.applicationState8                                = "DMMPOLICY_THREAD_LINK_EST";
-dmm.applicationState9                                = "DMMPOLICY_THREAD_DATA";
-dmm.policyArray.create(4);
-dmm.policyArray[0].$name                             = "ti_dmm_policy_dmm_policy0";
-dmm.policyArray[0].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble0";
-dmm.policyArray[0].blePeripheral.applicationStates   = ["applicationState6"];
-dmm.policyArray[0].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread0";
-dmm.policyArray[0].threadFTD.pause                   = "DMMPOLICY_PAUSED";
-dmm.policyArray[1].$name                             = "ti_dmm_policy_dmm_policy1";
-dmm.policyArray[1].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble1";
-dmm.policyArray[1].blePeripheral.applicationStates   = ["applicationState3","applicationState4"];
-dmm.policyArray[1].blePeripheral.weight              = 25;
-dmm.policyArray[1].blePeripheral.appliedActivity     = ["DMMPOLICY_APPLIED_ACTIVITY_BLE_CONNECTION"];
-dmm.policyArray[1].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread1";
-dmm.policyArray[2].$name                             = "ti_dmm_policy_dmm_policy2";
-dmm.policyArray[2].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble2";
-dmm.policyArray[2].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread2";
-dmm.policyArray[2].threadFTD.weight                  = 30;
-dmm.policyArray[2].threadFTD.applicationStates       = ["applicationState8"];
-dmm.policyArray[2].threadFTD.appliedActivity         = ["DMMPOLICY_APPLIED_ACTIVITY_ALL"];
-dmm.policyArray[3].$name                             = "ti_dmm_policy_dmm_policy3";
-dmm.policyArray[3].blePeripheral.$name               = "ti_dmm_policy_stack_dmm_stack_ble3";
-dmm.policyArray[3].threadFTD.$name                   = "ti_dmm_policy_stack_dmm_stack_thread3";
-dmm.policyArray[3].threadFTD.weight                  = 1;
diff --git a/examples/shell/cc13x2x7_26x2x7/include/AppTask.h b/examples/shell/cc13x2x7_26x2x7/include/AppTask.h
deleted file mode 100644
index e9426478b5af61..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/AppTask.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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 <stdbool.h>
-#include <stdint.h>
-
-#include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
-
-#include <platform/CHIPDeviceLayer.h>
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-#include <platform/cc13xx_26xx/FactoryDataProvider.h>
-#endif
-
-class AppTask
-{
-public:
-    CHIP_ERROR StartAppTask();
-    static void AppTaskMain(void * pvParameter);
-
-private:
-    friend AppTask & GetAppTask(void);
-
-    CHIP_ERROR Init();
-
-    static AppTask sAppTask;
-
-#ifdef CC13XX_26XX_FACTORY_DATA
-    chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
-#endif
-};
-
-inline AppTask & GetAppTask(void)
-{
-    return AppTask::sAppTask;
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
deleted file mode 100644
index 0464c9d043027e..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Example project configuration file for CHIP.
- *
- *          This is a place to put application or project-specific overrides
- *          to the default configuration values for general CHIP features.
- *
- */
-
-#pragma once
-
-// Use a default pairing code if one hasn't been provisioned in flash.
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
-#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
-
-/**
- * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
- *
- * Enables the use of a hard-coded default serial number if none
- * is found in CHIP NV storage.
- */
-#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN"
-
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
- *
- * The hardware version number assigned to device or product by the device vendor.  This
- * number is scoped to the device product id, and typically corresponds to a revision of the
- * physical device, a change to its packaging, and/or a change to its marketing presentation.
- * This value is generally *not* incremented for device software versions.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
-#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1
-#endif
-
-/**
- * Values set by args.gni:
- * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
- * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
- */
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- *
- * Enable support for CHIP-over-BLE (CHIPOBLE).
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
-
-/**
- * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
- *
- * A size, in bytes, of the individual debug event logging buffer.
- */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (256)
-
-#define MATTER_CC13XX_26XX_PLATFORM_LOG_ENABLED 0
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
- *
- * Enable the OpenThread SRP client to allow for CHIP device discovery.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-
-/**
- * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
- *
- * For a development build, set the default importance of events to be logged as Debug.
- * Since debug is the lowest importance level, this means all standard, critical, info and
- * debug importance level vi events get logged.
- */
-#if BUILD_RELEASE
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
-#else
-#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
-#endif // BUILD_RELEASE
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
-
-/**
- * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER
- *
- * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server.
- */
-#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2
-
-/**
- * @def CHIP_IM_MAX_NUM_WRITE_HANDLER
- *
- * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server.
- */
-#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2
diff --git a/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h b/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h
deleted file mode 100644
index 2c37beedb2b2db..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/include/OpenThreadConfig.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *      Overrides to default OpenThread configuration.
- *
- */
-
-#pragma once
-
-// Use the TI-supplied default platform configuration for remainder
-#include "openthread-core-cc13x2_26x2-config.h"
diff --git a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
deleted file mode 100644
index 701e86fed40e05..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *    All rights reserved.
- *
- *    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.
- */
-
-#include "AppTask.h"
-#include <app/server/Server.h>
-#include <lib/core/ErrorStr.h>
-
-#include "FreeRTOS.h"
-
-#include <app/server/OnboardingCodesUtil.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <lib/support/ThreadOperationalDataset.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <platform/internal/DeviceNetworkInfo.h>
-
-#include <examples/platform/cc13x2_26x2/CC13X2_26X2DeviceAttestationCreds.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <app/clusters/ota-requestor/BDXDownloader.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
-#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/cc13xx_26xx/OTAImageProcessorImpl.h>
-#endif
-#include <lib/shell/Engine.h>
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CHIPPlatformMemory.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-
-/* syscfg */
-#include <ti_drivers_config.h>
-
-#define APP_TASK_STACK_SIZE (4096)
-#define APP_TASK_PRIORITY 4
-
-using namespace ::chip;
-using namespace ::chip::Credentials;
-using namespace ::chip::DeviceLayer;
-using chip::Shell::Engine;
-
-AppTask AppTask::sAppTask;
-
-static TaskHandle_t sAppTaskHandle;
-
-// Logging
-extern "C" {
-int cc13xx_26xxLogInit(void);
-}
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-static DefaultOTARequestor sRequestorCore;
-static DefaultOTARequestorStorage sRequestorStorage;
-static DefaultOTARequestorDriver sRequestorUser;
-static BDXDownloader sDownloader;
-static OTAImageProcessorImpl sImageProcessor;
-
-void InitializeOTARequestor(void)
-{
-    // Initialize and interconnect the Requestor and Image Processor objects
-    SetRequestorInstance(&sRequestorCore);
-
-    sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-    sRequestorCore.Init(Server::GetInstance(), sRequestorStorage, sRequestorUser, sDownloader);
-    sImageProcessor.SetOTADownloader(&sDownloader);
-    sDownloader.SetImageProcessorDelegate(&sImageProcessor);
-    sRequestorUser.Init(&sRequestorCore, &sImageProcessor);
-}
-#endif
-
-CHIP_ERROR AppTask::StartAppTask()
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    // Start App task.
-    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
-        pdPASS)
-    {
-        while (true)
-            ;
-    }
-
-    return err;
-}
-
-CHIP_ERROR AppTask::Init()
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    cc13xx_26xxLogInit();
-
-    // Init Chip memory management before the stack
-    Platform::MemoryInit();
-
-    Engine::Root().Init();
-
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = PlatformMgr().StartEventLoopTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-    // Initialize device attestation config
-#ifdef CC13X2_26X2_ATTESTATION_CREDENTIALS
-#ifdef CC13XX_26XX_FACTORY_DATA
-    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
-    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
-    SetCommissionableDataProvider(&mFactoryDataProvider);
-#else
-    SetDeviceAttestationCredentialsProvider(CC13X2_26X2::GetCC13X2_26X2DacProvider());
-#endif
-#else
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-#endif
-
-    // Init ZCL Data Model and start server
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    chip::Server::GetInstance().Init(initParams);
-
-#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    InitializeOTARequestor();
-#endif
-    return err;
-}
-
-void AppTask::AppTaskMain(void * pvParameter)
-{
-    CHIP_ERROR err = sAppTask.Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        while (true)
-            ;
-    }
-
-    Engine::Root().RunMainLoop();
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/main/main.cpp b/examples/shell/cc13x2x7_26x2x7/main/main.cpp
deleted file mode 100644
index 884744230dfc56..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/main/main.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <AppTask.h>
-
-#include <FreeRTOS.h>
-
-/* Driver Header files */
-#include <ti/drivers/Board.h>
-#include <ti/drivers/GPIO.h>
-#include <ti/drivers/NVS.h>
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/ECJPAKE.h>
-#include <ti/drivers/SHA2.h>
-
-#include <bget.h>
-#define TOTAL_ICALL_HEAP_SIZE (0xc700)
-
-using namespace ::chip;
-using namespace ::chip::Inet;
-using namespace ::chip::DeviceLayer;
-
-__attribute__((section(".heap"))) uint8_t GlobalHeapZoneBuffer[TOTAL_ICALL_HEAP_SIZE];
-uint32_t heapSize = TOTAL_ICALL_HEAP_SIZE;
-
-// ================================================================================
-// FreeRTOS Callbacks
-// ================================================================================
-extern "C" void vApplicationStackOverflowHook(void)
-{
-    while (true)
-    {
-        ;
-    }
-}
-
-/* Wrapper functions for using the queue registry regardless of whether it is enabled or disabled */
-extern "C" void vQueueAddToRegistryWrapper(QueueHandle_t xQueue, const char * pcQueueName)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-extern "C" void vQueueUnregisterQueueWrapper(QueueHandle_t xQueue)
-{
-    /* This function is intentionally left empty as the Queue Registry is disabled */
-}
-
-// ================================================================================
-// Main Code
-// ================================================================================
-int main(void)
-{
-    CHIP_ERROR err;
-
-    Board_init();
-    bpool((void *) GlobalHeapZoneBuffer, TOTAL_ICALL_HEAP_SIZE);
-
-    GPIO_init();
-
-    NVS_init();
-
-    ECDH_init();
-
-    ECDSA_init();
-
-    ECJPAKE_init();
-
-    AESECB_init();
-
-    SHA2_init();
-
-    err = GetAppTask().StartAppTask();
-    if (err != CHIP_NO_ERROR)
-    {
-        // can't log until the kernel is started
-        // PLAT_LOG("GetAppTask().StartAppTask() failed");
-        while (true)
-            ;
-    }
-
-    vTaskStartScheduler();
-
-    // Should never get here.
-    while (true)
-        ;
-}
diff --git a/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip b/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip
deleted file mode 120000
index c866b86874994d..00000000000000
--- a/examples/shell/cc13x2x7_26x2x7/third_party/connectedhomeip
+++ /dev/null
@@ -1 +0,0 @@
-../../../..
\ No newline at end of file
diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
index 0292ebb480f308..d3a6bc9374f83b 100644
--- a/examples/shell/cc13x4_26x4/README.md
+++ b/examples/shell/cc13x4_26x4/README.md
@@ -50,8 +50,6 @@ Ninja to build the executable.
     step.
 
     ```
-    $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
-    OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
     $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1"
     $ ninja -C out/debug
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 2c3d2b95232474..3f5fc57a616901 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -497,25 +497,6 @@ def BuildNxpTarget():
     return target
 
 
-def BuildCC13x2x7Target():
-    target = BuildTarget('ti', TIBuilder)
-
-    # board
-    target.AppendFixedTargets([
-        TargetPart('cc13x2x7_26x2x7', board=TIBoard.LP_CC2652R7),
-    ])
-
-    target.AppendFixedTargets([
-        TargetPart('lighting', app=TIApp.LIGHTING),
-        TargetPart('lock', app=TIApp.LOCK),
-        TargetPart('pump', app=TIApp.PUMP),
-        TargetPart('pump-controller', app=TIApp.PUMP_CONTROLLER),
-    ])
-    target.AppendModifier(name="mtd", openthread_ftd=False)
-
-    return target
-
-
 def BuildCC13x4Target():
     target = BuildTarget('ti', TIBuilder)
 
@@ -790,7 +771,6 @@ def BuildOpenIotSdkTargets():
     BuildAndroidTarget(),
     BuildBouffalolabTarget(),
     Buildcc32xxTarget(),
-    BuildCC13x2x7Target(),
     BuildCC13x4Target(),
     BuildCyw30739Target(),
     BuildEfr32Target(),
diff --git a/scripts/build/builders/cc13x2x7_26x2x7.py b/scripts/build/builders/cc13x2x7_26x2x7.py
deleted file mode 100644
index 907d92fe1575b4..00000000000000
--- a/scripts/build/builders/cc13x2x7_26x2x7.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (c) 2021 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.
-
-import os
-from enum import Enum, auto
-
-from .gn import GnBuilder
-
-
-class cc13x2x7_26x2x7App(Enum):
-    LOCK = auto()
-    PUMP = auto()
-    PUMP_CONTROLLER = auto()
-    ALL_CLUSTERS = auto()
-    ALL_CLUSTERS_MINIMAL = auto()
-    SHELL = auto()
-
-    def ExampleName(self):
-        if self == cc13x2x7_26x2x7App.LOCK:
-            return 'lock-app'
-        elif self == cc13x2x7_26x2x7App.PUMP:
-            return 'pump-app'
-        elif self == cc13x2x7_26x2x7App.PUMP_CONTROLLER:
-            return 'pump-controller-app'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
-            return 'all-clusters-app'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
-            return 'all-clusters-minimal-app'
-        elif self == cc13x2x7_26x2x7App.SHELL:
-            return 'shell'
-        else:
-            raise Exception('Unknown app type: %r' % self)
-
-    def AppNamePrefix(self):
-        if self == cc13x2x7_26x2x7App.LOCK:
-            return 'chip-LP_CC2652R7-lock-example'
-        elif self == cc13x2x7_26x2x7App.PUMP:
-            return 'chip-LP_CC2652R7-pump-example'
-        elif self == cc13x2x7_26x2x7App.PUMP_CONTROLLER:
-            return 'chip-LP_CC2652R7-pump-controller-example'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS:
-            return 'chip-LP_CC2652R7-all-clusters-example'
-        elif self == cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL:
-            return 'chip-LP_CC2652R7-all-clusters-minimal-example'
-        elif self == cc13x2x7_26x2x7App.SHELL:
-            return 'chip-LP_CC2652R7-shell-example'
-        else:
-            raise Exception('Unknown app type: %r' % self)
-
-    def BuildRoot(self, root):
-        return os.path.join(root, 'examples', self.ExampleName(), 'cc13x2x7_26x2x7')
-
-
-class cc13x2x7_26x2x7Builder(GnBuilder):
-
-    def __init__(self,
-                 root,
-                 runner,
-                 app: cc13x2x7_26x2x7App = cc13x2x7_26x2x7App.LOCK,
-                 openthread_ftd: bool = None):
-        super(cc13x2x7_26x2x7Builder, self).__init__(
-            root=app.BuildRoot(root),
-            runner=runner)
-        self.code_root = root
-        self.app = app
-        self.openthread_ftd = openthread_ftd
-
-    def GnBuildArgs(self):
-        args = [
-            'ti_sysconfig_root="%s"' % os.environ['TI_SYSCONFIG_ROOT'],
-        ]
-
-        if self.openthread_ftd is None:
-            pass
-        elif self.openthread_ftd:
-            args.append('chip_openthread_ftd=true')
-            args.append('chip_progress_logging=false')
-        else:
-            args.append('chip_openthread_ftd=false')
-
-        return args
-
-    def build_outputs(self):
-        items = {}
-        if (self.app == cc13x2x7_26x2x7App.LOCK
-                or self.app == cc13x2x7_26x2x7App.PUMP
-                or self.app == cc13x2x7_26x2x7App.PUMP_CONTROLLER):
-            extensions = [".out", ".bin", ".out.map", "-bim.hex"]
-
-        elif self.app == cc13x2x7_26x2x7App.ALL_CLUSTERS or cc13x2x7_26x2x7App.ALL_CLUSTERS_MINIMAL or self.app == cc13x2x7_26x2x7App.SHELL:
-            extensions = [".out", ".out.map"]
-
-        else:
-            raise Exception('Unknown app type: %r' % self.app)
-
-        for extension in extensions:
-            name = '%s%s' % (self.app.AppNamePrefix(), extension)
-            items[name] = os.path.join(self.output_dir, name)
-
-        return items
diff --git a/scripts/build/builders/ti.py b/scripts/build/builders/ti.py
index 0f49cd44d06a90..5decd75cc058e0 100644
--- a/scripts/build/builders/ti.py
+++ b/scripts/build/builders/ti.py
@@ -69,21 +69,16 @@ def BuildRoot(self, root, board):
 
 
 class TIBoard(Enum):
-    LP_CC2652R7 = auto()
     LP_EM_CC1354P10_6 = auto()
 
     def BoardName(self):
-        if self == TIBoard.LP_CC2652R7:
-            return 'LP_CC2652R7'
-        elif self == TIBoard.LP_EM_CC1354P10_6:
+        if self == TIBoard.LP_EM_CC1354P10_6:
             return 'LP_EM_CC1354P10_6'
         else:
             raise Exception('Unknown board type: %r' % self)
 
     def FamilyName(self):
-        if self == TIBoard.LP_CC2652R7:
-            return 'cc13x2x7_26x2x7'
-        elif self == TIBoard.LP_EM_CC1354P10_6:
+        if self == TIBoard.LP_EM_CC1354P10_6:
             return 'cc13x4_26x4'
         else:
             raise Exception('Unknown board type: %r' % self)
@@ -94,7 +89,7 @@ class TIBuilder(GnBuilder):
     def __init__(self,
                  root,
                  runner,
-                 board=TIBoard.LP_CC2652R7,
+                 board=TIBoard.LP_EM_CC1354P10_6,
                  app: TIApp = TIApp.LOCK,
                  openthread_ftd: Optional[bool] = None):
         super(TIBuilder, self).__init__(
@@ -121,11 +116,12 @@ def GnBuildArgs(self):
 
     def build_outputs(self):
         items = {}
-        if (self.board == TIBoard.LP_CC2652R7):
+        if (self.board == TIBoard.LP_EM_CC1354P10_6):
             if (self.app == TIApp.LOCK
-                    or self.app == TIApp.PUMP
+                or self.app == TIApp.LIGHTING
+                or self.app == TIApp.PUMP
                     or self.app == TIApp.PUMP_CONTROLLER):
-                extensions = [".out", ".bin", ".out.map", "-bim.hex"]
+                extensions = [".out", ".out.map", "-mcuboot.hex"]
 
             else:
                 extensions = [".out", ".out.map"]
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index f258645fcbe554..a1d6a46755e938 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -3,7 +3,6 @@ asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-
 android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,kotlin-matter-controller,virtual-device-app}[-no-debug]
 bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor][-mot]
 cc32xx-{lock,air-purifier}
-ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
 ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]
 cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor,switch}
 efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a,brd4338a}-{window-covering,switch,unit-test,light,lock,thermostat,pump}[-rpc][-with-ota-requestor][-icd][-low-power][-shell][-no-logging][-openthread-mtd][-heap-monitoring][-no-openthread-cli][-show-qr-code][-wifi][-rs9116][-wf200][-siwx917][-ipv4][-additional-data-advertising][-use-ot-lib][-use-ot-coap-lib][-no-version][-skip-rps-generation]
diff --git a/scripts/tools/memory/platform/cc13x2_26x2.cfg b/scripts/tools/memory/platform/cc13x2_26x2.cfg
deleted file mode 100644
index ab9a4ba741394b..00000000000000
--- a/scripts/tools/memory/platform/cc13x2_26x2.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) 2021 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.
-
-# Memory tools default configuation for TI CC13x2/CC26x2
-
-{
-    'section': {
-        # By default, only these sections will be included
-        # when operating by sections.
-        'default': ['.text', '.rodata', '.data', '.bss']
-    },
-    'symbol': {
-        'free': {
-            # These symbols mark the start or end of areas where memory that
-            # does not belong to any symbol is considered unused (rather than
-            # a gap that may be in use for some non-symbol purpose, e.g. string
-            # constants or alignment).
-            'start': ['_stack'],
-            'end': ['_stack_end', '__stack_end'],
-        }
-    },
-    'region': {
-        # Regions are sets of sections that can be used for aggregate reports.
-        'sections': {
-            'FLASH': [
-                '.text',
-                '.rodata',
-                '.resetVecs',
-                '.ccfg',
-                '.ARM.exidx',
-            ],
-            'RAM': [
-                '.bss',
-                '.data',
-                '.heap',
-                '.nvs',
-                '.stack',
-                'vtable_ram',
-            ],
-        }
-    },
-    'collect': {
-        # Strip these prefixes from compilation unit paths.
-        'prefix': [
-            r'C:\\.conan\\1233bc\\1\\source\\ti\\',
-        ],
-        'prefix-file': True,
-    },
-}
diff --git a/scripts/tools/memory/platform/cc13x4_26x4.cfg b/scripts/tools/memory/platform/cc13x4_26x4.cfg
index ab9a4ba741394b..590797c960e696 100644
--- a/scripts/tools/memory/platform/cc13x4_26x4.cfg
+++ b/scripts/tools/memory/platform/cc13x4_26x4.cfg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Memory tools default configuation for TI CC13x2/CC26x2
+# Memory tools default configuation for TI CC13x4/CC26x4
 
 {
     'section': {
diff --git a/src/lib/shell/BUILD.gn b/src/lib/shell/BUILD.gn
index 10dad73a268602..46981b83bb6bb0 100644
--- a/src/lib/shell/BUILD.gn
+++ b/src/lib/shell/BUILD.gn
@@ -89,8 +89,7 @@ static_library("shell") {
       "MainLoopDefault.cpp",
       "streamer_bouffalolab.cpp",
     ]
-  } else if (chip_device_platform == "cc13x2_26x2" ||
-             chip_device_platform == "cc13x4_26x4") {
+  } else if (chip_device_platform == "cc13x4_26x4") {
     sources += [
       "MainLoopDefault.cpp",
       "streamer_cc13x4_26x4.cpp",
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 654875cde51b49..048b7e96af9025 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -171,10 +171,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       defines += [ "CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME=\"${chip_device_config_firmware_build_time}\"" ]
     }
 
-    if (chip_device_platform == "cc13x2_26x2") {
-      device_layer_target_define = "CC13X2_26X2"
-      defines += [ "CHIP_DEVICE_LAYER_TARGET=cc13xx_26xx/cc13x2_26x2" ]
-    } else if (chip_device_platform == "cc13x4_26x4") {
+    if (chip_device_platform == "cc13x4_26x4") {
       device_layer_target_define = "CC13X4_26X4"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=cc13xx_26xx/cc13x4_26x4" ]
     } else if (chip_device_platform == "cc32xx") {
@@ -320,7 +317,6 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
 
     found_device_layer_target_define = false
     possible_device_layer_target_defines = [
-      "CC13X2_26X2",
       "CC13X4_26X4",
       "CC32XX",
       "DARWIN",
@@ -519,9 +515,7 @@ if (chip_device_platform != "none") {
       "${chip_root}/src/lib/support",
     ]
 
-    if (chip_device_platform == "cc13x2_26x2") {
-      _platform_target = "cc13xx_26xx/cc13x2_26x2"
-    } else if (chip_device_platform == "cc13x4_26x4") {
+    if (chip_device_platform == "cc13x4_26x4") {
       _platform_target = "cc13xx_26xx/cc13x4_26x4"
     } else if (chip_device_platform == "cc32xx") {
       _platform_target = "cc32xx"
diff --git a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
index 8e05a4e15a6297..278ad0f1df938c 100644
--- a/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13xx_26xx/DiagnosticDataProviderImpl.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *          Provides an implementation of the DiagnosticDataProvider object
- *          for cc13x2 platform.
+ *          for cc13xx platform.
  */
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
diff --git a/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp b/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
index a338e915181ea8..46cb487eece86f 100644
--- a/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
+++ b/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
@@ -19,7 +19,7 @@
 /**
  *    @file
  *          Provides an implementation of the ThreadStackManager object for
- *          CC13X2_26X2 platforms using the Texas Instruments SDK and the
+ *          CC13XX_26XX platforms using the Texas Instruments SDK and the
  *          OpenThread stack.
  *
  */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h
deleted file mode 100644
index 34c517ed1c166b..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BLEManagerImpl.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- * @file
- * Provides an implementation of the BLEManager object for the Texas
- * Instruments CC13XX_26XX platform.
- */
-
-#pragma once
-
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-
-#include "FreeRTOS.h"
-#include <queue.h>
-#include <task.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <icall.h>
-#include <icall_ble_api.h>
-
-#include "hal_types.h"
-
-#include "ti_ble_config.h"
-#include "ti_drivers_config.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "chipOBleProfile.h"
-
-namespace chip {
-namespace DeviceLayer {
-namespace Internal {
-
-using namespace chip::Ble;
-
-// Internal Events for RTOS application
-#define ICALL_EVT ICALL_MSG_EVENT_ID  // Event_Id_31
-#define QUEUE_EVT UTIL_QUEUE_EVENT_ID // Event_Id_30
-
-// Application events
-#define BLEManagerIMPL_STATE_UPDATE_EVT (0)
-
-// 500ms interval
-#define BLEMANAGERIMPL_ADV_INT_SLOW (800)
-// 100ms interval (Default)
-#define BLEMANAGERIMPL_ADV_INT_FAST (160)
-
-#define CHIPOBLE_ADV_SIZE_NO_DEVICE_ID_INFO (4)
-
-#define CHIPOBLE_SCANRES_SIZE_NO_NAME (6)
-
-#define CHIPOBLE_ADV_DATA_MAX_SIZE (GAP_DEVICE_NAME_LEN + CHIPOBLE_SCANRES_SIZE_NO_NAME)
-
-#define CHIPOBLE_DEVICE_DESC_LENGTH (4)
-
-// How often to read current current RPA (in ms)
-#define READ_RPA_EVT_PERIOD 3000
-
-// 15 Minute Advertisement CHIP Timeout period
-#define ADV_TIMEOUT (900000)
-
-#define STATE_CHANGE_EVT 0
-#define CHAR_CHANGE_EVT 1
-#define CHIPOBLE_CHAR_CHANGE_EVT 2
-#define BLEManagerIMPL_CHIPOBLE_TX_IND_EVT 3
-#define ADV_EVT 4
-#define PAIR_STATE_EVT 5
-#define PASSCODE_EVT 6
-#define READ_RPA_EVT 7
-#define SEND_PARAM_UPDATE_EVT 8
-#define BLEManagerIMPL_CHIPOBLE_CLOSE_CONN_EVT 9
-#define CONN_EVT 10
-
-// For storing the active connections
-#define RSSI_TRACK_CHNLS 1 // Max possible channels can be GAP_BONDINGS_MAX
-#define MAX_RSSI_STORE_DEPTH 5
-#define INVALID_HANDLE 0xFFFF
-#define RSSI_2M_THRSHLD -30
-#define RSSI_1M_THRSHLD -40
-#define RSSI_S2_THRSHLD -50
-#define RSSI_S8_THRSHLD -60
-#define PHY_NONE LL_PHY_NONE // No PHY set
-#define AUTO_PHY_UPDATE 0xFF
-// Set initial values to maximum, RX is set to max. by default(251 octets, 2120us)
-// Some brand smartphone is essentially needing 251/2120, so we set them here.
-#define BLEMANAGER_SUGGESTED_PDU_SIZE 251 // default is 27 octets(TX)
-#define BLEMANAGER_SUGGESTED_TX_TIME 2120 // default is 328us(TX)
-
-typedef struct
-{
-    uint8_t len;  // data length
-    void * pData; // pointer to message
-} CHIPoBLEIndEvt_t;
-
-typedef struct
-{
-    uint8_t paramId;     // Parameter written
-    uint16_t len;        //  data length
-    uint16_t connHandle; // Active connection which received the write
-} CHIPoBLEProfChgEvt_t;
-
-// App event passed from stack modules. This type is defined by the application
-// since it can queue events to itself however it wants.
-typedef struct
-{
-    uint8_t event; // event type
-    void * pData;  // pointer to message
-} QueuedEvt_t;
-
-// Container to store advertising event data when passing from advertising
-// callback to app event. See the respective event in GapAdvScan_Event_IDs
-// in gap_advertiser.h for the type that pBuf should be cast to.
-typedef struct
-{
-    uint32_t event;
-    void * pBuf;
-} GapAdvEventData_t;
-
-// Container to store information from clock expiration using a flexible array
-// since data is not always needed
-typedef struct
-{
-    uint8_t event;
-    uint8_t data[];
-} ClockEventData_t;
-
-// List element for parameter update and PHY command status lists
-typedef struct
-{
-    List_Elem elem;
-    uint16_t connHandle;
-} ConnHandleEntry_t;
-
-// Connected device information
-typedef struct
-{
-    uint16_t connHandle;          // Connection Handle
-    ClockP_Struct * pUpdateClock; // pointer to clock struct
-    int8_t rssiArr[MAX_RSSI_STORE_DEPTH];
-    uint8_t rssiCntr;
-    int8_t rssiAvg;
-    bool phyCngRq; // Set to true if PHY change request is in progress
-    uint8_t currPhy;
-    uint8_t rqPhy;
-    uint8_t phyRqFailCnt; // PHY change request count
-    bool isAutoPHYEnable; // Flag to indicate auto phy change
-    uint16_t mtu;
-    ClockEventData_t * pParamUpdateEventData;
-} ConnRec_t;
-
-// Container to store passcode data when passing from gapbondmgr callback
-// to app event. See the pfnPairStateCB_t documentation from the gapbondmgr.h
-// header file for more information on each parameter.
-typedef struct
-{
-    uint8_t state;
-    uint16_t connHandle;
-    uint8_t status;
-} PairStateData_t;
-
-// Container to store passcode data when passing from gapbondmgr callback
-// to app event. See the pfnPasscodeCB_t documentation from the gapbondmgr.h
-// header file for more information on each parameter.
-typedef struct
-{
-    uint8_t deviceAddr[B_ADDR_LEN];
-    uint16_t connHandle;
-    uint8_t uiInputs;
-    uint8_t uiOutputs;
-    uint32_t numComparison;
-} PasscodeData_t;
-
-/**
- * Concrete implementation of the BLEManager singleton object for CC13XX_26XX.
- */
-class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePlatformDelegate, private BleApplicationDelegate
-
-{
-    // Allow the BLEManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend BLEManager;
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-private:
-    // ===== Members that implement the BLEManager internal interface.
-
-    CHIP_ERROR _Init(void);
-    void _Shutdown() {}
-    bool _IsAdvertisingEnabled(void);
-    CHIP_ERROR _SetAdvertisingEnabled(bool val);
-    bool _IsAdvertising(void);
-    CHIP_ERROR _SetAdvertisingMode(BLEAdvertisingMode mode);
-    CHIP_ERROR _GetDeviceName(char * buf, size_t bufSize);
-    CHIP_ERROR _SetDeviceName(const char * deviceName);
-    uint16_t _NumConnections(void);
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
-    BleLayer * _GetBleLayer(void);
-
-    // ===== Members that implement virtual methods on BlePlatformDelegate.
-
-    bool SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
-                                 const Ble::ChipBleUUID * charId) override;
-    bool UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId,
-                                   const Ble::ChipBleUUID * charId) override;
-    bool CloseConnection(BLE_CONNECTION_OBJECT conId) override;
-    uint16_t GetMTU(BLE_CONNECTION_OBJECT conId) const override;
-
-    bool SendIndication(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                        System::PacketBufferHandle pBuf) override;
-    bool SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                          System::PacketBufferHandle pBuf) override;
-    bool SendReadRequest(BLE_CONNECTION_OBJECT conId, const Ble::ChipBleUUID * svcId, const Ble::ChipBleUUID * charId,
-                         System::PacketBufferHandle pBuf) override;
-    bool SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQUEST_CONTEXT requestContext, const Ble::ChipBleUUID * svcId,
-                          const Ble::ChipBleUUID * charId) override;
-
-    // ===== Members that implement virtual methods on BleApplicationDelegate.
-
-    void NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId) override;
-
-    const ChipBleUUID chipUUID_CHIPoBLEChar_RX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
-                                                     0x9F, 0x9D, 0x11 } };
-    const ChipBleUUID chipUUID_CHIPoBLEChar_TX = { { 0x18, 0xEE, 0x2E, 0xF5, 0x26, 0x3D, 0x45, 0x59, 0x95, 0x9F, 0x4F, 0x9C, 0x42,
-                                                     0x9F, 0x9D, 0x12 } };
-
-    friend BLEManager & BLEMgr(void);
-    friend BLEManagerImpl & BLEMgrImpl(void);
-
-    static BLEManagerImpl sInstance;
-
-    /* BLE stack task handle */
-    static TaskHandle_t sBleTaskHndl;
-    // Entity ID globally used to check for source and/or destination of messages
-    static ICall_EntityID sSelfEntity;
-
-    // Event globally used to post local events and pend on system and
-    // local events.
-    static ICall_SyncHandle sSyncEvent;
-    static QueueHandle_t sEventHandlerMsgQueueID;
-    static chipOBleProfileCBs_t CHIPoBLEProfile_CBs;
-    static gapBondCBs_t BLEMgr_BondMgrCBs;
-
-    enum class Flags : uint16_t
-    {
-        kAdvertisingEnabled       = 0x0001, /* App enabled CHIPoBLE advertising */
-        kFastAdvertisingEnabled   = 0x0002, /* App enabled Fash CHIPoBLE advertising */
-        kAdvertising              = 0x0004, /* TI BLE stack actively advertising */
-        kBLEStackInitialized      = 0x0008, /* TI BLE Stack GAP/GATT Intilization complete */
-        kBLEStackAdvInitialized   = 0x0010, /* TI BLE Stack Advertisement Intilization complete */
-        kBLEStackGATTNameUpdate   = 0x0020, /* Trigger TI BLE Stack name update, must be performed prior to adv start */
-        kBLEStackGATTNameSet      = 0x0040, /* Device name has been set externally*/
-        kAdvertisingRefreshNeeded = 0x0080, /* Advertising settings changed and it should be restarted */
-
-    };
-
-    BitFlags<Flags> mFlags;
-    CHIPoBLEServiceMode mServiceMode;
-    char mDeviceName[GAP_DEVICE_NAME_LEN];
-
-    ConnRec_t connList[MAX_NUM_BLE_CONNS];
-    // List to store connection handles for queued param updates
-    List_List paramUpdateList;
-
-    // Advertising handles
-    uint8_t advHandleLegacy;
-    // Address mode
-    GAP_Addr_Modes_t addrMode = DEFAULT_ADDRESS_MODE;
-    // Current Random Private Address
-    uint8_t rpa[B_ADDR_LEN] = { 0 };
-
-    uint8_t mAdvDatachipOBle[CHIPOBLE_ADV_DATA_MAX_SIZE];
-    uint8_t mScanResDatachipOBle[CHIPOBLE_ADV_DATA_MAX_SIZE];
-
-    ClockP_Struct clkRpaRead;
-    ClockP_Struct clkAdvTimeout;
-    // Memory to pass RPA read event ID to clock handler
-    ClockEventData_t argRpaRead = { .event = READ_RPA_EVT };
-
-    // ===== Private BLE Stack Helper functions.
-    void ConfigureAdvertisements(void);
-    void EventHandler_init(void);
-    void InitPHYRSSIArray(void);
-    CHIP_ERROR CreateEventHandler(void);
-    uint8_t ProcessStackEvent(ICall_Hdr * pMsg);
-    void ProcessEvtHdrMsg(QueuedEvt_t * pMsg);
-    void ProcessGapMessage(gapEventHdr_t * pMsg);
-    uint8_t ProcessGATTMsg(gattMsgEvent_t * pMsg);
-    void ProcessAdvEvent(GapAdvEventData_t * pEventData);
-    CHIP_ERROR ProcessParamUpdate(uint16_t connHandle);
-    status_t EnqueueEvtHdrMsg(uint8_t event, void * pData);
-    uint8_t AddBLEConn(uint16_t connHandle);
-    uint8_t RemoveBLEConn(uint16_t connHandle);
-    uint8_t GetBLEConnIndex(uint16_t connHandle) const;
-    uint8_t ClearBLEConnListEntry(uint16_t connHandle);
-    void ClearPendingBLEParamUpdate(uint16_t connHandle);
-    void UpdateBLERPA(void);
-
-    static void HandleIncomingBleConnection(Ble::BLEEndPoint * bleEP);
-
-    /* Static helper function */
-    static void EventHandler(void * arg);
-    static CHIP_ERROR DriveBLEState(void);
-
-    /* Declared static to acquire function ptr */
-    static void advCallback(uint32_t event, void * pBuf, uintptr_t arg);
-    static void ClockHandler(uintptr_t arg);
-    static void AdvTimeoutHandler(uintptr_t arg);
-    static void FastAdvTimeoutHandler(uintptr_t arg);
-    static void CHIPoBLEProfile_charValueChangeCB(uint8_t paramId, uint16_t len, uint16_t connHandle);
-    static void PasscodeCb(uint8_t * pDeviceAddr, uint16_t connHandle, uint8_t uiInputs, uint8_t uiOutputs, uint32_t numComparison);
-    static void PairStateCb(uint16_t connHandle, uint8_t state, uint8_t status);
-    static void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-};
-
-/**
- * Returns a reference to the public interface of the BLEManager singleton object.
- *
- * Internal components should use this to access features of the BLEManager object
- * that are common to all platforms.
- */
-inline BLEManager & BLEMgr(void)
-{
-    return BLEManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the BLEManager singleton object.
- *
- * Internal components can use this to gain access to features of the BLEManager
- * that are specific to the CC13XX_26XX platforms.
- */
-inline BLEManagerImpl & BLEMgrImpl(void)
-{
-    return BLEManagerImpl::sInstance;
-}
-
-inline BleLayer * BLEManagerImpl::_GetBleLayer()
-{
-    return this;
-}
-
-} // namespace Internal
-} // namespace DeviceLayer
-} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
deleted file mode 100644
index e0005c9fb2b9dd..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2021 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.
-
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/src/platform/device.gni")
-
-import("../factory_data_config.gni")
-
-assert(chip_device_platform == "cc13x2_26x2")
-
-if (chip_enable_openthread) {
-  import("//build_overrides/openthread.gni")
-}
-
-static_library("cc13x2_26x2") {
-  sources = [
-    "../../FreeRTOS/SystemTimeSupport.cpp",
-    "../../SingletonConfigurationManager.cpp",
-    "../CC13XX_26XXConfig.cpp",
-    "../CC13XX_26XXConfig.h",
-    "../ConfigurationManagerImpl.cpp",
-    "../ConnectivityManagerImpl.cpp",
-    "../DiagnosticDataProviderImpl.cpp",
-    "../DiagnosticDataProviderImpl.h",
-    "../KeyValueStoreManagerImpl.cpp",
-    "../Logging.cpp",
-    "../PlatformManagerImpl.cpp",
-    "../Random.c",
-    "BlePlatformConfig.h",
-    "CHIPDevicePlatformConfig.h",
-    "CHIPDevicePlatformEvent.h",
-    "ConnectivityManagerImpl.h",
-    "InetPlatformConfig.h",
-    "KeyValueStoreManagerImpl.h",
-    "PlatformManagerImpl.h",
-    "SystemPlatformConfig.h",
-  ]
-
-  deps = [ "${chip_root}/src/platform/logging:headers" ]
-
-  public = [
-    "${chip_root}/src/credentials/CHIPCert.h",
-    "${chip_root}/src/credentials/CertificationDeclaration.h",
-    "${chip_root}/src/credentials/DeviceAttestationCredsProvider.h",
-  ]
-
-  public_deps = [
-    "${chip_root}/src/crypto",
-    "${chip_root}/src/platform:platform_base",
-  ]
-
-  if (chip_enable_ble) {
-    sources += [
-      "../BLEManagerImpl.cpp",
-      "BLEManagerImpl.h",
-    ]
-  }
-
-  if (custom_factory_data) {
-    sources += [
-      "../FactoryDataProvider.cpp",
-      "../FactoryDataProvider.h",
-    ]
-  }
-  if (chip_enable_ota_requestor) {
-    sources += [
-      # this needs to be in the final link to place the data correctly
-      # see ${chip_root}/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
-      #"oad_image_header.c",
-      "OTAImageProcessorImpl.cpp",
-    ]
-  }
-
-  if (chip_enable_openthread) {
-    # needed for MTD/FTD
-    import("//build_overrides/ti_simplelink_sdk.gni")
-    import("${ti_simplelink_sdk_build_root}/ti_simplelink_board.gni")
-    public_deps += [
-      "${chip_root}/third_party/openthread/platforms/cc13x2_26x2:libopenthread-cc13x2_cc26x2",
-      "${chip_root}/third_party/ti_simplelink_sdk:mbedtls",
-      "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sdk",
-      "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sysconfig",
-    ]
-
-    if (chip_openthread_ftd) {
-      public_deps +=
-          [ "${chip_root}/third_party/openthread/repo:libopenthread-ftd" ]
-    } else {
-      public_deps +=
-          [ "${chip_root}/third_party/openthread/repo:libopenthread-mtd" ]
-    }
-
-    sources += [
-      "../../OpenThread/OpenThreadUtils.cpp",
-      "../ThreadStackManagerImpl.cpp",
-      "ThreadStackManagerImpl.h",
-    ]
-
-    if (chip_mdns == "platform") {
-      sources += [
-        "../../OpenThread/DnssdImpl.cpp",
-        "../../OpenThread/OpenThreadDnssdImpl.cpp",
-        "../../OpenThread/OpenThreadDnssdImpl.h",
-      ]
-      deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
-    }
-  }
-}
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h
deleted file mode 100644
index 8924b62d9b33c6..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BlePlatformConfig.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the CHIP BLE
- *          Layer for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: Empty because BLE is not enabled, but build defines this file
- *       to be included by the build configuration.
- */
-
-#pragma once
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h
deleted file mode 100644
index 13a5e6900dbb1d..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformConfig.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the chip Device Layer
- *          for the Texas Instruments CC13XX_CC26XX platform.
- */
-
-#pragma once
-
-// ==================== Platform Adaptations ====================
-
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
-
-// ========== Platform-specific Configuration =========
-
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
-#define CHIP_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY 0
-
-// ========== CHIP Platform Configuration =========
-
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (8192)
-
-#define CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE (7168)
-
-#define BLEMANAGER_EVENT_HANDLER_STACK_SIZE (924)
-#define BLEMANAGER_EVENT_HANDLER_PRIORITY (2)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1
-
-// Per 5.2.5.2. Commencement Section of CHIP spec, BLE advertisement is
-// disabled for Locks and Barrier Access Devices.
-#define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0
-#define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 0
-
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
-#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h
deleted file mode 100644
index f647b595d02990..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPDevicePlatformEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Defines platform-specific event types and data for the chip
- *          for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <platform/CHIPDeviceEvent.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Represents platform-specific event information
- */
-struct ChipDevicePlatformEvent final
-{
-};
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h
deleted file mode 100644
index 2a5981d4bbdea6..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/CHIPPlatformConfig.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- *    Copyright (c) 2020-2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for CHIP on
- *          the Texas Instruments CC1352 platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <stdint.h>
-
-// ==================== General Platform Adaptations ====================
-
-#define CHIP_CONFIG_ABORT() abort()
-
-#define CHIP_CONFIG_PERSISTED_STORAGE_KEY_TYPE uint16_t
-#define CHIP_CONFIG_PERSISTED_STORAGE_ENC_MSG_CNTR_ID 1
-#define CHIP_CONFIG_PERSISTED_STORAGE_MAX_KEY_LENGTH 2
-
-#define CHIP_CONFIG_LIFETIIME_PERSISTED_COUNTER_KEY 0x01
-
-// ==================== Security Adaptations ====================
-
-#define CHIP_CONFIG_SHA256_CONTEXT_SIZE (sizeof(unsigned int) * 76)
-
-// ==================== General Configuration Overrides ====================
-
-#ifndef CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
-#define CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS 8
-#endif // CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS
-
-#ifndef CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
-#define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS 8
-#endif // CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
-
-#ifndef CHIP_LOG_FILTERING
-#define CHIP_LOG_FILTERING 0
-#endif // CHIP_LOG_FILTERING
-
-#ifndef CHIP_CONFIG_MAX_INTERFACES
-#define CHIP_CONFIG_MAX_INTERFACES 4
-#endif // CHIP_CONFIG_MAX_INTERFACES
-
-#ifndef CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS
-#define CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS 4
-#endif // CHIP_CONFIG_MAX_LOCAL_ADDR_UDP_ENDPOINTS
-
-// Limit the number of device admins to ensure enough ressources for handling them
-#ifndef CHIP_CONFIG_MAX_FABRICS
-#define CHIP_CONFIG_MAX_FABRICS 5
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h
deleted file mode 100644
index 17ec853af5e9e0..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ConfigurationManagerImpl.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Provides an implementation of the ConfigurationManager object
- *          for the Texas Instruments CC1352 platform.
- */
-
-#pragma once
-
-#include <platform/cc13xx_26xx/CC13XX_26XXConfig.h>
-#include <platform/internal/GenericConfigurationManagerImpl.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the ConfigurationManager singleton object for the CC13X2_26X2 platform.
- */
-class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::CC13XX_26XXConfig>
-{
-public:
-    // This returns an instance of this class.
-    static ConfigurationManagerImpl & GetDefaultInstance();
-
-    CHIP_ERROR GetRebootCount(uint32_t & rebootCount);
-    CHIP_ERROR IncreaseBootCount(void);
-    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours);
-    CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours);
-
-private:
-    // ===== Members that implement the ConfigurationManager public interface.
-
-    CHIP_ERROR Init(void) override;
-    CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
-    bool CanFactoryReset(void) override;
-    void InitiateFactoryReset(void) override;
-    CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
-    CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
-
-    // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
-
-    // ===== Members that implement the GenericConfigurationManagerImpl protected interface.
-    CHIP_ERROR ReadConfigValue(Key key, bool & val) override;
-    CHIP_ERROR ReadConfigValue(Key key, uint32_t & val) override;
-    CHIP_ERROR ReadConfigValue(Key key, uint64_t & val) override;
-    CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen) override;
-    CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen) override;
-    CHIP_ERROR WriteConfigValue(Key key, bool val) override;
-    CHIP_ERROR WriteConfigValue(Key key, uint32_t val) override;
-    CHIP_ERROR WriteConfigValue(Key key, uint64_t val) override;
-    CHIP_ERROR WriteConfigValueStr(Key key, const char * str) override;
-    CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen) override;
-    CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen) override;
-    void RunConfigUnitTest(void) override;
-
-    // ===== Private members reserved for use by this class only.
-
-    static void DoFactoryReset(intptr_t arg);
-};
-
-inline CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
-{
-    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-}
-
-/**
- * Returns the platform-specific implementation of the ConfigurationManager object.
- *
- * Applications can use this to gain access to features of the ConfigurationManager
- * that are specific to the selected platform.
- */
-ConfigurationManager & ConfigurationMgrImpl();
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h
deleted file mode 100644
index 44c0e764b391a7..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ConnectivityManagerImpl.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-/**
- *    @file
- *          Platform-specific connectivity manager class for the Texas
- *          Instruments CC13XX_26XX platform.
- */
-
-#pragma once
-
-#include <platform/ConnectivityManager.h>
-#include <platform/internal/GenericConnectivityManagerImpl.h>
-#include <platform/internal/GenericConnectivityManagerImpl_UDP.h>
-#if INET_CONFIG_ENABLE_TCP_ENDPOINT
-#include <platform/internal/GenericConnectivityManagerImpl_TCP.h>
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
-#else
-#include <platform/internal/GenericConnectivityManagerImpl_NoBLE.h>
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
-#else
-#include <platform/internal/GenericConnectivityManagerImpl_NoThread.h>
-#endif
-#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the ConnectivityManager singleton object for the CC13XX_26XX platforms.
- */
-class ConnectivityManagerImpl final : public ConnectivityManager,
-                                      public Internal::GenericConnectivityManagerImpl<ConnectivityManagerImpl>,
-                                      public Internal::GenericConnectivityManagerImpl_UDP<ConnectivityManagerImpl>,
-#if INET_CONFIG_ENABLE_TCP_ENDPOINT
-                                      public Internal::GenericConnectivityManagerImpl_TCP<ConnectivityManagerImpl>,
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
-                                      public Internal::GenericConnectivityManagerImpl_BLE<ConnectivityManagerImpl>,
-#else
-                                      public Internal::GenericConnectivityManagerImpl_NoBLE<ConnectivityManagerImpl>,
-#endif
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-                                      public Internal::GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>,
-#else
-                                      public Internal::GenericConnectivityManagerImpl_NoThread<ConnectivityManagerImpl>,
-#endif
-                                      public Internal::GenericConnectivityManagerImpl_NoWiFi<ConnectivityManagerImpl>
-{
-    // Allow the ConnectivityManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class ConnectivityManager;
-
-private:
-    // ===== Members that implement the ConnectivityManager abstract interface.
-
-    CHIP_ERROR _Init(void);
-    void _OnPlatformEvent(const ChipDeviceEvent * event);
-
-    // ===== Members for internal use by the following friends.
-
-    friend ConnectivityManager & ConnectivityMgr(void);
-    friend ConnectivityManagerImpl & ConnectivityMgrImpl(void);
-
-    static ConnectivityManagerImpl sInstance;
-};
-
-/**
- * Returns the public interface of the ConnectivityManager singleton object.
- *
- * chip applications should use this to access features of the ConnectivityManager object
- * that are common to all platforms.
- */
-inline ConnectivityManager & ConnectivityMgr(void)
-{
-    return ConnectivityManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the ConnectivityManager singleton object.
- *
- * chip applications can use this to gain access to features of the ConnectivityManager
- * that are specific to the platform
- */
-inline ConnectivityManagerImpl & ConnectivityMgrImpl(void)
-{
-    return ConnectivityManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h
deleted file mode 100644
index 7e5246c670f2ce..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/FreeRTOSConfig.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * FreeRTOS Kernel V10.0.0
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software. If you wish to use our
- * Amazon FreeRTOS name, please do so in a fair use way that does not cause
- * confusion.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
- *
- * 1 tab == 4 spaces!
- */
-
-/******************************************************************************
-    See http://www.freertos.org/a00110.html for an explanation of the
-    definitions contained in this file.
-******************************************************************************/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- * http://www.freertos.org/a00110.html
- *----------------------------------------------------------*/
-
-/* Constants related to the behaviour or the scheduler. */
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
-#define configTICK_RATE_HZ ((TickType_t) 1000)
-#define configUSE_PREEMPTION 1
-#define configUSE_TIME_SLICING 0
-#define configMAX_PRIORITIES (10UL)
-#define configIDLE_SHOULD_YIELD 0
-#define configUSE_16_BIT_TICKS 0 /* Only for 8 and 16-bit hardware. */
-
-/* Constants that describe the hardware and memory usage. */
-#define configCPU_CLOCK_HZ ((unsigned long) 48000000)
-#define configMINIMAL_STACK_SIZE ((unsigned short) 512)
-#define configMAX_TASK_NAME_LEN (12)
-
-/* FreeRTOS heap size is 0 because currently "bget" heap is the
- only heap available, for both FreeRTOS and application */
-// #define configTOTAL_HEAP_SIZE           ( ( size_t ) ( 0 ) )
-#define configTOTAL_HEAP_SIZE ((size_t) (0))
-#define configSUPPORT_STATIC_ALLOCATION 1
-#define configAPPLICATION_ALLOCATED_HEAP 1
-
-/* Default stack size for TI-POSIX threads (in words) */
-#define configPOSIX_STACK_SIZE ((unsigned short) 1024)
-
-/* Constants that build features in or out. */
-#define configUSE_MUTEXES 1
-#define configUSE_TICKLESS_IDLE 1
-#define configUSE_APPLICATION_TASK_TAG 1 /* Need by POSIX/pthread */
-#define configUSE_CO_ROUTINES 0
-#define configUSE_COUNTING_SEMAPHORES 1
-#define configUSE_RECURSIVE_MUTEXES 1
-#define configUSE_QUEUE_SETS 0
-#define configUSE_TASK_NOTIFICATIONS 1
-
-/* Constants that define which hook (callback) functions should be used. */
-#define configUSE_IDLE_HOOK 0
-#define configUSE_TICK_HOOK 0
-#define configUSE_MALLOC_FAILED_HOOK 0
-
-/* Constants provided for debugging and optimisation assistance. */
-#define configCHECK_FOR_STACK_OVERFLOW 2
-#define configASSERT(x)                                                                                                            \
-    if ((x) == 0)                                                                                                                  \
-    {                                                                                                                              \
-        taskDISABLE_INTERRUPTS();                                                                                                  \
-        for (;;)                                                                                                                   \
-            ;                                                                                                                      \
-    }
-#define configQUEUE_REGISTRY_SIZE 0
-
-/* Minimum FreeRTOS tick periods of idle before invoking Power policy */
-/* TODO: find way to reduce this; FreeRTOS requires it to be 2 or more */
-#define configEXPECTED_IDLE_TIME_BEFORE_SLEEP 2
-
-/* Software timer definitions. */
-#define configUSE_TIMERS 1
-#define configTIMER_TASK_PRIORITY (6)
-#define configTIMER_QUEUE_LENGTH (20)
-#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE)
-#define configIDLE_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE)
-
-#define configENABLE_BACKWARD_COMPATIBILITY 1
-
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__)
-#include <ti/posix/freertos/PTLS.h>
-#define traceTASK_DELETE(pxTCB) PTLS_taskDeleteHook(pxTCB)
-#elif defined(__IAR_SYSTEMS_ICC__)
-#ifndef __IAR_SYSTEMS_ASM__
-#include <ti/posix/freertos/Mtx.h>
-#define traceTASK_DELETE(pxTCB) Mtx_taskDeleteHook(pxTCB)
-#endif
-#endif
-
-/*
- *  Enable thread local storage
- *
- *  Assign TLS array index ownership here to avoid collisions.
- *  TLS storage is needed to implement thread-safe errno with
- *  TI and IAR compilers. With GNU compiler, we enable newlib.
- */
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__) || defined(__IAR_SYSTEMS_ICC__)
-
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 2
-
-#if defined(__TI_COMPILER_VERSION__) || defined(__ti_version__)
-#define PTLS_TLS_INDEX 0 /* ti.posix.freertos.PTLS */
-#elif defined(__IAR_SYSTEMS_ICC__)
-#define MTX_TLS_INDEX 0 /* ti.posix.freertos.Mtx */
-#endif
-
-#define NDK_TLS_INDEX 1 /* Reserve an index for NDK TLS */
-
-#elif defined(__GNUC__)
-
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 1
-
-#define NDK_TLS_INDEX 0 /* Reserve an index for NDK TLS */
-
-/* note: system locks required by newlib are not implemented */
-#define configUSE_NEWLIB_REENTRANT 1
-#endif
-
-/*
- * Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function.  NOTE:  Setting an INCLUDE_ parameter to 0 is
- * only necessary if the linker does not automatically remove functions that
- * are not referenced anyway.
- */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 0
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_uxTaskGetStackHighWaterMark 1
-#define INCLUDE_xTaskGetIdleTaskHandle 0
-#define INCLUDE_eTaskGetState 1
-#define INCLUDE_xTaskResumeFromISR 0
-#define INCLUDE_xTaskGetCurrentTaskHandle 1
-#define INCLUDE_xTaskGetSchedulerState 1
-#define INCLUDE_xSemaphoreGetMutexHolder 0
-#define INCLUDE_xTimerPendFunctionCall 0
-
-/* Cortex-M3/4 interrupt priority configuration follows...................... */
-
-/* Use the system definition, if there is one. */
-#ifdef __NVIC_PRIO_BITS
-#define configPRIO_BITS __NVIC_PRIO_BITS
-#else
-#define configPRIO_BITS 3 /* 8 priority levels */
-#endif
-
-/*
- * The lowest interrupt priority that can be used in a call to a "set priority"
- * function.
- */
-#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x07
-
-/*
- * The highest interrupt priority that can be used by any interrupt service
- * routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT
- * CALL INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A
- * HIGHER PRIORITY THAN THIS! (higher priorities are lower numeric values.
- */
-#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 1
-
-/*
- * Interrupt priorities used by the kernel port layer itself.  These are generic
- * to all Cortex-M ports, and do not rely on any particular library functions.
- */
-#define configKERNEL_INTERRUPT_PRIORITY (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
-
-/*
- * !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
- * See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html.
- *
- * Priority 1 (shifted 5 since only the top 3 bits are implemented).
- * Priority 1 is the second highest priority.
- * Priority 0 is the highest priority.
- */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
-
-/*
- * The trace facility is turned on to make some functions available for use in
- * CLI commands.
- */
-#define configUSE_TRACE_FACILITY 1
-
-/*
- * Runtime Object View is a Texas Instrument host tool that helps visualize
- * the application. When enabled, the ISR stack will be initialized in the
- * startup_<device>_<compiler>.c file to 0xa5a5a5a5. The stack peak can then
- * be displayed in Runtime Object View.
- */
-#define configENABLE_ISR_STACK_INIT 1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h
deleted file mode 100644
index 21344caa15bc66..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/InetPlatformConfig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    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
-
-// ==================== Platform Adaptations ====================
-
-#ifndef INET_CONFIG_ENABLE_IPV4
-#error Inet IPv4 configuration should be configured at build generation time
-#endif
-
-// ========== Platform-specific Configuration Overrides =========
-
-#ifndef INET_CONFIG_NUM_TCP_ENDPOINTS
-#define INET_CONFIG_NUM_TCP_ENDPOINTS 4
-#endif // INET_CONFIG_NUM_TCP_ENDPOINTS
-
-#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
-#define INET_CONFIG_NUM_UDP_ENDPOINTS 4
-#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h
deleted file mode 100644
index 45396e4544b7aa..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/KeyValueStoreManagerImpl.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific key value storage implementation for CC13XX_26XX.
- */
-
-#pragma once
-
-namespace chip {
-namespace DeviceLayer {
-namespace PersistedStorage {
-
-class KeyValueStoreManagerImpl final : public KeyValueStoreManager
-{
-    // Allow the KeyValueStoreManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class KeyValueStoreManager;
-
-public:
-    CHIP_ERROR _Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size = nullptr, size_t offset = 0) const;
-
-    CHIP_ERROR _Delete(const char * key);
-
-    CHIP_ERROR _Put(const char * key, const void * value, size_t value_size);
-
-private:
-    // ===== Members for internal use by the following friends.
-    friend KeyValueStoreManager & KeyValueStoreMgr();
-    friend KeyValueStoreManagerImpl & KeyValueStoreMgrImpl();
-
-    static KeyValueStoreManagerImpl sInstance;
-};
-
-/**
- * Returns the public interface of the KeyValueStoreManager singleton object.
- *
- * Chip applications should use this to access features of the KeyValueStoreManager object
- * that are common to all platforms.
- */
-inline KeyValueStoreManager & KeyValueStoreMgr(void)
-{
-    return KeyValueStoreManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the KeyValueStoreManager singleton object.
- *
- * Chip applications can use this to gain access to features of the KeyValueStoreManager
- * that are specific to the platform.
- */
-inline KeyValueStoreManagerImpl & KeyValueStoreMgrImpl(void)
-{
-    return KeyValueStoreManagerImpl::sInstance;
-}
-
-} // namespace PersistedStorage
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp b/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp
deleted file mode 100644
index 58f3fdcb73c725..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/OTAImageProcessorImpl.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    All rights reserved.
- *
- *    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.
- */
-
-#include <app/clusters/ota-requestor/OTADownloader.h>
-#include <app/clusters/ota-requestor/OTARequestorInterface.h>
-#include <lib/support/DefaultStorageKeyAllocator.h>
-
-#include "OTAImageProcessorImpl.h"
-
-#include <ti/common/cc26xx/flash_interface/flash_interface.h>
-#include <ti/common/cc26xx/oad/ext_flash_layout.h>
-
-#include <ti_drivers_config.h>
-
-// clang-format off
-/* driverlib header for resetting the SoC */
-#include <ti/devices/DeviceFamily.h>
-#include DeviceFamily_constructPath(driverlib/sys_ctrl.h)
-// clang-format on
-
-using namespace chip::DeviceLayer;
-using namespace chip::DeviceLayer::PersistedStorage;
-
-namespace chip {
-
-CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
-{
-    PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Finalize()
-{
-    PlatformMgr().ScheduleWork(HandleFinalize, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Apply()
-{
-    PlatformMgr().ScheduleWork(HandleApply, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::Abort()
-{
-    PlatformMgr().ScheduleWork(HandleAbort, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
-{
-    if (nullptr == mNvsHandle)
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    if ((nullptr == block.data()) || block.empty())
-    {
-        return CHIP_ERROR_INVALID_ARGUMENT;
-    }
-
-    // Store block data for HandleProcessBlock to access
-    CHIP_ERROR err = SetBlock(block);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(SoftwareUpdate, "Cannot set block data: %" CHIP_ERROR_FORMAT, err.Format());
-    }
-
-    PlatformMgr().ScheduleWork(HandleProcessBlock, reinterpret_cast<intptr_t>(this));
-    return CHIP_NO_ERROR;
-}
-
-bool OTAImageProcessorImpl::IsFirstImageRun()
-{
-    OTARequestorInterface * requestor;
-    uint32_t runningSwVer;
-
-    if (CHIP_NO_ERROR != ConfigurationMgr().GetSoftwareVersion(runningSwVer))
-    {
-        return false;
-    }
-
-    requestor = GetRequestorInstance();
-
-    return (requestor->GetTargetVersion() == runningSwVer) &&
-        (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);
-}
-
-/* DESIGN NOTE: The Boot Image Manager will search external flash for an
- * `ExtImageInfo_t` structure every 4K for 1M. This structure points to where
- * the executable image is in external flash with a uint32_t. It is possible to
- * have multiple images ready to be programmed into the internal flash of the
- * device. This design is only concerned with managing 1 image in external
- * flash starting at `IMG_START` and being defined by a meta header at address
- * 0. Future designs may be able to take advantage of other images for rollback
- * functionality, however this will require a larger external flash chip.
- */
-
-#define IMG_START (4 * EFL_SIZE_META)
-
-static bool readExtFlashImgHeader(NVS_Handle handle, imgFixedHdr_t * header, size_t otaHeaderLen)
-{
-    int_fast16_t status;
-    status = NVS_read(handle, IMG_START + otaHeaderLen, header, sizeof(imgFixedHdr_t));
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-/* makes room for the new block if needed */
-static bool writeExtFlashImgPages(NVS_Handle handle, size_t bytesWritten, MutableByteSpan block)
-{
-    int_fast16_t status;
-    NVS_Attrs regionAttrs;
-    unsigned int erasedSectors;
-    unsigned int neededSectors;
-    size_t sectorSize;
-
-    NVS_getAttrs(handle, &regionAttrs);
-    sectorSize    = regionAttrs.sectorSize;
-    erasedSectors = (bytesWritten + (sectorSize - 1)) / sectorSize;
-    neededSectors = ((bytesWritten + block.size()) + (sectorSize - 1)) / sectorSize;
-    if (neededSectors != erasedSectors)
-    {
-        status = NVS_erase(handle, IMG_START + (erasedSectors * sectorSize), (neededSectors - erasedSectors) * sectorSize);
-        if (status != NVS_STATUS_SUCCESS)
-        {
-            ChipLogError(SoftwareUpdate, "NVS_erase failed status: %d", status);
-            return false;
-        }
-    }
-    status = NVS_write(handle, IMG_START + bytesWritten, block.data(), block.size(), NVS_WRITE_POST_VERIFY);
-    if (status != NVS_STATUS_SUCCESS)
-    {
-        ChipLogError(SoftwareUpdate, "NVS_write failed status: %d", status);
-        return false;
-    }
-    return true;
-}
-
-static bool readExtFlashMetaHeader(NVS_Handle handle, ExtImageInfo_t * header)
-{
-    int_fast16_t status;
-    status = NVS_read(handle, EFL_ADDR_META, header, sizeof(ExtImageInfo_t));
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-static bool eraseExtFlashMetaHeader(NVS_Handle handle)
-{
-    int_fast16_t status;
-    NVS_Attrs regionAttrs;
-    unsigned int sectors;
-
-    NVS_getAttrs(handle, &regionAttrs);
-    /* calculate the number of sectors to erase */
-    sectors = (sizeof(ExtImageInfo_t) + (regionAttrs.sectorSize - 1)) / regionAttrs.sectorSize;
-    status  = NVS_erase(handle, EFL_ADDR_META, sectors * regionAttrs.sectorSize);
-
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-static bool writeExtFlashMetaHeader(NVS_Handle handle, ExtImageInfo_t * header)
-{
-    int_fast16_t status;
-    if (!eraseExtFlashMetaHeader(handle))
-    {
-        return false;
-    }
-    status = NVS_write(handle, EFL_ADDR_META, header, sizeof(ExtImageInfo_t), NVS_WRITE_POST_VERIFY);
-    return (status == NVS_STATUS_SUCCESS);
-}
-
-/**
- * Generated on by pycrc v0.9.2, https://pycrc.org using the configuration:
- *  - Width         = 32
- *  - Poly          = 0x04c11db7
- *  - XorIn         = 0xffffffff
- *  - ReflectIn     = True
- *  - XorOut        = 0xffffffff
- *  - ReflectOut    = True
- *  - Algorithm     = bit-by-bit-fast
- *
- * Modified to take uint32_t as the CRC type
- */
-uint32_t crc_reflect(uint32_t data, size_t data_len)
-{
-    unsigned int i;
-    uint32_t ret;
-
-    ret = data & 0x01;
-    for (i = 1; i < data_len; i++)
-    {
-        data >>= 1;
-        ret = (ret << 1) | (data & 0x01);
-    }
-    return ret;
-}
-
-uint32_t crc_update(uint32_t crc, const void * data, size_t data_len)
-{
-    const unsigned char * d = (const unsigned char *) data;
-    unsigned int i;
-    bool bit;
-    unsigned char c;
-
-    while (data_len--)
-    {
-        c = *d++;
-        for (i = 0x01; i & 0xff; i <<= 1)
-        {
-            bit = crc & 0x80000000;
-            if (c & i)
-            {
-                bit = !bit;
-            }
-            crc <<= 1;
-            if (bit)
-            {
-                crc ^= 0x04c11db7;
-            }
-        }
-        crc &= 0xffffffff;
-    }
-    return crc & 0xffffffff;
-}
-
-static bool validateExtFlashImage(NVS_Handle handle, size_t otaHeaderLen)
-{
-    uint32_t crc;
-    imgFixedHdr_t header;
-    size_t addr, endAddr;
-
-    if (!readExtFlashImgHeader(handle, &header, otaHeaderLen))
-    {
-        return false;
-    }
-
-    /* CRC is calculated after the CRC element of the image header */
-    addr    = IMG_START + otaHeaderLen + IMG_DATA_OFFSET;
-    endAddr = IMG_START + otaHeaderLen + header.len;
-
-    crc = 0xFFFFFFFF;
-
-    while (addr < endAddr)
-    {
-        uint8_t buffer[32];
-        size_t bytesLeft = endAddr - addr;
-        size_t toRead    = (sizeof(buffer) < bytesLeft) ? sizeof(buffer) : bytesLeft;
-
-        if (NVS_STATUS_SUCCESS != NVS_read(handle, addr, buffer, toRead))
-        {
-            return false;
-        }
-
-        crc = crc_update(crc, buffer, toRead);
-
-        addr += toRead;
-    }
-
-    crc = crc_reflect(crc, 32) ^ 0xffffffff;
-
-    return (crc == header.crc32);
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
-{
-    NVS_Handle handle;
-    NVS_Params nvsParams;
-    NVS_Params_init(&nvsParams);
-    handle = NVS_open(CONFIG_NVSEXTERNAL, &nvsParams);
-
-    if (NULL != handle)
-    {
-        eraseExtFlashMetaHeader(handle);
-        NVS_close(handle);
-        return CHIP_NO_ERROR;
-    }
-    return CHIP_NO_ERROR;
-}
-
-void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
-        return;
-    }
-    else if (imageProcessor->mDownloader == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "mDownloader is null");
-        return;
-    }
-
-    if (NULL == imageProcessor->mNvsHandle)
-    {
-        NVS_Params nvsParams;
-        NVS_Params_init(&nvsParams);
-        imageProcessor->mNvsHandle = NVS_open(CONFIG_NVSEXTERNAL, &nvsParams);
-
-        if (NULL == imageProcessor->mNvsHandle)
-        {
-            imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_OPEN_FAILED);
-            return;
-        }
-    }
-
-    if (!eraseExtFlashMetaHeader(imageProcessor->mNvsHandle))
-    {
-        NVS_close(imageProcessor->mNvsHandle);
-        imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_WRITE_FAILED);
-        return;
-    }
-
-    imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
-}
-
-void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
-{
-    ExtImageInfo_t header;
-    auto * imageProcessor    = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    const uint8_t extImgId[] = OAD_EFL_MAGIC;
-
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!readExtFlashImgHeader(imageProcessor->mNvsHandle, &(header.fixedHdr),
-                               imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader)))
-    {
-        return;
-    }
-    // offset in the size of the fixed and variable OTA image headers
-    memcpy(&(header.fixedHdr.imgID), extImgId, sizeof(header.fixedHdr.imgID));
-    header.extFlAddr = IMG_START + imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader);
-    header.counter   = 0x0;
-
-    if (validateExtFlashImage(imageProcessor->mNvsHandle,
-                              imageProcessor->mFixedOtaHeader.headerSize + sizeof(imageProcessor->mFixedOtaHeader)))
-    {
-        // only write the meta header if the crc check passes
-        writeExtFlashMetaHeader(imageProcessor->mNvsHandle, &header);
-    }
-    else
-    {
-        // ensure the external image is not mistaken for a valid image
-        eraseExtFlashMetaHeader(imageProcessor->mNvsHandle);
-    }
-
-    imageProcessor->ReleaseBlock();
-
-    ChipLogProgress(SoftwareUpdate, "OTA image downloaded");
-}
-
-void OTAImageProcessorImpl::HandleApply(intptr_t context)
-{
-    ExtImageInfo_t header;
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!readExtFlashMetaHeader(imageProcessor->mNvsHandle, &header))
-    {
-        return;
-    }
-    header.fixedHdr.imgCpStat = NEED_COPY;
-
-    writeExtFlashMetaHeader(imageProcessor->mNvsHandle, &header);
-
-    // reset SoC to kick BIM
-    SysCtrlSystemReset();
-}
-
-void OTAImageProcessorImpl::HandleAbort(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        return;
-    }
-
-    if (!eraseExtFlashMetaHeader(imageProcessor->mNvsHandle))
-    {
-        imageProcessor->mDownloader->OnPreparedForDownload(CHIP_ERROR_WRITE_FAILED);
-    }
-
-    NVS_close(imageProcessor->mNvsHandle);
-    imageProcessor->ReleaseBlock();
-}
-
-void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
-{
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
-    if (imageProcessor == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
-        return;
-    }
-    else if (imageProcessor->mDownloader == nullptr)
-    {
-        ChipLogError(SoftwareUpdate, "mDownloader is null");
-        return;
-    }
-
-    /* Save the fixed size header */
-    if (imageProcessor->mParams.downloadedBytes < sizeof(imageProcessor->mFixedOtaHeader))
-    {
-        uint8_t * header = reinterpret_cast<uint8_t *>(&(imageProcessor->mFixedOtaHeader));
-        if (imageProcessor->mBlock.size() + imageProcessor->mParams.downloadedBytes < sizeof(imageProcessor->mFixedOtaHeader))
-        {
-            // the first block is smaller than the header, somehow
-            memcpy(header + imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock.data(), imageProcessor->mBlock.size());
-        }
-        else
-        {
-            // we have received the whole header, fill it up
-            memcpy(header + imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock.data(),
-                   sizeof(imageProcessor->mFixedOtaHeader) - imageProcessor->mParams.downloadedBytes);
-
-            // update the total size for download tracking
-            imageProcessor->mParams.totalFileBytes = imageProcessor->mFixedOtaHeader.totalSize;
-        }
-    }
-
-    /* chip::OTAImageHeaderParser can be used for processing the variable size header */
-
-    ChipLogDetail(SoftwareUpdate, "Write block %d, %d", (size_t) imageProcessor->mParams.downloadedBytes,
-                  imageProcessor->mBlock.size());
-    if (!writeExtFlashImgPages(imageProcessor->mNvsHandle, imageProcessor->mParams.downloadedBytes, imageProcessor->mBlock))
-    {
-        imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
-        return;
-    }
-
-    imageProcessor->mParams.downloadedBytes += imageProcessor->mBlock.size();
-    imageProcessor->mDownloader->FetchNextData();
-}
-
-CHIP_ERROR OTAImageProcessorImpl::SetBlock(ByteSpan & block)
-{
-    if (block.empty())
-    {
-        ReleaseBlock();
-        return CHIP_NO_ERROR;
-    }
-    if (mBlock.size() < block.size())
-    {
-        if (!mBlock.empty())
-        {
-            ReleaseBlock();
-        }
-        uint8_t * mBlock_ptr = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(block.size()));
-        if (mBlock_ptr == nullptr)
-        {
-            return CHIP_ERROR_NO_MEMORY;
-        }
-        mBlock = MutableByteSpan(mBlock_ptr, block.size());
-    }
-    CHIP_ERROR err = CopySpanToMutableSpan(block, mBlock);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(SoftwareUpdate, "Cannot copy block data: %" CHIP_ERROR_FORMAT, err.Format());
-        return err;
-    }
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR OTAImageProcessorImpl::ReleaseBlock()
-{
-    if (mBlock.data() != nullptr)
-    {
-        chip::Platform::MemoryFree(mBlock.data());
-    }
-
-    mBlock = MutableByteSpan();
-    return CHIP_NO_ERROR;
-}
-
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h
deleted file mode 100644
index 0cf7ea893b6634..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/PlatformManagerImpl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Provides an implementation of the PlatformManager object.
- */
-
-#pragma once
-
-#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the PlatformManager singleton object for the
- * CC13XX_26XX platform.
- */
-class PlatformManagerImpl final : public PlatformManager, public Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>
-{
-    // Allow the PlatformManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend PlatformManager;
-
-    // Allow the generic implementation base class to call helper methods on
-    // this class.
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-    friend Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>;
-#endif
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-    System::Clock::Timestamp GetStartTime() { return mStartTime; }
-
-private:
-    // ===== Methods that implement the PlatformManager abstract interface.
-
-    CHIP_ERROR _InitChipStack(void);
-    void _Shutdown(void);
-
-    // ===== Members for internal use by the following friends.
-
-    friend PlatformManager & PlatformMgr(void);
-    friend PlatformManagerImpl & PlatformMgrImpl(void);
-    friend class Internal::BLEManagerImpl;
-
-    System::Clock::Timestamp mStartTime = System::Clock::kZero;
-
-    static PlatformManagerImpl sInstance;
-
-    using Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::PostEventFromISR;
-};
-
-/**
- * Returns the public interface of the PlatformManager singleton object.
- *
- * chip applications should use this to access features of the PlatformManager
- * object that are common to all platforms.
- */
-inline PlatformManager & PlatformMgr(void)
-{
-    return PlatformManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the PlatformManager
- * singleton object.
- *
- * chip applications can use this to gain access to features of the
- * PlatformManager that are specific to the SoC.
- */
-inline PlatformManagerImpl & PlatformMgrImpl(void)
-{
-    return PlatformManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h b/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h
deleted file mode 100644
index 7c3eb4d4d958a4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/SystemPlatformConfig.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the CHIP System
- *          Layer
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-
-namespace chip {
-namespace DeviceLayer {
-struct ChipDeviceEvent;
-} // namespace DeviceLayer
-} // namespace chip
-
-// ==================== Platform Adaptations ====================
-#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
-#define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
-
-// ========== Platform-specific Configuration Overrides =========
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h b/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h
deleted file mode 100644
index ff5b5cc34a89e4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ThreadStackManagerImpl.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- *    @file
- *          Provides an implementation of the ThreadStackManager object
- *          for the Texas Instruments CC13XX_26XX platform.
- *
- * NOTE: currently a bare-bones implementation to allow for building.
- */
-
-#pragma once
-
-#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
-
-#include <openthread/tasklet.h>
-#include <openthread/thread.h>
-
-#include <queue.h>
-
-extern "C" void platformAlarmSignal();
-extern "C" void platformAlarmMicroSignal();
-extern "C" void platformRadioSignal(uintptr_t arg);
-extern "C" void platformUartSignal(uintptr_t arg);
-
-namespace chip {
-namespace DeviceLayer {
-
-class ThreadStackManager;
-class ThreadStackManagerImpl;
-
-/**
- * Concrete implementation of the ThreadStackManager singleton object for CC13XX_26XX.
- */
-class ThreadStackManagerImpl final : public ThreadStackManager,
-                                     public Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>,
-                                     public Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>
-{
-    // Allow the ThreadStackManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class ThreadStackManager;
-
-    // Allow the generic implementation base classes to call helper methods on
-    // this class.
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-    friend Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>;
-    friend Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>;
-    friend Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>;
-#endif
-
-    // Allow glue functions called by OpenThread to call helper methods on this
-    // class.
-    friend void ::platformAlarmSignal();
-    friend void ::platformAlarmMicroSignal();
-    friend void ::platformRadioSignal(uintptr_t arg);
-    friend void ::platformUartSignal(uintptr_t arg);
-    friend void ::otTaskletsSignalPending(otInstance * otInst);
-
-    enum procQueueCmd
-    {
-        procQueueCmd_alarm,
-        procQueueCmd_radio,
-        procQueueCmd_tasklets,
-        procQueueCmd_uart,
-        procQueueCmd_alarmu,
-    };
-
-    struct procQueueMsg
-    {
-        enum procQueueCmd cmd;
-        uintptr_t arg;
-    };
-
-public:
-    // ===== Platform-specific members that may be accessed directly by the application.
-
-    using ThreadStackManager::InitThreadStack;
-    CHIP_ERROR InitThreadStack(otInstance * otInst);
-    void _SendProcMessage(procQueueMsg & procMsg);
-    void _ProcMessage(otInstance * aInstance);
-    void GetExtAddress(otExtAddress & aExtAddr);
-    CHIP_ERROR GetBufferInfo(void);
-
-private:
-    // ===== Methods that implement the ThreadStackManager abstract interface.
-
-    CHIP_ERROR _InitThreadStack(void);
-
-    // ===== Members for internal use by the following friends.
-
-    friend ThreadStackManager & ::chip::DeviceLayer::ThreadStackMgr(void);
-    friend ThreadStackManagerImpl & ::chip::DeviceLayer::ThreadStackMgrImpl(void);
-
-    static ThreadStackManagerImpl sInstance;
-
-    static bool IsInitialized();
-
-    // ===== Private members for use by this class only.
-
-    ThreadStackManagerImpl() = default;
-    QueueHandle_t procQueue;
-    QueueHandle_t procQueue_radio;
-};
-
-/**
- * Returns the public interface of the ThreadStackManager singleton object.
- *
- * chip applications should use this to access features of the ThreadStackManager object
- * that are common to all platforms.
- */
-inline ThreadStackManager & ThreadStackMgr(void)
-{
-    return ThreadStackManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the ThreadStackManager singleton object.
- *
- * chip applications can use this to gain access to features of the ThreadStackManager
- * that are specific to SoC.
- */
-inline ThreadStackManagerImpl & ThreadStackMgrImpl(void)
-{
-    return ThreadStackManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni b/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni
deleted file mode 100644
index 4ff86939ff74a0..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/args.gni
+++ /dev/null
@@ -1,37 +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.
-
-import("//build_overrides/chip.gni")
-import("//build_overrides/ti_simplelink_sdk.gni")
-
-# ARM architecture flags will be set based on Device Family
-arm_platform_config =
-    "${ti_simplelink_sdk_build_root}/ti_simplelink_arm_platform_config.gni"
-
-chip_device_platform = "cc13x2_26x2"
-
-mbedtls_target = "${chip_root}/third_party/ti_simplelink_sdk:mbedtls"
-openthread_external_mbedtls = mbedtls_target
-openthread_external_platform =
-    "${ti_simplelink_sdk_build_root}:ti_simplelink_sdk"
-
-lwip_platform = "cc13xx_26xx"
-
-chip_inet_config_enable_ipv4 = false
-
-chip_build_tests = false
-
-openthread_project_core_config_file = "openthread-core-cc13x2_26x2-config.h"
-openthread_core_config_platform_check_file =
-    "openthread-core-cc13x2_26x2-config-check.h"
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c b/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c
deleted file mode 100644
index d69f903ac592b5..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- * @file
- *  This file contains user configurable variables for the BLE Application.
- *
- */
-
-/*******************************************************************************
- * INCLUDES
- */
-
-#include "ble_user_config.h"
-#include "hal_types.h"
-#ifndef FREERTOS
-#include <ti/sysbios/BIOS.h>
-#endif
-#ifdef SYSCFG
-#include "ti_ble_config.h"
-#else
-#include <gapbondmgr.h>
-#endif
-
-#if defined(AOA_SYSCFG)
-#include "ti_aoa_config.h"
-#endif
-
-#include "ble_overrides.h"
-#include "ti_radio_config.h"
-
-#include <dmm/dmm_rfmap.h>
-
-#include "ecc/ECCROMCC26XX.h"
-
-#include <ti/drivers/AESCCM.h>
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/aesccm/AESCCMCC26XX.h>
-#include <ti/drivers/aesecb/AESECBCC26XX.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-
-#ifdef FREERTOS
-#define Swi_restore SwiP_restore
-#define Swi_disable SwiP_disable
-#include <ti/drivers/dpl/SwiP.h>
-#else
-#include <ti/sysbios/knl/Swi.h>
-#endif
-#include <ti/drivers/TRNG.h>
-#include <ti/drivers/utils/Random.h>
-
-#if !defined(DeviceFamily_CC26X1)
-#include <driverlib/pka.h>
-#include <driverlib/rf_bt5_coex.h>
-#else
-#include <driverlib/rom_ecc.h>
-#endif
-
-/*******************************************************************************
- * MACROS
- */
-
-/*******************************************************************************
- * CONSTANTS
- */
-
-// Tx Power
-#define NUM_TX_POWER_VALUES (RF_BLE_TX_POWER_TABLE_SIZE - 1)
-
-#ifndef SYSCFG
-// Default Tx Power Index
-#if defined(CC13X2P)
-#define DEFAULT_TX_POWER HCI_EXT_TX_POWER_0_DBM
-#else // !CC13X2
-#define DEFAULT_TX_POWER HCI_EXT_TX_POWER_0_DBM
-#endif // CC13X2
-#endif // SYSCFG
-
-// Override NOP
-#define OVERRIDE_NOP 0xC0000001
-
-/*******************************************************************************
- * TYPEDEFS
- */
-
-/*******************************************************************************
- * LOCAL VARIABLES
- */
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
-
-void driverTable_fnSpinlock(void);
-
-/*******************************************************************************
- * GLOBAL VARIABLES
- */
-
-// Tx Power Table
-txPwrTbl_t appTxPwrTbl = { (txPwrVal_t *) RF_BLE_txPowerTable,
-                           NUM_TX_POWER_VALUES, // max
-                           DEFAULT_TX_POWER };  // default
-
-#if defined(CC13X2P) && defined(CC13X2P_2_LAUNCHXL)
-
-// Tx Power Backoff Values (txPwrBackoff1MPhy,txPwrBackoff2MPhy ,txPwrBackoffCoded)
-const txPwrBackoffVal_t TxPowerBackoffTable[] = {
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 0
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 1
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 2
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 3
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 4
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 5
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 6
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 7
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 8
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 9
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 10
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 11
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 12
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 13
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 14
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 15
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 16
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 17
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 18
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 19
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 20
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 21
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 22
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 23
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 24
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 25
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 26
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 27
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 28
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 29
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 30
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 31
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 32
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 33
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_17_DBM_P4_9_DBM, HCI_EXT_TX_POWER_P2_20_DBM },  // max tx power for channel 34
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_18_DBM_P4_10_DBM, HCI_EXT_TX_POWER_P2_20_DBM }, // max tx power for channel 35
-    { HCI_EXT_TX_POWER_P2_19_DBM, HCI_EXT_TX_POWER_P2_18_DBM_P4_10_DBM, HCI_EXT_TX_POWER_P2_20_DBM }, // max tx power for channel 36
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 37
-    { HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM },           // max tx power for channel 38
-    { HCI_EXT_TX_POWER_P2_14_DBM_P4_6_DBM, HCI_EXT_TX_POWER_P2_20_DBM, HCI_EXT_TX_POWER_P2_20_DBM }
-}; // max tx power for channel 39
-
-txPwrBackoffTbl_t appTxPwrBackoffTbl = { TxPowerBackoffTable };
-
-#endif // defined(CC13X2P) && defined(CC13X2P_2_LAUNCHXL)
-
-#if !defined(AOA_SYSCFG)
-// Antenna board configurations (example for a 12-antenna board)
-// Maximum number of antennas
-#define ANTENNA_TABLE_SIZE 12
-// BitMask of all the relevant GPIOs which needed for the antennas
-#define ANTENNA_IO_MASK BV(27) | BV(28) | BV(29) | BV(30)
-
-// Antenna GPIO configuration (should be adapted to the antenna board design)
-antennaIOEntry_t antennaTbl[ANTENNA_TABLE_SIZE] = {
-    0,                        // antenna 0 GPIO configuration (all GPIOs in ANTENNA_IO_MASK are LOW)
-    BV(28),                   // antenna 1
-    BV(29),                   // antenna 2
-    BV(28) | BV(29),          // antenna 3
-    BV(30),                   // antenna 4
-    BV(28) | BV(30),          // antenna 5
-    BV(27),                   // antenna 6
-    BV(27) | BV(28),          // antenna 7
-    BV(27) | BV(29),          // antenna 8
-    BV(27) | BV(28) | BV(29), // antenna 9
-    BV(27) | BV(30),          // antenna 10
-    BV(27) | BV(28) | BV(30)  // antenna 11
-};
-
-#endif //! defined(AOA_SYSCFG)
-
-// Antenna properties passes to the stack
-cteAntProp_t appCTEAntProp = { ANTENNA_IO_MASK, ANTENNA_TABLE_SIZE, antennaTbl };
-
-#if !defined(DeviceFamily_CC26X1)
-ECCParams_CurveParams eccParams_NISTP256 = { .curveType  = ECCParams_CURVE_TYPE_SHORT_WEIERSTRASS_AN3,
-                                             .length     = NISTP256_PARAM_SIZE_BYTES,
-                                             .prime      = NISTP256_prime.byte,
-                                             .order      = NISTP256_order.byte,
-                                             .a          = NISTP256_a.byte,
-                                             .b          = NISTP256_b.byte,
-                                             .generatorX = NISTP256_generator.x.byte,
-                                             .generatorY = NISTP256_generator.y.byte,
-                                             .cofactor   = 1 };
-#else
-ECCParams_CurveParams eccParams_NISTP256 = { .curveType  = ECCParams_CURVE_TYPE_SHORT_WEIERSTRASS_AN3,
-                                             .length     = ECC_NISTP256_PARAM_LENGTH_BYTES,
-                                             .prime      = ECC_NISTP256_prime.byte,
-                                             .order      = ECC_NISTP256_order.byte,
-                                             .a          = ECC_NISTP256_a.byte,
-                                             .b          = ECC_NISTP256_b.byte,
-                                             .generatorX = ECC_NISTP256_generatorX.byte,
-                                             .generatorY = ECC_NISTP256_generatorY.byte,
-                                             .cofactor   = 1 };
-#endif
-
-#if defined(USE_COEX)
-// 2 structures generated by the sysconfig RF for coexistence configuration
-extern rfCoreHal_bleCoExConfig_t coexConfig;
-extern RF_CoexOverride_BLEUseCases coexConfigBle;
-// from coexConfig struct we will get the coex enable and coex type (3 or 1 wire)
-// from coexConfigBle struct we will get the priority and rx request per use case:
-// initiator, connected, Broadcaster and Observer.
-coexUseCaseConfig_t coexSysConfig = { &coexConfig, &coexConfigBle };
-#endif
-
-#ifdef ICALL_JT
-#include <icall.h>
-
-// RF Driver API Table
-rfDrvTblPtr_t rfDriverTableBLE[] = {
-    (uint32) RF_open,
-    (uint32) driverTable_fnSpinlock, // RF_close
-#ifdef RF_SINGLEMODE
-    (uint32) RF_postCmd,
-#else                                // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_postCmd
-#endif                               // RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_pendCmd
-#ifdef RF_SINGLEMODE
-    (uint32) RF_runCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_runCmd
-#endif // RF_SINGLEMODE
-    (uint32) RF_cancelCmd,
-    (uint32) RF_flushCmd,
-    (uint32) driverTable_fnSpinlock, // RF_yield
-    (uint32) RF_Params_init,
-    (uint32) RF_runImmediateCmd,
-    (uint32) RF_runDirectCmd,
-    (uint32) RF_ratCompare,
-    (uint32) driverTable_fnSpinlock, // RF_ratCapture
-    (uint32) RF_ratDisableChannel,
-    (uint32) RF_getCurrentTime,
-    (uint32) RF_getRssi,
-    (uint32) RF_getInfo,
-    (uint32) RF_getCmdOp,
-    (uint32) RF_control,
-    (uint32) driverTable_fnSpinlock, // RF_getTxPower
-    (uint32) RF_setTxPower,          // RF_setTxPower
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findPowerLevel
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findValue
-#ifndef RF_SINGLEMODE
-    (uint32) RF_scheduleCmd,
-    (uint32) RF_runScheduleCmd,
-    (uint32) driverTable_fnSpinlock, // RF_requestAccess
-#endif                               // !RF_SINGLEMODE
-};
-
-cryptoDrvTblPtr_t cryptoDriverTableBLE[] = { (uint32) AESCCM_init,
-                                             (uint32) AESCCM_open,
-                                             (uint32) AESCCM_close,
-                                             (uint32) AESCCM_Params_init,
-                                             (uint32) AESCCM_Operation_init,
-                                             (uint32) AESCCM_oneStepEncrypt,
-                                             (uint32) AESCCM_oneStepDecrypt,
-                                             (uint32) AESECB_init,
-                                             (uint32) AESECB_open,
-                                             (uint32) AESECB_close,
-                                             (uint32) AESECB_Params_init,
-                                             (uint32) AESECB_Operation_init,
-                                             (uint32) AESECB_oneStepEncrypt,
-                                             (uint32) AESECB_oneStepDecrypt,
-                                             (uint32) CryptoKeyPlaintext_initKey,
-                                             (uint32) CryptoKeyPlaintext_initBlankKey };
-
-// Swi APIs needed by BLE controller
-rtosApiTblPtr_t rtosApiTable[] = { (uint32_t) Swi_disable, (uint32_t) Swi_restore };
-
-// BLE Stack Configuration Structure
-const stackSpecific_t bleStackConfig = { .maxNumConns                          = MAX_NUM_BLE_CONNS,
-                                         .maxNumPDUs                           = MAX_NUM_PDU,
-                                         .maxPduSize                           = 0,
-                                         .maxNumPSM                            = L2CAP_NUM_PSM,
-                                         .maxNumCoChannels                     = L2CAP_NUM_CO_CHANNELS,
-                                         .maxWhiteListElems                    = MAX_NUM_WL_ENTRIES,
-                                         .maxResolvListElems                   = CFG_MAX_NUM_RL_ENTRIES,
-                                         .pfnBMAlloc                           = &pfnBMAlloc,
-                                         .pfnBMFree                            = &pfnBMFree,
-                                         .rfDriverParams.powerUpDurationMargin = RF_POWER_UP_DURATION_MARGIN,
-                                         .rfDriverParams.inactivityTimeout     = RF_INACTIVITY_TIMEOUT,
-                                         .rfDriverParams.powerUpDuration       = RF_POWER_UP_DURATION,
-                                         .rfDriverParams.pErrCb                = &(RF_ERR_CB),
-                                         .eccParams                            = &eccParams_NISTP256,
-                                         .fastStateUpdateCb                    = NULL,
-                                         .bleStackType                         = 0,
-#ifdef CC2652RB_LAUNCHXL
-                                         .extStackSettings = EXTENDED_STACK_SETTINGS | CC2652RB_OVERRIDE_USED,
-#else
-                                         .extStackSettings = EXTENDED_STACK_SETTINGS,
-#endif
-                                         .maxNumCteBuffers = MAX_NUM_CTE_BUFS };
-
-uint16_t bleUserCfg_maxPduSize = MAX_PDU_SIZE;
-
-#ifdef OSAL_SNV_EXTFLASH
-const extflashDrvTblPtr_t extflashDriverTable[] = { (uint32) ExtFlash_open, (uint32) ExtFlash_close, (uint32) ExtFlash_read,
-                                                    (uint32) ExtFlash_write, (uint32) ExtFlash_erase };
-#endif // OSAL_SNV_EXTFLASH
-
-// Table for Driver can be found in icall_user_config.c
-// if a driver is not to be used, then the pointer shoul dbe set to NULL,
-// for this example, this is done in ble_user_config.h
-const drvTblPtr_t driverTable = {
-    .rfDrvTbl        = rfDriverTableBLE,
-    .eccDrvTbl       = eccDriverTable,
-    .cryptoDrvTbl    = cryptoDriverTableBLE,
-    .trngDrvTbl      = trngDriverTable,
-    .rtosApiTbl      = rtosApiTable,
-    .nvintfStructPtr = &nvintfFncStruct,
-#ifdef OSAL_SNV_EXTFLASH
-    .extflashDrvTbl = extflashDriverTable,
-#endif // OSAL_SNV_EXTFLASH
-};
-
-const boardConfig_t boardConfig = {
-    .rfFeModeBias = RF_FE_MODE_AND_BIAS,
-    .rfRegTbl     = (regOverride_t *) pOverrides_bleCommon,
-    .rfRegTbl1M   = (regOverride_t *) pOverrides_ble1Mbps,
-#if defined(BLE_V50_FEATURES) && (BLE_V50_FEATURES & (PHY_2MBPS_CFG | PHY_LR_CFG))
-    // Currently, no overrides for 2M and Coded, so exclude from build.
-    .rfRegTbl2M    = (regOverride_t *) pOverrides_ble2Mbps,
-    .rfRegTblCoded = (regOverride_t *) pOverrides_bleCoded,
-#endif // PHY_2MBPS_CFG | PHY_LR_CFG
-    .txPwrTbl = &appTxPwrTbl,
-#if defined(CC13X2P)
-#if defined(CC13X2P_2_LAUNCHXL)
-    .txPwrBackoffTbl = &appTxPwrBackoffTbl,
-#else
-    .txPwrBackoffTbl = NULL,
-#endif                                                                 // defined(CC13X2P_2_LAUNCHXL)
-    .rfRegOverrideTxStdTblptr = (regOverride_t *) pOverrides_bleTxStd, // Default PA
-    .rfRegOverrideTx20TblPtr  = (regOverride_t *) pOverrides_bleTx20,  // High power PA
-#endif                                                                 // CC13X2P
-#if defined(RTLS_CTE)
-    .rfRegOverrideCtePtr = (regOverride_t *) (pOverrides_bleCommon + BLE_STACK_OVERRIDES_OFFSET + CTE_OVERRIDES_OFFSET),
-    .cteAntennaPropPtr   = &appCTEAntProp,
-#else
-    .rfRegOverrideCtePtr                                   = NULL,
-    .cteAntennaPropPtr                                     = NULL,
-#endif
-    .privOverrideOffset = BLE_STACK_OVERRIDES_OFFSET + PRIVACY_OVERRIDE_OFFSET,
-#if defined(USE_COEX)
-    .coexUseCaseConfigPtr = &coexSysConfig,
-#else
-    .coexUseCaseConfigPtr                                  = NULL,
-#endif
-};
-
-#else /* !(ICALL_JT) */
-
-// RF Driver API Table
-rfDrvTblPtr_t rfDriverTable[] = {
-    (uint32) RF_open,
-    (uint32) driverTable_fnSpinlock, // RF_close
-#ifdef RF_SINGLEMODE
-    (uint32) RF_postCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_postCmd
-#endif // RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_pendCmd
-#ifdef RF_SINGLEMODE
-    (uint32) RF_runCmd,
-#else  // !RF_SINGLEMODE
-    (uint32) driverTable_fnSpinlock, // RF_runCmd
-#endif // RF_SINGLEMODE
-    (uint32) RF_cancelCmd,
-    (uint32) RF_flushCmd,
-    (uint32) driverTable_fnSpinlock, // RF_yield
-    (uint32) RF_Params_init,
-    (uint32) RF_runImmediateCmd,
-    (uint32) RF_runDirectCmd,
-    (uint32) RF_ratCompare(uint32) driverTable_fnSpinlock, // RF_ratCapture
-    (uint32) driverTable_fnSpinlock,                       // RF_ratDisableChannel
-    (uint32) RF_getCurrentTime,
-    (uint32) RF_getRssi,
-    (uint32) RF_getInfo,
-    (uint32) RF_getCmdOp,
-    (uint32) RF_control,
-    (uint32) driverTable_fnSpinlock, // RF_getTxPower
-    (uint32) RF_setTxPower,          // RF_setTxPower
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findPowerLevel
-    (uint32) driverTable_fnSpinlock, // RF_TxPowerTable_findValue
-#ifndef RF_SINGLEMODE
-    (uint32) RF_scheduleCmd,
-    (uint32) RF_runScheduleCmd,
-    (uint32) driverTable_fnSpinlock // RF_requestAccess
-#endif // !RF_SINGLEMODE
-};
-
-// ECC Driver API Table
-eccDrvTblPtr_t eccDriverTable[] = { (uint32) ECDH_init,
-                                    (uint32) ECDH_Params_init,
-                                    (uint32) ECDH_open,
-                                    (uint32) ECDH_close,
-                                    (uint32) ECDH_OperationGeneratePublicKey_init,
-                                    (uint32) ECDH_OperationComputeSharedSecret_init,
-                                    (uint32) ECDH_generatePublicKey,
-                                    (uint32) ECDH_computeSharedSecret };
-
-// Crypto Driver API Table
-cryptoDrvTblPtr_t cryptoDriverTable[] = { (uint32) AESCCM_init,
-                                          (uint32) AESCCM_open,
-                                          (uint32) AESCCM_close,
-                                          (uint32) AESCCM_Params_init,
-                                          (uint32) AESCCM_Operation_init,
-                                          (uint32) AESCCM_oneStepEncrypt,
-                                          (uint32) AESCCM_oneStepDecrypt,
-                                          (uint32) AESECB_init,
-                                          (uint32) AESECB_open,
-                                          (uint32) AESECB_close,
-                                          (uint32) AESECB_Params_init,
-                                          (uint32) AESECB_Operation_init,
-                                          (uint32) AESECB_oneStepEncrypt,
-                                          (uint32) AESECB_oneStepDecrypt,
-                                          (uint32) CryptoKeyPlaintext_initKey,
-                                          (uint32) CryptoKeyPlaintext_initBlankKey };
-
-trngDrvTblPtr_t trngDriverTable[] = { (uint32) TRNG_init, (uint32) TRNG_open, (uint32) TRNG_generateEntropy, (uint32) TRNG_close };
-
-#endif /* ICALL_JT */
-
-/*******************************************************************************
- * @fn          RegisterAssertCback
- *
- * @brief       This routine registers the Application's assert handler.
- *
- * input parameters
- *
- * @param       appAssertHandler - Application's assert handler.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void RegisterAssertCback(assertCback_t appAssertHandler)
-{
-    appAssertCback = appAssertHandler;
-
-#ifdef EXT_HAL_ASSERT
-    // also set the Assert callback pointer used by halAssertHandlerExt
-    // Note: Normally, this pointer will be intialized by the stack, but in the
-    //       event HAL_ASSERT is used by the Application, we initialize it
-    //       directly here.
-    halAssertCback = appAssertHandler;
-#endif // EXT_HAL_ASSERT
-
-    return;
-}
-
-/*******************************************************************************
- * @fn          driverTable_fnSpinLock
- *
- * @brief       This routine is used to trap calls to unpopulated indexes of
- *              driver function pointer tables.
- *
- * input parameters
- *
- * @param       None.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void driverTable_fnSpinlock(void)
-{
-    volatile uint8 i = 1;
-
-    while (i)
-        ;
-}
-
-/*******************************************************************************
- * @fn          DefaultAssertCback
- *
- * @brief       This is the Application default assert callback, in the event
- *              none is registered.
- *
- * input parameters
- *
- * @param       assertCause    - Assert cause as defined in hal_assert.h.
- * @param       assertSubcause - Optional assert subcause (see hal_assert.h).
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void DefaultAssertCback(uint8 assertCause, uint8 assertSubcause1)
-{
-#ifdef HAL_ASSERT_SPIN
-    driverTable_fnSpinlock();
-#endif // HAL_ASSERT_SPIN
-
-    return;
-}
-
-// Application Assert Callback Function Pointer
-assertCback_t appAssertCback = DefaultAssertCback;
-
-/*******************************************************************************
- */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds
deleted file mode 100644
index e17410132e949f..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last page removed for BIM, CCFG is supplied by that project */
-     FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 
-    FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058
-    /*FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ae000 */
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* interrupt vectors shifted to accomodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x00);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xAA000) (NOLOAD) : AT (0xAA000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds
deleted file mode 100644
index 7424c4c92c7f4c..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last page removed for BIM, CCFG is supplied by that project */
-    /* FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 */
-    /* FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058 */
-    FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ae000
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* BIM header placed at the base of flash by default */
-    PROVIDE (_img_header_base_address =
-        DEFINED(_img_header_base_address) ? _img_header_base_address : 0x0);
- 
-    .oad_image_header (_img_header_base_address) : AT (_img_header_base_address) {
-        KEEP (*(.oad_image_header))
-    } > REGION_TEXT
-
-    /* interrupt vectors shifted to accomodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x100);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xAA000) (NOLOAD) : AT (0xAA000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    /* CCFG is supplied by the BIM project */
-    /*
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-    */
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds b/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds
deleted file mode 100644
index 3f0905e0a3135a..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/**
- * @file
- * Linkerscript for Matter executable with space reserved for the TI BIM.
- */
-
-STACKSIZE = 0x800;
-RESERVED_RAM_SIZE_BLE_ROM = 0x00000FDF;
-
-
-MEMORY
-{
-    /* last two pages removed for BIM, Flash Bootloader, and Factory Data. CCFG is supplied by the BIM project */
-    /* FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000affa8 */
-    /* FLASH_CCFG (RX) : ORIGIN = 0x000affa8, LENGTH = 0x00000058 */
-    FLASH (RX)      : ORIGIN = 0x00000000, LENGTH = 0x000ac000
-    FLASH_FACTORY_DATA (R)  : ORIGIN = 0x000ac000, LENGTH = 0x00000900
-    /* BLE ROM reserves RAM at the beginning of the ram image, size RESERVED_RAM_SIZE_BLE_ROM */
-    /* SRAM (RWX)      : ORIGIN = 0x20000000, LENGTH = 0x00024000 */
-    SRAM (RWX)      : ORIGIN = 0x20000FDF, LENGTH = 0x00023021
-    GPRAM (RWX)     : ORIGIN = 0x11000000, LENGTH = 0x00002000
-    /* Explicitly placed off target for the storage of logging data.
-     * The data placed here is NOT loaded onto the target device.
-     * This is part of 1 GB of external memory from 0x60000000 - 0x9FFFFFFF.
-     * ARM memory map can be found here:
-     * https://developer.arm.com/documentation/ddi0337/e/memory-map/about-the-memory-map
-     */
-    LOG_DATA (R) : ORIGIN = 0x90000000, LENGTH = 0x40000
-}
-
-REGION_ALIAS("REGION_TEXT", FLASH);
-REGION_ALIAS("REGION_FACTORY_DATA", FLASH_FACTORY_DATA); 
-REGION_ALIAS("REGION_BSS", SRAM);
-REGION_ALIAS("REGION_DATA", SRAM);
-REGION_ALIAS("REGION_STACK", SRAM);
-REGION_ALIAS("REGION_HEAP", SRAM);
-REGION_ALIAS("REGION_LOG", LOG_DATA);
-REGION_ALIAS("REGION_ARM_EXIDX", FLASH);
-REGION_ALIAS("REGION_ARM_EXTAB", FLASH);
-
-SECTIONS {
-    /* BIM header placed at the base of flash by default */
-    PROVIDE (_img_header_base_address =
-        DEFINED(_img_header_base_address) ? _img_header_base_address : 0x0);
- 
-    .oad_image_header (_img_header_base_address) : AT (_img_header_base_address) {
-        KEEP (*(.oad_image_header))
-    } > REGION_TEXT
-
-    /* interrupt vectors shifted to accommodate BIM header */
-    PROVIDE (_intvecs_base_address =
-        DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x100);
-
-    .resetVecs (_intvecs_base_address) : AT (_intvecs_base_address) {
-        KEEP (*(.resetVecs))
-    } > REGION_TEXT
-
-    PROVIDE (_vtable_base_address =
-        DEFINED(_vtable_base_address) ? _vtable_base_address : 0x20000000 + RESERVED_RAM_SIZE_BLE_ROM);
-
-    .ramVecs (_vtable_base_address) (NOLOAD) : {
-        KEEP (*(.ramVecs))
-    } > REGION_DATA
-
-    /* Define base address for the DAC arrays and struct */
-    PROVIDE (_factory_data_base_address =
-        DEFINED(_factory_data_base_address) ? _factory_data_base_address : 0xAC000);
-
-    .factory_data(_factory_data_base_address) : AT (_factory_data_base_address) {
-        KEEP (*(.factory_data_struct))
-    } > REGION_FACTORY_DATA 
-
-    /*
-     * UDMACC26XX_CONFIG_BASE below must match UDMACC26XX_CONFIG_BASE defined
-     * by ti/drivers/dma/UDMACC26XX.h
-     * The user is allowed to change UDMACC26XX_CONFIG_BASE to move it away from
-     * the default address 0x2000_1800, but remember it must be 1024 bytes aligned.
-     */
-    UDMACC26XX_CONFIG_BASE = 0x20001800;
-
-    /*
-     * Define absolute addresses for the DMA channels.
-     * DMA channels must always be allocated at a fixed offset from the DMA base address.
-     * --------- DO NOT MODIFY -----------
-     */
-    DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x10);
-    DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x20);
-    DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x30);
-    DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x40);
-    DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x50);
-    DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x60);
-    DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x70);
-    DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x90);
-    DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x100);
-    DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS   = (UDMACC26XX_CONFIG_BASE + 0x110);
-
-    DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x210);
-    DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x220);
-    DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x230);
-    DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x240);
-    DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x250);
-    DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS = (UDMACC26XX_CONFIG_BASE + 0x260);
-    DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS      = (UDMACC26XX_CONFIG_BASE + 0x270);
-    DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS    = (UDMACC26XX_CONFIG_BASE + 0x290);
-    DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x300);
-    DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS  = (UDMACC26XX_CONFIG_BASE + 0x310);
-
-    /*
-     * Allocate UART0, UART1, SPI0, SPI1, ADC, and GPTimer0 DMA descriptors at absolute addresses.
-     * --------- DO NOT MODIFY -----------
-     */
-    UDMACC26XX_uart0RxControlTableEntry_is_placed = 0;
-    .dmaUart0RxControlTableEntry DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxControlTableEntry_is_placed = 0;
-    .dmaUart0TxControlTableEntry DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxControlTableEntry_is_placed = 0;
-    .dmaSpi0RxControlTableEntry DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxControlTableEntry_is_placed = 0;
-    .dmaSpi0TxControlTableEntry DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxControlTableEntry_is_placed = 0;
-    .dmaUart1RxControlTableEntry DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxControlTableEntry_is_placed = 0;
-    .dmaUart1TxControlTableEntry DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCPriControlTableEntry_is_placed = 0;
-    .dmaADCPriControlTableEntry DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCPriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0APriControlTableEntry_is_placed = 0;
-    .dmaGPT0APriControlTableEntry DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_PRI_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0APriControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxControlTableEntry_is_placed = 0;
-    .dmaSpi1RxControlTableEntry DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxControlTableEntry_is_placed = 0;
-    .dmaSpi1TxControlTableEntry DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0RxAltControlTableEntry_is_placed = 0;
-    .dmaUart0RxAltControlTableEntry DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart0TxAltControlTableEntry_is_placed = 0;
-    .dmaUart0TxAltControlTableEntry DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0RxAltControlTableEntry DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi0TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi0TxAltControlTableEntry DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI0_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi0TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1RxAltControlTableEntry_is_placed = 0;
-    .dmaUart1RxAltControlTableEntry DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_uart1TxAltControlTableEntry_is_placed = 0;
-    .dmaUart1TxAltControlTableEntry DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_UART1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaUart1TxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaADCAltControlTableEntry_is_placed = 0;
-    .dmaADCAltControlTableEntry DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_ADC_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaADCAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaGPT0AAltControlTableEntry_is_placed = 0;
-    .dmaGPT0AAltControlTableEntry DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_GPT0A_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaGPT0AAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1RxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1RxAltControlTableEntry DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_RX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1RxAltControlTableEntry)} > REGION_DATA
-
-    UDMACC26XX_dmaSpi1TxAltControlTableEntry_is_placed = 0;
-    .dmaSpi1TxAltControlTableEntry DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS (NOLOAD) : AT (DMA_SPI1_TX_ALT_CONTROL_TABLE_ENTRY_ADDRESS) {*(.dmaSpi1TxAltControlTableEntry)} > REGION_DATA
-
-
-
-    /* if a ROM-only symbol is present, then ROM is being used.
-     * Reserve memory for surgically placed config constants.
-     */
-    _rom_rodata_start = 0x2000;
-    _rom_rodata_size = DEFINED(ROM_RODATA_SIZE) ? 0 : DEFINED(ROM_RODATA_SIZE_NO_OAD) ? 0x330 : 0;
-
-    .rom_rodata_reserve (_rom_rodata_start): {
-        . += _rom_rodata_size;
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .text : {
-        CREATE_OBJECT_SYMBOLS
-        *(.text)
-        *(.text.*)
-        . = ALIGN(0x4);
-        KEEP (*(.ctors))
-        . = ALIGN(0x4);
-        KEEP (*(.dtors))
-        . = ALIGN(0x4);
-        __init_array_start = .;
-        KEEP (*(.init_array*))
-        __init_array_end = .;
-        *(.init)
-        *(.fini*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-
-    .rodata : {
-        *(.rodata)
-        *(.rodata.*)
-        *(.rodata_*)
-    } > REGION_TEXT AT> REGION_TEXT
-
-    .data : ALIGN(4) {
-        __data_load__ = LOADADDR (.data);
-        __data_start__ = .;
-        *(.data)
-        *(.data.*)
-        . = ALIGN (4);
-        __data_end__ = .;
-    } > REGION_DATA AT> REGION_TEXT
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-    } > REGION_ARM_EXIDX AT> REGION_ARM_EXIDX
-
-    .ARM.extab : {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > REGION_ARM_EXTAB AT> REGION_ARM_EXTAB
-
-    /* End of executable code/data, NVS is not part of the OTA image */
-    PROVIDE (_flash_end_address = .);
-
-    .nvs (0xA8000) (NOLOAD) : AT (0xA0000) ALIGN(0x2000) {
-        *(.nvs)
-    } > REGION_TEXT
-
-    /* CCFG is supplied by the BIM project */
-    /*
-    .ccfg : {
-        KEEP (*(.ccfg))
-    } > FLASH_CCFG AT> FLASH_CCFG
-    */
-
-    .bss : {
-        __bss_start__ = .;
-        *(.shbss)
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN (4);
-        __bss_end__ = .;
-    } > REGION_BSS AT> REGION_BSS
-
-    .heap : {
-        __heap_start__ = .;
-        end = __heap_start__;
-        _end = end;
-        __end = end;
-        KEEP(*(.heap))
-        __heap_end__ = .;
-        __HeapLimit = __heap_end__;
-    } > REGION_HEAP AT> REGION_HEAP
-
-    .stack (NOLOAD) : ALIGN(0x8) {
-        _stack = .;
-        __stack = .;
-        KEEP(*(.stack))
-        . += STACKSIZE;
-        _stack_end = .;
-        __stack_end = .;
-    } > REGION_STACK AT> REGION_STACK
-
-    .log_data (COPY) : {
-        KEEP (*(.log_data))
-    } > REGION_LOG
-}
-
-ENTRY(resetISR)
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c
deleted file mode 100644
index 605c8ec8c2db6f..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#include "aes_alt.h"
-#include "mbedtls/aes.h"
-
-#if defined(MBEDTLS_AES_ALT)
-
-#include <string.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-
-/*
- * number of active contexts, used for power on/off of the crypto core
- */
-static unsigned int ref_num = 0;
-
-static AESECB_Handle AESECB_handle = NULL;
-
-void mbedtls_aes_init(mbedtls_aes_context * ctx)
-{
-    AESECB_Params AESECBParams;
-
-    if (ref_num == 0)
-    {
-        AESECB_Params_init(&AESECBParams);
-        AESECBParams.returnBehavior = AESECB_RETURN_BEHAVIOR_POLLING;
-        AESECB_handle               = AESECB_open(CONFIG_AESECB_1, &AESECBParams);
-
-        // handle will be NULL if open failed, subsequent calls will fail with a generic HW error
-    }
-    ref_num++;
-}
-
-void mbedtls_aes_free(mbedtls_aes_context * ctx)
-{
-    if (ref_num > 0)
-    {
-        ref_num--;
-        if (ref_num == 0)
-        {
-            AESECB_close(AESECB_handle);
-
-            AESECB_handle = NULL;
-        }
-    }
-
-    memset((void *) ctx, 0x00, sizeof(ctx));
-}
-
-int mbedtls_aes_setkey_enc(mbedtls_aes_context * ctx, const unsigned char * key, unsigned int keybits)
-{
-    int_fast16_t statusCrypto;
-    size_t keylen = keybits / 8U; // 8 bits in a byte
-
-    if (keylen > sizeof(ctx->keyMaterial))
-    {
-        return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH;
-    }
-
-    /* Initialize AES key */
-    memcpy(ctx->keyMaterial, key, keylen);
-    statusCrypto = CryptoKeyPlaintext_initKey(&ctx->cryptoKey, (uint8_t *) ctx->keyMaterial, keylen);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-
-int mbedtls_aes_setkey_dec(mbedtls_aes_context * ctx, const unsigned char * key, unsigned int keybits)
-{
-    int_fast16_t statusCrypto;
-    size_t keylen = keybits / 8U; // 8 bits in a byte
-
-    if (keylen > sizeof(ctx->keyMaterial))
-    {
-        return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH;
-    }
-
-    /* Initialize AES key */
-    statusCrypto = CryptoKeyPlaintext_initKey(&ctx->cryptoKey, (uint8_t *) key, keylen);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-
-int mbedtls_aes_crypt_ecb(mbedtls_aes_context * ctx, int mode, const unsigned char input[16], unsigned char output[16])
-{
-    int statusCrypto;
-    AESECB_Operation operationOneStepEncrypt;
-
-    /* run it through the authentication + encryption, pass the ccmLVal = 2 */
-    AESECB_Operation_init(&operationOneStepEncrypt);
-
-    operationOneStepEncrypt.key         = &ctx->cryptoKey;
-    operationOneStepEncrypt.inputLength = 16;
-    operationOneStepEncrypt.input       = (uint8_t *) input;
-    operationOneStepEncrypt.output      = (uint8_t *) output;
-
-    statusCrypto = AESECB_oneStepEncrypt(AESECB_handle, &operationOneStepEncrypt);
-
-    if (CryptoKey_STATUS_SUCCESS != statusCrypto)
-    {
-        return MBEDTLS_ERR_AES_HW_ACCEL_FAILED;
-    }
-
-    return 0;
-}
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h
deleted file mode 100644
index dd980f4ed50cbf..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_AES_ALT)
-
-#include <ti/drivers/AESECB.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKey.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-    CryptoKey cryptoKey;      /*!<  structure for the AES driver */
-    uint32_t keyMaterial[16]; /*!<  memory for the key bytes used by cryptoKey */
-} mbedtls_aes_context;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_AES_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h
deleted file mode 100644
index 48ec00ec7b3c02..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/cc13x2_26x2-mbedtls-config.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-/*
- *
- * @file cc13x2_26x2-mbedtls-config.h.h
- *
- * @brief MbedTLS configuration header for CHIP
- *
- */
-
-#ifndef CC13X2_26X2_MBEDTLS_CONFIG_H
-#define CC13X2_26X2_MBEDTLS_CONFIG_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/**
- * Enable FreeRTOS threading support
- */
-// #define MBEDTLS_FREERTOS
-// #define MBEDTLS_THREADING_C
-// #define MBEDTLS_THREADING_ALT
-
-/* Enable Hardware Acceleration */
-
-// #define MBEDTLS_AES_ALT
-// #define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
-// #define MBEDTLS_ECDH_GEN_PUBLIC_ALT
-#define MBEDTLS_ECDSA_SIGN_ALT
-#define MBEDTLS_ECDSA_VERIFY_ALT
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_SHA256_ALT
-
-// Thread Joining disabled
-// #define MBEDTLS_ECJPAKE_ALT
-// #define MBEDTLS_ECJPAKE_C
-// #define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-// #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
-
-/**
- * Enable Crypto and Entropy modules
- */
-
-#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
-
-#define MBEDTLS_AES_C
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CCM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CMAC_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_NIST_OPTIM
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_HAVE_ASM
-#define MBEDTLS_HMAC_DRBG_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PK_WRITE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
-#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
-#define MBEDTLS_SSL_EXPORT_KEYS
-#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_PROTO_DTLS
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_ERROR_STRERROR_DUMMY
-#define MBEDTLS_HKDF_C
-#define MBEDTLS_X509_CREATE_C
-#define MBEDTLS_X509_CSR_WRITE_C
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_PEM_WRITE_C
-
-#define MBEDTLS_SSL_COOKIE_C
-#define MBEDTLS_SSL_SRV_C
-
-#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-
-#define MBEDTLS_BASE64_C
-#define MBEDTLS_ECDH_C
-#define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECDSA_DETERMINISTIC
-#define MBEDTLS_OID_C
-#define MBEDTLS_PEM_PARSE_C
-#define MBEDTLS_X509_USE_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_PKCS5_C
-
-#define MBEDTLS_MPI_WINDOW_SIZE 1       /**< Maximum windows size used. */
-#define MBEDTLS_MPI_MAX_SIZE 32         /**< Maximum number of bytes for usable MPIs. */
-#define MBEDTLS_ECP_MAX_BITS 256        /**< Maximum bit size of groups */
-#define MBEDTLS_ECP_WINDOW_SIZE 2       /**< Maximum window size used */
-#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */
-#define MBEDTLS_ENTROPY_MAX_SOURCES 1   /**< Maximum number of sources supported */
-
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-
-#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */
-
-#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
-
-#include "mbedtls/check_config.h"
-
-#endif // CC13X2_26X2_MBEDTLS_CONFIG_H
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c
deleted file mode 100644
index a3074a9c8a2435..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2021 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined MBEDTLS_ECDH_COMPUTE_SHARED_ALT || defined MBEDTLS_ECDH_GEN_PUBLIC_ALT
-
-#include <stdint.h>
-
-#include <mbedtls/bignum.h>
-#include <mbedtls/ecdsa.h>
-#include <mbedtls/platform.h>
-#include <mbedtls/platform_util.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/ECDH.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/ecdh/ECDHCC26X2.h>
-
-/* Parameter validation macros based on platform_util.h */
-#define ECDH_VALIDATE_RET(cond) MBEDTLS_INTERNAL_VALIDATE_RET(cond, MBEDTLS_ERR_ECP_BAD_INPUT_DATA)
-#define ECDH_VALIDATE(cond) MBEDTLS_INTERNAL_VALIDATE(cond)
-
-#if defined MBEDTLS_ECDH_GEN_PUBLIC_ALT
-/*
- * Generate public key (restartable version)
- */
-static int ecdh_gen_public_restartable(mbedtls_ecp_group * grp, mbedtls_mpi * d, mbedtls_ecp_point * Q,
-                                       int (*f_rng)(void *, unsigned char *, size_t), void * p_rng,
-                                       mbedtls_ecp_restart_ctx * rs_ctx)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    CryptoKey myPublicKey;
-    ECDH_Config config = { 0 };
-    ECDH_Handle handle = NULL;
-    ECDH_OperationGeneratePublicKey operationGeneratePublicKey;
-    ECDHCC26X2_HWAttrs hwAttrs = { 0 };
-    ECDHCC26X2_Object object   = { 0 };
-
-    if (NULL == q_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDH_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-    CryptoKeyPlaintext_initKey(&myPublicKey, q_buf, (plen * 2U) + 1);
-
-    if (0 != f_rng(p_rng, d_buf, plen))
-    {
-        ret = MBEDTLS_ERR_ECP_RANDOM_FAILED;
-        goto cleanup;
-    }
-
-    ECDH_OperationGeneratePublicKey_init(&operationGeneratePublicKey);
-    operationGeneratePublicKey.myPrivateKey = &myPrivateKey;
-    operationGeneratePublicKey.myPublicKey  = &myPublicKey;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationGeneratePublicKey.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationGeneratePublicKey.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationGeneratePublicKey.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDH_STATUS_SUCCESS == ECDH_generatePublicKey(handle, &operationGeneratePublicKey))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
-    }
-
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(d, d_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(&(Q->Y), q_buf + 1 + plen, plen));
-
-cleanup:
-    mbedtls_free(q_buf);
-    mbedtls_free(d_buf);
-
-    if (NULL != handle)
-    {
-        ECDH_close(handle);
-    }
-
-    return (ret);
-}
-
-/*
- * Generate public key
- */
-int mbedtls_ecdh_gen_public(mbedtls_ecp_group * grp, mbedtls_mpi * d, mbedtls_ecp_point * Q,
-                            int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    ECDH_VALIDATE_RET(grp != NULL);
-    ECDH_VALIDATE_RET(d != NULL);
-    ECDH_VALIDATE_RET(Q != NULL);
-    ECDH_VALIDATE_RET(f_rng != NULL);
-    return (ecdh_gen_public_restartable(grp, d, Q, f_rng, p_rng, NULL));
-}
-#endif /* MBEDTLS_ECDH_GEN_PUBLIC_ALT */
-
-#if defined MBEDTLS_ECDH_COMPUTE_SHARED_ALT
-/*
- * Compute shared secret (SEC1 3.3.1)
- */
-static int ecdh_compute_shared_restartable(mbedtls_ecp_group * grp, mbedtls_mpi * z, const mbedtls_ecp_point * Q,
-                                           const mbedtls_mpi * d, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng,
-                                           mbedtls_ecp_restart_ctx * rs_ctx)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    CryptoKey theirPublicKey;
-    CryptoKey sharedSecret;
-    ECDH_Config config = { 0 };
-    ECDH_Handle handle = NULL;
-    ECDH_OperationComputeSharedSecret operationComputeSharedSecret;
-    ECDHCC26X2_HWAttrs hwAttrs = { 0 };
-    ECDHCC26X2_Object object   = { 0 };
-
-    if (NULL == q_buf || NULL == s_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDH_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    CryptoKeyPlaintext_initKey(&sharedSecret, s_buf, (2U * plen) + 1);
-
-    /* The driver consumes network byte order. Copy this number and reverse them again. */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(d, d_buf, plen));
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-
-    /* The driver consumes an octet string in network byte order. Copy this
-     * point and reverse them again. */
-    q_buf[0] = 0x04;
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->Y), q_buf + 1 + plen, plen));
-    CryptoKeyPlaintext_initKey(&theirPublicKey, q_buf, (2U * plen) + 1);
-
-    ECDH_OperationComputeSharedSecret_init(&operationComputeSharedSecret);
-    operationComputeSharedSecret.myPrivateKey   = &myPrivateKey;
-    operationComputeSharedSecret.theirPublicKey = &theirPublicKey;
-    operationComputeSharedSecret.sharedSecret   = &sharedSecret;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationComputeSharedSecret.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationComputeSharedSecret.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationComputeSharedSecret.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDH_STATUS_SUCCESS == ECDH_computeSharedSecret(handle, &operationComputeSharedSecret))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
-    }
-
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(z, s_buf + 1, plen));
-
-cleanup:
-    mbedtls_free(q_buf);
-    mbedtls_free(d_buf);
-    mbedtls_free(s_buf);
-
-    if (NULL != handle)
-    {
-        ECDH_close(handle);
-    }
-
-    return (ret);
-}
-
-/*
- * Compute shared secret (SEC1 3.3.1)
- */
-int mbedtls_ecdh_compute_shared(mbedtls_ecp_group * grp, mbedtls_mpi * z, const mbedtls_ecp_point * Q, const mbedtls_mpi * d,
-                                int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    ECDH_VALIDATE_RET(grp != NULL);
-    ECDH_VALIDATE_RET(Q != NULL);
-    ECDH_VALIDATE_RET(d != NULL);
-    ECDH_VALIDATE_RET(z != NULL);
-    return (ecdh_compute_shared_restartable(grp, z, Q, d, f_rng, p_rng, NULL));
-}
-#endif /* MBEDTLS_ECDH_COMPUTE_SHARED_ALT */
-
-#endif /* MBEDTLS_ECDH_COMPUTE_SHARED_ALT || MBEDTLS_ECDH_GEN_PUBLIC_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c
deleted file mode 100644
index 18bb44fd1364e3..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2021 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined MBEDTLS_ECDSA_VERIFY_ALT || defined MBEDTLS_ECDSA_SIGN_ALT
-
-/* NOTE: The TI drivers consume these points and big numbers in network byte
- *       order. This is in contrast to the mbedtls_mpi structures which story
- *       these numbers and points in little endian byte order. This file uses
- *       the mpi functions to re-write the buffers into network byte order.
- */
-
-#include <stdint.h>
-
-#include <mbedtls/bignum.h>
-#include <mbedtls/ecdsa.h>
-#include <mbedtls/platform.h>
-#include <mbedtls/platform_util.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/ECDSA.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/ecdsa/ECDSACC26X2.h>
-
-#ifdef MBEDTLS_ECDSA_VERIFY_ALT
-
-/*
- * Verify ECDSA signature of hashed message
- */
-int mbedtls_ecdsa_verify(mbedtls_ecp_group * grp, const unsigned char * buf, size_t blen, const mbedtls_ecp_point * Q,
-                         const mbedtls_mpi * r, const mbedtls_mpi * s)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * r_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * q_buf = (uint8_t *) mbedtls_calloc(1, (plen * 2U) + 1);
-    CryptoKey theirPublicKey;
-    ECDSA_Config config = { 0 };
-    ECDSA_Handle handle = NULL;
-    ECDSA_OperationVerify operationVerify;
-    ECDSACC26X2_HWAttrs hwAttrs = { 0 };
-    ECDSACC26X2_Object object   = { 0 };
-
-    if (NULL == r_buf || NULL == s_buf || NULL == q_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority     = (1 << 5);
-    hwAttrs.trngIntPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDSA_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    /* The driver consumes an octet string in network byte order. Copy this
-     * point and reverse them again. */
-    q_buf[0] = 0x04;
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->X), q_buf + 1, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&(Q->Y), q_buf + 1 + plen, plen));
-    CryptoKeyPlaintext_initKey(&theirPublicKey, q_buf, (2U * plen) + 1);
-
-    /* The driver also consumes the r and s in network byte order. Copy these
-     * buffers and them reverse them again */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(r, r_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(s, s_buf, plen));
-
-    /* prepare the operation */
-    ECDSA_OperationVerify_init(&operationVerify);
-    operationVerify.theirPublicKey = &theirPublicKey;
-    operationVerify.hash           = buf;
-    operationVerify.r              = r_buf;
-    operationVerify.s              = s_buf;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationVerify.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationVerify.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationVerify.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationVerify.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationVerify.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationVerify.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationVerify.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationVerify.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDSA_STATUS_SUCCESS == ECDSA_verify(handle, &operationVerify))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
-    }
-
-cleanup:
-    mbedtls_free(r_buf);
-    mbedtls_free(s_buf);
-    mbedtls_free(q_buf);
-
-    if (NULL != handle)
-    {
-        ECDSA_close(handle);
-    }
-
-    return ret;
-}
-
-#endif /* MBEDTLS_ECDSA_VERIFY_ALT */
-
-#ifdef MBEDTLS_ECDSA_SIGN_ALT
-
-/*
- * Compute ECDSA signature of a hashed message
- */
-int mbedtls_ecdsa_sign(mbedtls_ecp_group * grp, mbedtls_mpi * r, mbedtls_mpi * s, const mbedtls_mpi * d, const unsigned char * buf,
-                       size_t blen, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret         = 0;
-    size_t plen     = grp->nbits / 8U;
-    uint8_t * r_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * s_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    uint8_t * d_buf = (uint8_t *) mbedtls_calloc(1, plen);
-    CryptoKey myPrivateKey;
-    ECDSA_Config config = { 0 };
-    ECDSA_Handle handle = NULL;
-    ECDSA_OperationSign operationSign;
-    ECDSACC26X2_HWAttrs hwAttrs = { 0 };
-    ECDSACC26X2_Object object   = { 0 };
-
-    if (NULL == r_buf || NULL == s_buf || NULL == d_buf)
-    {
-        ret = MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
-    hwAttrs.intPriority     = (1 << 5);
-    hwAttrs.trngIntPriority = (1 << 5);
-
-    config.object  = (void *) &object;
-    config.hwAttrs = (void *) &hwAttrs;
-
-    handle = ECDSA_construct(&config, NULL);
-
-    if (NULL == handle)
-    {
-        ret = MBEDTLS_ERR_ECP_HW_ACCEL_FAILED;
-        goto cleanup;
-    }
-
-    /* The driver consumes numbers in network byte order */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(d, d_buf, plen));
-
-    CryptoKeyPlaintext_initKey(&myPrivateKey, d_buf, plen);
-    ECDSA_OperationSign_init(&operationSign);
-    operationSign.myPrivateKey = &myPrivateKey;
-    operationSign.hash         = buf;
-    operationSign.r            = r_buf;
-    operationSign.s            = s_buf;
-
-    /* Load the ROM curve params */
-    switch (grp->id)
-    {
-    case MBEDTLS_ECP_DP_SECP224R1:
-        operationSign.curve = &ECCParams_NISTP224;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP256R1:
-        operationSign.curve = &ECCParams_NISTP256;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP384R1:
-        operationSign.curve = &ECCParams_NISTP384;
-        break;
-
-    case MBEDTLS_ECP_DP_SECP521R1:
-        operationSign.curve = &ECCParams_NISTP521;
-        break;
-
-    case MBEDTLS_ECP_DP_BP256R1:
-        operationSign.curve = &ECCParams_BrainpoolP256R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP384R1:
-        operationSign.curve = &ECCParams_BrainpoolP384R1;
-        break;
-
-    case MBEDTLS_ECP_DP_BP512R1:
-        operationSign.curve = &ECCParams_BrainpoolP512R1;
-        break;
-
-    case MBEDTLS_ECP_DP_CURVE25519:
-        operationSign.curve = &ECCParams_Curve25519;
-        break;
-
-    default:
-        /* Possible extension to load an arbitrary curve */
-        ret = MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;
-        goto cleanup;
-    }
-
-    if (ECDSA_STATUS_SUCCESS == ECDSA_sign(handle, &operationSign))
-    {
-        ret = 0;
-    }
-    else
-    {
-        ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
-    }
-
-    /* The driver produces r and s in network byte order. copy into mbedtls mpi
-     * format. This incurs an extra byte reversal when written to ASN1. */
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(r, r_buf, plen));
-    MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary(s, s_buf, plen));
-
-cleanup:
-    mbedtls_free(r_buf);
-    mbedtls_free(s_buf);
-    mbedtls_free(d_buf);
-
-    if (NULL != handle)
-    {
-        ECDSA_close(handle);
-    }
-
-    return ret;
-}
-#endif /* MBEDTLS_ECDSA_SIGN_ALT */
-
-#endif /* defined MBEDTLS_ECDSA_VERIFY_ALT || defined MBEDTLS_ECDSA_SIGN_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c
deleted file mode 100644
index c5668d4e87f830..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c
+++ /dev/null
@@ -1,900 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "mbedtls/ecjpake.h"
-
-#if defined(MBEDTLS_ECJPAKE_ALT)
-#include "ecjpake_alt.h"
-
-#include <string.h>
-
-#include "ti_drivers_config.h"
-
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKeyPlaintext.h>
-#include <ti/drivers/cryptoutils/ecc/ECCParams.h>
-
-/*
- * NOTE: On calling convention in this file.
- *
- * Many of the helper functions in this file take a pointer to a `uint8_t*`,
- * usually called `p`. This is the current working pointer for the input or
- * output buffer. They will also take a pointer to a `uint8_t`, usually called
- * `end`. This is the pointer to the end of the current working buffer. The
- * difference between these two pointers is calculated and used as the current
- * available length of the working buffer. This is checked before anything is
- * written to or read from the buffer. While values are read or written to the
- * data at the pointer pointed at by `p`, the pointer pointed at by `p` is
- * updated to point to the next available value. The callee updates the value
- * of `p` for the caller, almost in the same fashion as strtok.
- *
- * Here is an example:
- * ```
- * static int read_be_uint16(const uint8_t **p,
- *                           const uint8_t *end,
- *                           uint16_t      *value)
- * {
- *     if ((end < *p) || (end - *p < sizeof(uint16_t)))
- *     {
- *         return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
- *     }
- *     *value = ((uint16_t)(*p)[0] << 8) | (*p)[1]);
- *     return (0);
- * }
- *
- * void sample_func(void)
- * {
- *     uint8_t  buffer[4] = {0x01, 0x02, 0x03, 0x04};
- *     uint8_t* p = buffer + sizeof(buffer);
- *     uint8_t* end = buffer + sizeof(buffer);
- *     uint16_t value;
- *
- *     read_be_uint16(&p, end, &value);
- *     // value is now 0x0102
- *     // p points to buffer[2]
- *     read_be_uint16(&p, end, &value);
- *     // value is now 0x0304
- *     // p points to buffer[4] (invalid)
- * }
- */
-
-/*
- * Convert a mbedtls_ecjpake_role to identifier string.
- *
- * depends on the value of the enumeration of mbedtls_ecjpake_role.
- */
-static const char * const ecjpake_id[] = { "client", "server" };
-
-#define ID_MINE (ecjpake_id[ctx->role])
-#define ID_PEER (ecjpake_id[1 - ctx->role])
-
-/*
- * Size of the temporary buffer for ecjpake_hash:
- * 3 EC points plus their length, plus ID and its length (4 + 6 bytes)
- */
-#define ECJPAKE_HASH_BUF_LEN (3 * (4 + MBEDTLS_ECP_MAX_PT_LEN) + 4 + 6)
-
-/**
- * \breif           execute the contents of this macro, save the return in
- *                  `ret` and goto `cleanup` if it is not `0`
- *
- * The internal functions of this file driver are designed to return `0` on
- * success. The caller is expected to have an `int ret` in the translation unit
- * of the call-site, and a target `cleanup`. It is common practice to return
- * `ret` in the caller.
- *
- * ```
- * int example_func(void)
- * {
- *     int ret;
- *     ECJPAKE_ALT_CHK(some_func());
- *
- *     some_other_func();
- *
- * cleanup:
- *     return ret;
- * }
- * ```
- *
- * \param f         code to execute
- */
-#define ECJPAKE_ALT_CHK(f)                                                                                                         \
-    do                                                                                                                             \
-    {                                                                                                                              \
-        if ((ret = f) != 0)                                                                                                        \
-            goto cleanup;                                                                                                          \
-    } while (0)
-
-/**
- * \brief           writes a buffer prepended with a length byte
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param key       the CryptoKey to write
- * \param bin       the source to copy
- * \param len       the length to copy and write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- */
-static int tls_write_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len)
-{
-    if ((end < *p) || ((size_t) (end - *p) < 1 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    /* write the length to the buffer */
-    (*p)[0] = len;
-    *p += 1;
-
-    /* write the binary data as is */
-    memcpy(*p, bin, len);
-    *p += len;
-
-    return (0);
-}
-
-/**
- * \brief           read a binary value prepended by a length bit
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param bin       the array to fill
- * \param len       the size of \p bin
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- */
-static int tls_read_binary(const uint8_t ** p, const uint8_t * end, uint8_t * bin, size_t len)
-{
-    uint8_t data_len;
-
-    /* length byte plus the length of the crypto key */
-    if ((end < *p) || ((size_t) (end - *p) < 1 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    /* read the length byte */
-    data_len = (*p)[0];
-    *p += 1;
-    /* check the length matches */
-    if (data_len != len)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    memcpy(bin, *p, len);
-
-    *p += len;
-
-    return (0);
-}
-
-/**
- * \brief           writes a tls point into a CryptoKey
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param key       the CryptoKey to write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int tls_write_crypto_key(uint8_t ** p, const uint8_t * end, CryptoKey * key)
-{
-    return tls_write_binary(p, end, key->u.plaintext.keyMaterial, key->u.plaintext.keyLength);
-}
-
-/**
- * \brief           read a tls point into a CryptoKey
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param key       the CryptoKey to fill
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
- *                  the point is not in uncompressed form
- */
-static int tls_read_crypto_key(const uint8_t ** p, const uint8_t * end, CryptoKey * key)
-{
-    /* check that the point is uncompressed */
-    if ((end < *p) || (end - *p < 2))
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-    if ((*p)[1] != 0x04)
-    {
-        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
-    }
-
-    return tls_read_binary(p, end, key->u.plaintext.keyMaterial, key->u.plaintext.keyLength);
-}
-
-/**
- * \brief           write the curve info into the buffer
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param group_id  the mbedtls group id write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_BAD_INPUT_DATA
- *                  the group id did not name a valid curve
- */
-static int tls_write_curve_info(uint8_t ** p, const uint8_t * end, mbedtls_ecp_group_id group_id)
-{
-    const mbedtls_ecp_curve_info * curve_info;
-
-    if ((end < *p) || (end - *p < 3))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id);
-
-    if (NULL == curve_info)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    /* write that we use named curves */
-    (*p)[0] = MBEDTLS_ECP_TLS_NAMED_CURVE;
-    (*p)[1] = curve_info->tls_id >> 8;
-    (*p)[2] = curve_info->tls_id & 0xFF;
-    *p += 3;
-
-    return (0);
-}
-
-/**
- * \brief           read and verify the curve info from the buffer
- *
- * \param p         pointer to input buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the input buffer
- * \param group_id  the mbedtls group id to load to check a match
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- *
- * \retval MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL
- *                  the input buffer is too small
- * \retval MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE
- *                  the tls curve identifiers do not match
- * \retval MBEDTLS_ERR_ECP_BAD_INPUT_DATA
- *                  the curve info was not for a named curve or we do not have
- *                  that named curve
- */
-static int tls_verify_curve_info(const uint8_t ** p, const uint8_t * end, mbedtls_ecp_group_id group_id)
-{
-    uint16_t curve_name_id;
-    const mbedtls_ecp_curve_info * curve_info;
-
-    if ((end < *p) || (end - *p < 3))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    if ((*p)[0] != MBEDTLS_ECP_TLS_NAMED_CURVE)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-    curve_name_id = (((uint16_t) (*p)[1] << 8)) | (((uint16_t) (*p)[2]));
-    *p += 3;
-
-    curve_info = mbedtls_ecp_curve_info_from_grp_id(group_id);
-
-    if (NULL == curve_info)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    if (curve_name_id != curve_info->tls_id)
-    {
-        return (MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
-    }
-
-    return (0);
-}
-
-/**
- * \brief           Fill the a point with a random function
- *
- * \param private_key
- *                  key to fill with random data
- * \param f_rng     random number function
- * \param p_rng     context for the random function
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int gen_private_key(unsigned char * private_key, int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    unsigned int i;
-    unsigned int j   = 0;
-    unsigned int sum = 0U;
-
-    do
-    {
-        unsigned int * pkey = (unsigned int *) private_key;
-        f_rng(p_rng, private_key, NISTP256_CURVE_LENGTH_BYTES);
-
-        /* check if private_key is equal to zero */
-        for (i = 0; i < (NISTP256_CURVE_LENGTH_BYTES / sizeof(unsigned int)); i++)
-        {
-            sum |= pkey[i];
-        }
-        j++;
-    } while (0U == sum && (j < 3));
-
-    return (0U != sum ? 0 : -1);
-}
-
-/**
- * \brief           Generate the second round of keys for this node and peer
- *
- * \param ctx       Context to use
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_alt_generate_round2_keys(mbedtls_ecjpake_context * ctx)
-{
-    ECJPAKE_OperationRoundTwoGenerateKeys roundTwoGenerateKeys;
-    int ret;
-
-    if (ctx->roundTwoGenerated)
-    {
-        return (0);
-    }
-
-    ECJPAKE_OperationRoundTwoGenerateKeys_init(&roundTwoGenerateKeys);
-    roundTwoGenerateKeys.curve                = &ECCParams_NISTP256;
-    roundTwoGenerateKeys.myPrivateKey2        = &ctx->myPrivateCryptoKey2;
-    roundTwoGenerateKeys.myPublicKey1         = &ctx->myPublicCryptoKey1;
-    roundTwoGenerateKeys.myPublicKey2         = &ctx->myPublicCryptoKey2;
-    roundTwoGenerateKeys.theirPublicKey1      = &ctx->theirPublicCryptoKey1;
-    roundTwoGenerateKeys.theirPublicKey2      = &ctx->theirPublicCryptoKey2;
-    roundTwoGenerateKeys.preSharedSecret      = &ctx->preSharedSecretCryptoKey;
-    roundTwoGenerateKeys.theirNewGenerator    = &ctx->theirGeneratorKey;
-    roundTwoGenerateKeys.myNewGenerator       = &ctx->myGeneratorKey;
-    roundTwoGenerateKeys.myCombinedPrivateKey = &ctx->myCombinedPrivateKey;
-    roundTwoGenerateKeys.myCombinedPublicKey  = &ctx->myCombinedPublicKey;
-    roundTwoGenerateKeys.myPrivateV           = &ctx->myPrivateCryptoV3;
-    roundTwoGenerateKeys.myPublicV            = &ctx->myPublicCryptoV3;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_roundTwoGenerateKeys(ctx->handle, &roundTwoGenerateKeys));
-
-    ctx->roundTwoGenerated = true;
-
-cleanup:
-    return (ret);
-}
-
-void mbedtls_ecjpake_init(mbedtls_ecjpake_context * ctx)
-{
-    ECJPAKE_Params params;
-
-    if (ctx == NULL)
-    {
-        return;
-    }
-
-    ctx->md_info      = NULL;
-    ctx->point_format = MBEDTLS_ECP_PF_UNCOMPRESSED;
-
-    ECJPAKE_Params_init(&params);
-
-    ctx->handle = ECJPAKE_open(0, &params);
-}
-
-void mbedtls_ecjpake_free(mbedtls_ecjpake_context * ctx)
-{
-    if (ctx == NULL)
-    {
-        return;
-    }
-
-    ctx->md_info = NULL;
-
-    ECJPAKE_close(ctx->handle);
-    ctx->handle = NULL;
-}
-
-static void big_num_reverse(uint8_t * arr, size_t len)
-{
-    unsigned int left  = 0;
-    unsigned int right = len - 1;
-    uint8_t temp;
-
-    while (left < right)
-    {
-        temp       = arr[left];
-        arr[left]  = arr[right];
-        arr[right] = temp;
-
-        ++left;
-        --right;
-    }
-}
-
-/**
- * \brief           write a 4 byte length and binary output
- *
- * \param p         pointer to output buffer, will be changed by a successful
- *                  call
- * \param end       pointer to the end of the output buffer
- * \param bin       value to write
- * \param len       length to write
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_write_len_binary(uint8_t ** p, const uint8_t * end, const uint8_t * bin, size_t len)
-{
-    if ((end < *p) || ((size_t) (end - *p) < 4 + len))
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    memcpy(*p + 4, bin, len);
-
-    (*p)[0] = (unsigned char) ((len >> 24) & 0xFF);
-    (*p)[1] = (unsigned char) ((len >> 16) & 0xFF);
-    (*p)[2] = (unsigned char) ((len >> 8) & 0xFF);
-    (*p)[3] = (unsigned char) ((len) &0xFF);
-
-    *p += 4 + len;
-
-    return (0);
-}
-
-/**
- * \brief           Create the EC-JPAKE hash for each round
- *
- * \param md_info   message digest info to use
- * \param G         1st point to digest
- * \param V         2nd point to digest
- * \param X         3rd point to digest
- * \param id        string id to digest
- * \param hash      output buffer for digest
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_hash(const mbedtls_md_info_t * md_info, CryptoKey * G, CryptoKey * V, CryptoKey * X, const char * id,
-                        uint8_t * hash)
-{
-    int ret;
-    uint8_t buf[ECJPAKE_HASH_BUF_LEN];
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + sizeof(buf);
-    const size_t id_len = strlen(id);
-
-    /*
-     * Write 'lenG || G || lenV || V || lenX || X || lenID || ID' to the
-     * temporary buffer
-     */
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, G->u.plaintext.keyMaterial, G->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, V->u.plaintext.keyMaterial, V->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, X->u.plaintext.keyMaterial, X->u.plaintext.keyLength));
-    ECJPAKE_ALT_CHK(ecjpake_write_len_binary(&p, end, (uint8_t *) id, id_len));
-
-    /*
-     * Compute hash
-     *
-     * XXX: possible speedup by digesting the buffers directly instead of
-     * creating a temp buffer
-     */
-    ECJPAKE_ALT_CHK(mbedtls_md(md_info, buf, p - buf, hash));
-
-cleanup:
-    return (ret);
-}
-
-/**
- * \brief           Read and validate the ZKP based on this public key.
- *
- * \param ctx       Context to use
- * \param generator_key
- *                  Generator point to use
- * \param public_key
- *                  Public key use
- * \param p         Pointer to current place in buffer, will point to the next
- *                  character after a successful call
- * \param end       Pointer to the end of the buffer
- *
- * \return          0 if successful,
- *                  a negative error code otherwise
- */
-static int ecjpake_zkp_read(mbedtls_ecjpake_context * ctx, CryptoKey * generator_key, CryptoKey * public_key, const uint8_t ** p,
-                            const uint8_t * end)
-{
-    int ret;
-    CryptoKey v;
-    uint8_t v_material[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-
-    ECJPAKE_OperationVerifyZKP operation_verify_zkp;
-
-    CryptoKeyPlaintext_initKey(&v, v_material, sizeof(v_material));
-
-    /* read the Ephemeral public key V */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(p, end, &v));
-
-    /* read the Schnorr signature r */
-    ECJPAKE_ALT_CHK(tls_read_binary(p, end, r, sizeof(r)));
-
-    /* calculate the hash */
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, generator_key, &v, public_key, ID_PEER, hash));
-
-    /* verify the r and hash based on V */
-    ECJPAKE_OperationVerifyZKP_init(&operation_verify_zkp);
-    operation_verify_zkp.curve          = &ECCParams_NISTP256;
-    operation_verify_zkp.theirGenerator = generator_key;
-    operation_verify_zkp.theirPublicKey = public_key;
-    operation_verify_zkp.theirPublicV   = &v;
-    operation_verify_zkp.hash           = hash;
-    operation_verify_zkp.r              = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_verifyZKP(ctx->handle, &operation_verify_zkp));
-
-cleanup:
-    return (ret);
-}
-
-/**
- * \brief           Check if a CryptoKey is zero
- *
- * \param G         CryptoKey to use
- *
- * \return          0 CryptoKey is not zero
- *                  MBEDTLS_ERR_ECP_INVALID_KEY if CryptoKey is zero
- */
-static int check_CryptoKey_is_zero(CryptoKey * G)
-{
-    unsigned int i;
-    /* skip beginning 0x04 byte */
-    for (i = 1; i < G->u.plaintext.keyLength; i++)
-    {
-        if (G->u.plaintext.keyMaterial[i] != 0U)
-        {
-            /* the point is not all zero */
-            return (0);
-        }
-    }
-    /* the for loop completed, they were all zero */
-    return (MBEDTLS_ERR_ECP_INVALID_KEY);
-}
-
-int mbedtls_ecjpake_setup(mbedtls_ecjpake_context * ctx, mbedtls_ecjpake_role role, mbedtls_md_type_t hash,
-                          mbedtls_ecp_group_id curve, const uint8_t * secret, size_t len)
-{
-    int ret = 0;
-
-    ctx->roundTwoGenerated = false;
-    ctx->role              = role;
-
-    if ((ctx->md_info = mbedtls_md_info_from_type(hash)) == NULL)
-    {
-        return (MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE);
-    }
-
-    ctx->curve = curve;
-
-    /* copy NISTP256 generator for hash functions */
-    ctx->nistP256Generator[0] = 0x04;
-    memcpy(&(ctx->nistP256Generator[1]), ECCParams_NISTP256.generatorX, (NISTP256_CURVE_LENGTH_BYTES * 2));
-    big_num_reverse(&(ctx->nistP256Generator[1]), NISTP256_CURVE_LENGTH_BYTES);
-    big_num_reverse(&(ctx->nistP256Generator[NISTP256_CURVE_LENGTH_BYTES + 1]), NISTP256_CURVE_LENGTH_BYTES);
-    CryptoKeyPlaintext_initKey(&ctx->nistP256GeneratorCryptoKey, ctx->nistP256Generator, sizeof(ctx->nistP256Generator));
-
-    /* Pre-shared secret */
-    memcpy(ctx->preSharedSecretKeyingMaterial, secret, len);
-
-    CryptoKeyPlaintext_initKey(&ctx->preSharedSecretCryptoKey, ctx->preSharedSecretKeyingMaterial, len);
-
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoKey1, ctx->myPrivateKeyMaterial1, sizeof(ctx->myPrivateKeyMaterial1));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoKey2, ctx->myPrivateKeyMaterial2, sizeof(ctx->myPrivateKeyMaterial2));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV1, ctx->myPrivateVMaterial1, sizeof(ctx->myPrivateVMaterial1));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV2, ctx->myPrivateVMaterial2, sizeof(ctx->myPrivateVMaterial2));
-    CryptoKeyPlaintext_initKey(&ctx->myPrivateCryptoV3, ctx->myPrivateVMaterial3, sizeof(ctx->myPrivateVMaterial3));
-
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoKey1, ctx->myPublicKeyMaterial1, sizeof(ctx->myPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoKey2, ctx->myPublicKeyMaterial2, sizeof(ctx->myPublicKeyMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV1, ctx->myPublicVMaterial1, sizeof(ctx->myPublicVMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV2, ctx->myPublicVMaterial2, sizeof(ctx->myPublicVMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myPublicCryptoV3, ctx->myPublicVMaterial3, sizeof(ctx->myPublicVMaterial3));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myCombinedPrivateKey, ctx->myCombinedPrivateKeyMaterial1,
-                                    sizeof(ctx->myCombinedPrivateKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myCombinedPublicKey, ctx->myCombinedPublicKeyMaterial1,
-                                    sizeof(ctx->myCombinedPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->myGeneratorKey, ctx->myGenerator, sizeof(ctx->myGenerator));
-
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirPublicCryptoKey1, ctx->theirPublicKeyMaterial1,
-                                    sizeof(ctx->theirPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirPublicCryptoKey2, ctx->theirPublicKeyMaterial2,
-                                    sizeof(ctx->theirPublicKeyMaterial2));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirCombinedPublicKey, ctx->theirCombinedPublicKeyMaterial1,
-                                    sizeof(ctx->theirCombinedPublicKeyMaterial1));
-    CryptoKeyPlaintext_initBlankKey(&ctx->theirGeneratorKey, ctx->theirGenerator, sizeof(ctx->theirGenerator));
-
-    return (ret);
-}
-
-int mbedtls_ecjpake_check(const mbedtls_ecjpake_context * ctx)
-{
-    if (ctx->md_info == NULL || ctx->curve == MBEDTLS_ECP_DP_NONE || ctx->handle == NULL)
-    {
-        return (MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
-    }
-
-    return (0);
-}
-
-int mbedtls_ecjpake_read_round_one(mbedtls_ecjpake_context * ctx, const unsigned char * buf, size_t len)
-{
-    int ret;
-    const unsigned char * p   = buf;
-    const unsigned char * end = buf + len;
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirPublicCryptoKey1));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirPublicCryptoKey1));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->nistP256GeneratorCryptoKey, &ctx->theirPublicCryptoKey1, &p, end));
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirPublicCryptoKey2));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirPublicCryptoKey2));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->nistP256GeneratorCryptoKey, &ctx->theirPublicCryptoKey2, &p, end));
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_write_round_one(mbedtls_ecjpake_context * ctx, uint8_t * buf, size_t len, size_t * olen,
-                                    int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + len;
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-
-    /* Generate round one keys */
-    ECJPAKE_OperationRoundOneGenerateKeys roundOneGenerateKeys;
-    ECJPAKE_OperationGenerateZKP operationGenerateZKP;
-
-    /* Generate private keys */
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateKeyMaterial1, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateKeyMaterial2, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial1, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial2, f_rng, p_rng));
-    ECJPAKE_ALT_CHK(gen_private_key(ctx->myPrivateVMaterial3, f_rng, p_rng));
-
-    ECJPAKE_OperationRoundOneGenerateKeys_init(&roundOneGenerateKeys);
-    roundOneGenerateKeys.curve         = &ECCParams_NISTP256;
-    roundOneGenerateKeys.myPrivateKey1 = &ctx->myPrivateCryptoKey1;
-    roundOneGenerateKeys.myPrivateKey2 = &ctx->myPrivateCryptoKey2;
-    roundOneGenerateKeys.myPublicKey1  = &ctx->myPublicCryptoKey1;
-    roundOneGenerateKeys.myPublicKey2  = &ctx->myPublicCryptoKey2;
-    roundOneGenerateKeys.myPrivateV1   = &ctx->myPrivateCryptoV1;
-    roundOneGenerateKeys.myPrivateV2   = &ctx->myPrivateCryptoV2;
-    roundOneGenerateKeys.myPublicV1    = &ctx->myPublicCryptoV1;
-    roundOneGenerateKeys.myPublicV2    = &ctx->myPublicCryptoV2;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_roundOneGenerateKeys(ctx->handle, &roundOneGenerateKeys));
-
-    /* write X1 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoKey1));
-
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, &ctx->nistP256GeneratorCryptoKey, &ctx->myPublicCryptoV1, &ctx->myPublicCryptoKey1,
-                                 ID_MINE, hash));
-
-    /* generate round one ZKPs */
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myPrivateCryptoKey1;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV1;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    /* write ZKP for X1 (V1 and r1) */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV1));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    ECJPAKE_ALT_CHK(ecjpake_hash(ctx->md_info, &ctx->nistP256GeneratorCryptoKey, &ctx->myPublicCryptoV2, &ctx->myPublicCryptoKey2,
-                                 ID_MINE, hash));
-
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myPrivateCryptoKey2;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV2;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    /* write X2 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoKey2));
-
-    /* write ZKP for X2 */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV2));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    *olen = p - buf;
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_read_round_two(mbedtls_ecjpake_context * ctx, const unsigned char * buf, size_t len)
-{
-    int ret;
-    const uint8_t * p   = buf;
-    const uint8_t * end = buf + len;
-
-    ECJPAKE_ALT_CHK(ecjpake_alt_generate_round2_keys(ctx));
-
-    if (ctx->role == MBEDTLS_ECJPAKE_CLIENT)
-    {
-        ECJPAKE_ALT_CHK(tls_verify_curve_info(&p, end, ctx->curve));
-    }
-
-    /* read their combined key material (Xc or Xs) */
-    ECJPAKE_ALT_CHK(tls_read_crypto_key(&p, end, &ctx->theirCombinedPublicKey));
-
-    /* verify that the point is not zero */
-    ECJPAKE_ALT_CHK(check_CryptoKey_is_zero(&ctx->theirCombinedPublicKey));
-
-    /* verify the proof (ZKP(Xc) or ZKP(Xs)) */
-    ECJPAKE_ALT_CHK(ecjpake_zkp_read(ctx, &ctx->theirGeneratorKey, &ctx->theirCombinedPublicKey, &p, end));
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_write_round_two(mbedtls_ecjpake_context * ctx, unsigned char * buf, size_t len, size_t * olen,
-                                    int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    uint8_t hash[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t r[NISTP256_CURVE_LENGTH_BYTES];
-    uint8_t * p         = buf;
-    const uint8_t * end = buf + len;
-
-    ECJPAKE_OperationGenerateZKP operationGenerateZKP;
-
-    ECJPAKE_ALT_CHK(ecjpake_alt_generate_round2_keys(ctx));
-
-    ECJPAKE_ALT_CHK(
-        ecjpake_hash(ctx->md_info, &ctx->myGeneratorKey, &ctx->myPublicCryptoV3, &ctx->myCombinedPublicKey, ID_MINE, hash));
-
-    ECJPAKE_OperationGenerateZKP_init(&operationGenerateZKP);
-    operationGenerateZKP.curve        = &ECCParams_NISTP256;
-    operationGenerateZKP.myPrivateKey = &ctx->myCombinedPrivateKey;
-    operationGenerateZKP.myPrivateV   = &ctx->myPrivateCryptoV3;
-    operationGenerateZKP.hash         = hash;
-    operationGenerateZKP.r            = r;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_generateZKP(ctx->handle, &operationGenerateZKP));
-
-    if (ctx->role == MBEDTLS_ECJPAKE_SERVER)
-    {
-        /* write curve info */
-        ECJPAKE_ALT_CHK(tls_write_curve_info(&p, end, ctx->curve));
-    }
-
-    /* write public key X */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myCombinedPublicKey));
-
-    /* write ZKP for X (V and r) */
-    ECJPAKE_ALT_CHK(tls_write_crypto_key(&p, end, &ctx->myPublicCryptoV3));
-
-    /* write r */
-    ECJPAKE_ALT_CHK(tls_write_binary(&p, end, r, NISTP256_CURVE_LENGTH_BYTES));
-
-    *olen = p - buf;
-
-cleanup:
-    return (ret);
-}
-
-int mbedtls_ecjpake_derive_secret(mbedtls_ecjpake_context * ctx, unsigned char * buf, size_t len, size_t * olen,
-                                  int (*f_rng)(void *, unsigned char *, size_t), void * p_rng)
-{
-    int ret;
-    unsigned char md_len;
-    CryptoKey sharedSecretCryptoKey;
-    uint8_t sharedSecretKeyingMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-
-    ECJPAKE_OperationComputeSharedSecret computeSharedSecret;
-
-    md_len = mbedtls_md_get_size(ctx->md_info);
-    if (len < md_len)
-    {
-        return (MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL);
-    }
-
-    CryptoKeyPlaintext_initKey(&sharedSecretCryptoKey, sharedSecretKeyingMaterial1, sizeof(sharedSecretKeyingMaterial1));
-
-    /* Generate shared secret */
-    ECJPAKE_OperationComputeSharedSecret_init(&computeSharedSecret);
-    computeSharedSecret.curve                  = &ECCParams_NISTP256;
-    computeSharedSecret.myCombinedPrivateKey   = &ctx->myCombinedPrivateKey;
-    computeSharedSecret.theirCombinedPublicKey = &ctx->theirCombinedPublicKey;
-    computeSharedSecret.theirPublicKey2        = &ctx->theirPublicCryptoKey2;
-    computeSharedSecret.myPrivateKey2          = &ctx->myPrivateCryptoKey2;
-    computeSharedSecret.sharedSecret           = &sharedSecretCryptoKey;
-
-    ECJPAKE_ALT_CHK(ECJPAKE_computeSharedSecret(ctx->handle, &computeSharedSecret));
-
-    ECJPAKE_ALT_CHK(mbedtls_md(ctx->md_info, sharedSecretKeyingMaterial1 + 1, NISTP256_CURVE_LENGTH_BYTES, buf));
-
-    *olen = md_len;
-
-cleanup:
-    return (ret);
-}
-
-#undef ID_MINE
-#undef ID_PEER
-
-#endif /* MBEDTLS_ECJPAKE_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h
deleted file mode 100644
index 1ce4d008c487f4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_ECJPAKE_ALT)
-
-#include "mbedtls/ecp.h"
-#include "mbedtls/md.h"
-
-#include <ti/drivers/ECJPAKE.h>
-#include <ti/drivers/cryptoutils/cryptokey/CryptoKey.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Length of parameters for the NIST p256r1.
- *
- * ECJ-PAKE is only defined for p256r1
- */
-#define NISTP256_CURVE_LENGTH_BYTES (32)
-
-/**
- * Size in bytes of the identifier at the beginning of the point format
- */
-#define OCTET_STRING_OFFSET 1
-
-/**
- * Size in bytes of a point expressed in the TLS point format
- *
- * id_byte || X coord || Y coord
- */
-#define NISTP256_PUBLIC_KEY_LENGTH_BYTES (OCTET_STRING_OFFSET + (NISTP256_CURVE_LENGTH_BYTES * 2))
-
-/**
- * EC J-PAKE context structure.
- */
-typedef struct
-{
-    const mbedtls_md_info_t * md_info;
-    mbedtls_ecp_group_id curve;
-    mbedtls_ecjpake_role role;
-    int point_format;
-
-    bool roundTwoGenerated;
-    /*
-     * XXX: possible size reduction by moving ephemeral material to round
-     * calculations.
-     */
-    unsigned char myPrivateKeyMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateKeyMaterial2[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial2[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPrivateVMaterial3[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char myPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicKeyMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myPublicVMaterial3[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myCombinedPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myCombinedPrivateKeyMaterial1[NISTP256_CURVE_LENGTH_BYTES];
-    unsigned char nistP256Generator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char myGenerator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirPublicKeyMaterial2[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirCombinedPublicKeyMaterial1[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char theirGenerator[NISTP256_PUBLIC_KEY_LENGTH_BYTES];
-    unsigned char preSharedSecretKeyingMaterial[NISTP256_CURVE_LENGTH_BYTES];
-
-    CryptoKey nistP256GeneratorCryptoKey;
-    CryptoKey preSharedSecretCryptoKey;
-    CryptoKey myPrivateCryptoKey1;
-    CryptoKey myPrivateCryptoKey2;
-    CryptoKey myPrivateCryptoV1;
-    CryptoKey myPrivateCryptoV2;
-    CryptoKey myPrivateCryptoV3;
-    CryptoKey myCombinedPrivateKey;
-    CryptoKey myPublicCryptoKey1;
-    CryptoKey myPublicCryptoKey2;
-    CryptoKey myPublicCryptoV1;
-    CryptoKey myPublicCryptoV2;
-    CryptoKey myPublicCryptoV3;
-    CryptoKey myCombinedPublicKey;
-    CryptoKey myGeneratorKey;
-    CryptoKey theirPublicCryptoKey1;
-    CryptoKey theirPublicCryptoKey2;
-    CryptoKey theirCombinedPublicKey;
-    CryptoKey theirGeneratorKey;
-
-    ECJPAKE_Handle handle;
-} mbedtls_ecjpake_context;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_ECJPAKE_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c
deleted file mode 100644
index 0ef01f48fe34ba..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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.
- */
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include <mbedtls/sha256.h>
-
-#if defined(MBEDTLS_SHA256_ALT)
-
-#include <string.h>
-
-#include <ti/drivers/SHA2.h>
-#include <ti/drivers/sha2/SHA2CC26X2.h>
-
-/*!
- *  Hardware-specific configuration attributes, may be replaced with SysConfig
- *  ti_drivers.h structure.
- */
-const SHA2CC26X2_HWAttrs sha2CC26X2HWAttrs_sha = {
-    .intPriority = ~0,
-};
-
-void mbedtls_sha256_init(mbedtls_sha256_context * ctx)
-{
-    SHA2_Params sha2Params;
-
-    memset(ctx, 0, sizeof(mbedtls_sha256_context));
-    SHA2_Params_init(&sha2Params);
-
-    sha2Params.returnBehavior = SHA2_RETURN_BEHAVIOR_POLLING;
-
-    ctx->config.object  = &ctx->object;
-    ctx->config.hwAttrs = &sha2CC26X2HWAttrs_sha;
-
-    ctx->hndl = SHA2_construct(&ctx->config, &sha2Params);
-}
-
-void mbedtls_sha256_free(mbedtls_sha256_context * ctx)
-{
-    if (NULL == ctx)
-    {
-        return;
-    }
-
-    if (ctx->hndl != NULL)
-    {
-        SHA2_close(ctx->hndl);
-
-        memset(ctx, 0, sizeof(mbedtls_sha256_context));
-    }
-}
-
-/*
- * Deviation from documentation in sha256.h.
- *
- * It has been noticed that some code using mbedtls does not call `init` before
- * starting a SHA operation. Rather these implementations assume the `ctx`
- * structure may be zero'ed out as initialization. To support this usage the
- * driver instance is assumed to be uninitialized if the context's `hndl` is a
- * NULL pointer. Start will initialize the driver and assign the handle to the
- * context in this case.
- */
-int mbedtls_sha256_starts_ret(mbedtls_sha256_context * ctx, int is224)
-{
-    SHA2_HashType type;
-
-    // open the driver here because no-one called init
-    if (ctx->hndl == NULL)
-    {
-        SHA2_Params sha2Params;
-
-        SHA2_Params_init(&sha2Params);
-
-        sha2Params.returnBehavior = SHA2_RETURN_BEHAVIOR_POLLING;
-
-        ctx->config.object  = &ctx->object;
-        ctx->config.hwAttrs = &sha2CC26X2HWAttrs_sha;
-
-        ctx->hndl = SHA2_construct(&ctx->config, &sha2Params);
-
-        if (NULL == ctx->hndl)
-        {
-            return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-        }
-    }
-    else
-    {
-        SHA2_reset(ctx->hndl);
-    }
-
-    if (is224)
-    {
-        type = SHA2_HASH_TYPE_224;
-    }
-    else
-    {
-        type = SHA2_HASH_TYPE_256;
-    }
-
-    SHA2_setHashType(ctx->hndl, type);
-
-    return 0;
-}
-
-/**
- * Deviation from documentation in sha256.h.
- *
- * It has been noticed that some code using mbedtls does not call `init` on the
- * contexts being passed into this function. This seems to be done to avoid
- * allocating hardware to cloned context instances. To support this use-case,
- * only internal buffers to the SHA2 structure are copied without checking the
- * driver handles.
- */
-void mbedtls_sha256_clone(mbedtls_sha256_context * dst, const mbedtls_sha256_context * src)
-{
-    dst->object.hashType       = src->object.hashType;
-    dst->object.bytesInBuffer  = src->object.bytesInBuffer;
-    dst->object.bytesProcessed = src->object.bytesProcessed;
-    memcpy(dst->object.buffer, src->object.buffer, sizeof(dst->object.buffer));
-    // copy the digest to support cloning after finalization has happened
-    memcpy(dst->object.digest, src->object.digest, sizeof(dst->object.digest));
-}
-
-int mbedtls_sha256_finish_ret(mbedtls_sha256_context * ctx, unsigned char output[32])
-{
-    int_fast16_t result;
-
-    result = SHA2_finalize(ctx->hndl, output);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int mbedtls_sha256_update_ret(mbedtls_sha256_context * ctx, const unsigned char * input, size_t ilen)
-{
-    int_fast16_t result;
-
-    // Process data in chunks. The driver buffers incomplete blocks internally.
-    result = SHA2_addData(ctx->hndl, input, ilen);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int mbedtls_internal_sha256_process(mbedtls_sha256_context * ctx, const unsigned char data[64])
-{
-    int_fast16_t result;
-
-    // Process data in chunks. The driver buffers incomplete blocks internally.
-    result = SHA2_addData(ctx->hndl, data, SHA2_BLOCK_SIZE_BYTES_256);
-
-    if (SHA2_STATUS_SUCCESS != result)
-    {
-        return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-#endif /* MBEDTLS_SHA256_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h b/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h
deleted file mode 100644
index 96505775cd1119..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Texas Instruments Incorporated
- *
- *    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
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls-config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#if defined(MBEDTLS_SHA256_ALT)
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ti/drivers/SHA2.h>
-#include <ti/drivers/sha2/SHA2CC26X2.h>
-
-typedef struct
-{
-    SHA2_Handle hndl;         /*!< A handle that is returned by the SHA driver  */
-    SHA2_Config config;       /*!< structure containing SHA2 driver specific implementation  */
-    SHA2CC26X2_Object object; /*!< Pointer to a driver specific data object */
-} mbedtls_sha256_context;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* MBEDTLS_SHA256_ALT */
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h
deleted file mode 100644
index a5fcac9459b6c4..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config-check.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2019, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if OPENTHREAD_CONFIG_RADIO_915MHZ_OQPSK_SUPPORT
-#error "Platform cc1352 doesn't support configuration option: OPENTHREAD_CONFIG_RADIO_915MHZ_OQPSK_SUPPORT"
-#endif
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h b/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h
deleted file mode 100644
index dfdb7bcdd73057..00000000000000
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/openthread-core-cc13x2_26x2-config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2018, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#ifdef DeviceFamily_CC13X2_CC26X2
-
-/* Number of message buffers reduced to fit into CC26x2x3 RAM */
-#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22
-
-#endif // DeviceFamily_CC13X2_CC26X2
-
-#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP
-
-// When operating in a less than ideal RF environment, having a more forgiving configuration
-// of OpenThread makes thread a great deal more reliable.
-#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 15  // default is 3
-#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
-#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
-
-// Enable periodic parent search to speed up finding a better parent.
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
-#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
-#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
-
-// Use smaller maximum interval to speed up reattaching.
-#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
-
-#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
-// #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
-#define UART_AS_SERIAL_TRANSPORT 1
-#define OPENTHREAD_CONFIG_PLATFORM_USEC_TIMER_ENABLE 1
-
-#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
-#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
-#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE 1
-#define OPENTHREAD_CONFIG_DNS_CLIENT_SERVICE_DISCOVERY_ENABLE 1
-
-#define OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE 0
-#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 0
-#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
-
-#define OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS 0
-// TCP disabled until OpenThread has a GN/Ninja build for the tcplp library
-#define OPENTHREAD_CONFIG_TCP_ENABLE 0
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h b/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
index b16a6269818563..7f01603f255d8f 100644
--- a/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
+++ b/src/platform/cc13xx_26xx/cc13x4_26x4/ConfigurationManagerImpl.h
@@ -30,7 +30,7 @@ namespace chip {
 namespace DeviceLayer {
 
 /**
- * Concrete implementation of the ConfigurationManager singleton object for the CC13X2_26X2 platform.
+ * Concrete implementation of the ConfigurationManager singleton object for the CC13X4_26X4 platform.
  */
 class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImpl<Internal::CC13XX_26XXConfig>
 {
diff --git a/src/platform/device.gni b/src/platform/device.gni
index 01358d4880f876..dbbc38abf4ca88 100644
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/src/ble/ble.gni")
 
 declare_args() {
-  # Device platform layer: cc13x2_26x2, cc13x4_26x4, cc32xx, darwin, efr32, esp32, external, freertos, linux, nrfconnect, nxp, qpg, tizen, cyw30739, bl602, mw320, zephyr, beken, openiotsdk, none.
+  # Device platform layer: cc13x4_26x4, cc32xx, darwin, efr32, esp32, external, freertos, linux, nrfconnect, nxp, qpg, tizen, cyw30739, bl602, mw320, zephyr, beken, openiotsdk, none.
 
   chip_device_platform = "auto"
   chip_platform_target = ""
@@ -49,7 +49,6 @@ declare_args() {
   # Enable openthread support.
   chip_enable_openthread =
       chip_device_platform == "linux" || chip_device_platform == "qpg" ||
-      chip_device_platform == "cc13x2_26x2" ||
       chip_device_platform == "cc13x4_26x4" ||
       chip_device_platform == "tizen" || chip_device_platform == "stm32" ||
       chip_device_platform == "webos"
@@ -96,7 +95,6 @@ declare_args() {
       chip_device_platform == "asr" || chip_device_platform == "openiotsdk") {
     chip_mdns = "minimal"
   } else if (chip_device_platform == "darwin" ||
-             chip_device_platform == "cc13x2_26x2" ||
              chip_device_platform == "cc13x4_26x4" || current_os == "android" ||
              chip_device_platform == "fake" ||
              chip_device_platform == "tizen") {
@@ -133,9 +131,7 @@ declare_args() {
 }
 
 _chip_device_layer = "none"
-if (chip_device_platform == "cc13x2_26x2") {
-  _chip_device_layer = "cc13xx_26xx/cc13x2_26x2"
-} else if (chip_device_platform == "cc13x4_26x4") {
+if (chip_device_platform == "cc13x4_26x4") {
   _chip_device_layer = "cc13xx_26xx/cc13x4_26x4"
 } else if (chip_device_platform == "cc32xx") {
   _chip_device_layer = "cc32xx"
@@ -249,7 +245,6 @@ declare_args() {
 assert(
     (current_os != "freertos" && chip_device_platform == "none") ||
         chip_device_platform == "fake" ||
-        chip_device_platform == "cc13x2_26x2" ||
         chip_device_platform == "cc13x4_26x4" ||
         chip_device_platform == "cc32xx" || chip_device_platform == "darwin" ||
         chip_device_platform == "efr32" || chip_device_platform == "esp32" ||
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index afeab8d343f9df..40ae99ae99c77e 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -51,7 +51,7 @@ if (chip_project_config_include_dirs == [] &&
   chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
 }
 
-if (chip_device_platform == "cc13x2_26x2") {
+if (chip_device_platform == "cc13x4_26x4") {
   import("//build_overrides/ti_simplelink_sdk.gni")
 } else if (chip_device_platform == "efr32") {
   import("//build_overrides/efr32_sdk.gni")
diff --git a/third_party/ti_simplelink_sdk/BUILD.gn b/third_party/ti_simplelink_sdk/BUILD.gn
index e7040b16c4667b..0261b2a8b10edf 100644
--- a/third_party/ti_simplelink_sdk/BUILD.gn
+++ b/third_party/ti_simplelink_sdk/BUILD.gn
@@ -39,17 +39,7 @@ source_set("syscalls_stub") {
 }
 
 config("ti_simplelink_mbedtls_config") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    defines = [ "MBEDTLS_CONFIG_FILE=\"cc13x2_26x2-mbedtls-config.h\"" ]
-
-    include_dirs = [
-      "${chip_root}/src/platform/cc13xx_26xx/",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto",
-      "${ti_simplelink_sdk_root}/source",
-    ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     defines = [ "MBEDTLS_CONFIG_FILE=\"cc13x4_26x4-mbedtls-config.h\"" ]
     include_dirs = [
       "${chip_root}/src/platform/cc13xx_26xx/",
@@ -66,16 +56,6 @@ config("ti_simplelink_mbedtls_config") {
 
 mbedtls_target("mbedtls") {
   # Hardware acceleration
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    sources = [
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/aes_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdh_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecdsa_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/ecjpake_alt.c",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/crypto/sha256_alt.c",
-    ]
-  }
   if (ti_simplelink_device_family == "cc13x4_26x4") {
     sources = [
       "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4/crypto/aes_alt.c",
@@ -94,14 +74,7 @@ mbedtls_target("mbedtls") {
 }
 
 config("ti_simplelink_freertos_config") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    include_dirs = [
-      "${chip_root}/src/platform/cc13xx_26xx",
-      "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2",
-      "${freertos_root}/portable/GCC/ARM_CM4F",
-    ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     include_dirs = [
       "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4",
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ",
@@ -127,11 +100,7 @@ config("ti_simplelink_posix_config") {
 }
 
 freertos_target("freertos") {
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-    sources = [ "${freertos_root}/portable/GCC/ARM_CM4F/port.c" ]
-  } else if (ti_simplelink_device_family == "cc13x4_26x4" ||
-             ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     sources = [
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
       "${freertos_root}/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
@@ -145,8 +114,7 @@ freertos_target("freertos") {
 
   public_configs = [ ":ti_simplelink_freertos_config" ]
 
-  if (ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     # BLE has to have it's own heap config
     public_deps =
         [ "${chip_root}/third_party/ti_simplelink_sdk:ti_simplelink_sysconfig" ]
diff --git a/third_party/ti_simplelink_sdk/create_factory_data.py b/third_party/ti_simplelink_sdk/create_factory_data.py
index 224979a9587306..25bbcaa54f4c00 100644
--- a/third_party/ti_simplelink_sdk/create_factory_data.py
+++ b/third_party/ti_simplelink_sdk/create_factory_data.py
@@ -31,7 +31,7 @@ def create_hex_file(args):
 
     # there are 17 elements, each element will need 8 bytes in the struct
     # 4 for length of the element, and 4 for the pointer to the element
-    # factory data starts at 0xAC000 or 0xFE800, so the elements will
+    # factory data starts at 0xFE800, so the elements will
     # start 136 bytes after the start address
     factory_data_dict = json.load(args.factory_data_json_file[0])
     factory_data_schema = json.load(args.factory_data_schema[0])
@@ -41,10 +41,7 @@ def create_hex_file(args):
 
     struct_idx = 0
     values_idx = 0
-    if device_family == 'cc13x2_26x2':
-        value_address = 0xAC088
-    else:
-        value_address = 0xFE888
+    value_address = 0xFE888
 
     for element in factory_data:
         # get the length in hex and write to first hex file
@@ -137,12 +134,8 @@ def create_hex_file(args):
 
     # get hex file in a format that can be merged in a later step
     subprocess.call(['objcopy', args.factory_data_hex_file, '--input-target', 'ihex', '--output-target', 'binary', 'temp.bin'])
-    if device_family == 'cc13x2_26x2':
-        subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
-                        'ihex', args.factory_data_hex_file, '--change-addresses=0xac000'])
-    else:
-        subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
-                        'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
+    subprocess.call(['objcopy', 'temp.bin', '--input-target', 'binary', '--output-target',
+                     'ihex', args.factory_data_hex_file, '--change-addresses=0xfe800'])
     subprocess.call(['rm', 'temp.bin'])
 
 
diff --git a/third_party/ti_simplelink_sdk/factory_data_trim.py b/third_party/ti_simplelink_sdk/factory_data_trim.py
index c38be1f0a0a2ac..211b83020656fe 100644
--- a/third_party/ti_simplelink_sdk/factory_data_trim.py
+++ b/third_party/ti_simplelink_sdk/factory_data_trim.py
@@ -16,7 +16,7 @@
 
 """Script to extract the factory data content from the matter application + factory data image 
 
-This script will trim the factory data content out of the matter application image. It will also get the length of the factory data from the matter application map file. The output is the Matter image without the dummy factory d.
+This script will trim the factory data content out of the matter application image. It will also get the length of the factory data from the matter application map file. The output is the Matter image without the dummy factory data.
 
 Run with:
     python factory_data_trim.py <matter image> <matter image map file> <factory data image> <device family>
@@ -35,10 +35,7 @@
 
 # extract factory data length from map file
 with open(matter_app_map_file, "r") as map_file:
-    if device_family == 'cc13x2_26x2':
-        pattern = ".factory_data   0x000ac000"
-    else:
-        pattern = ".factory_data   0x000fe800"
+    pattern = ".factory_data   0x000fe800"
     for line in map_file:
         if re.search(pattern, line):
             factory_data_num_bytes = line
@@ -52,12 +49,8 @@
 matter_image.fromfile(matter_app_file, format='hex')
 matter_image_dict = matter_image.todict()
 
-if device_family == 'cc13x2_26x2':
-    # 704512 is 0xAC000 - start of factory data
-    start_index = list(matter_image_dict.keys()).index(704512)
-else:
-    # 1042432 is 0xFE800 - start of factory data
-    start_index = list(matter_image_dict.keys()).index(1042432)
+# 1042432 is 0xFE800 - start of factory data
+start_index = list(matter_image_dict.keys()).index(1042432)
 # convert length of factory data into a decimal value
 end_index = start_index + int(factory_data_num_bytes, 16)
 
diff --git a/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py b/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
index d98fc94593dd95..c0fd310dcb6dea 100644
--- a/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
+++ b/third_party/ti_simplelink_sdk/oad_and_factory_data_merge_tool.py
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Simple hexmerge script for combining the BIM, Factory Data, and App
+"""Simple hexmerge script for combining MCUBoot, Factory Data, and App
 
-This script provides a basic utility to combine the OAD application binary file with the Boot Image Manager hex file and Factory Data hex file. The output is a combined hex file that can be programmed on the target and run.
+This script provides a basic utility to combine the OAD application binary file with the MCUBoot hex file and Factory Data hex file. The output is a combined hex file that can be programmed on the target and run.
 
 Run with:
-    python oad_and_factory_data_merge_tool.py <App bin (CC13x2)/App hex (CC13x4)> <BIM (CC13x2)/MCUBoot (CC13x4) hex> <Factory data hex> <output>
+    python oad_and_factory_data_merge_tool.py <App hex (CC13x4)> <MCUBoot (CC13x4) hex> <Factory data hex> <output>
 """
 
 import sys
diff --git a/third_party/ti_simplelink_sdk/oad_merge_tool.py b/third_party/ti_simplelink_sdk/oad_merge_tool.py
index 0554601a1da07c..7bb2d47253c73f 100644
--- a/third_party/ti_simplelink_sdk/oad_merge_tool.py
+++ b/third_party/ti_simplelink_sdk/oad_merge_tool.py
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Simple hexmerge script for combining the BIM/MCUBoot image and App
+"""Simple hexmerge script for combining the MCUBoot image and App
 
-This script provides a basic utility to combine the OAD application binary file with the Boot Image Manager/MCUBoot hex file. The output is a combined hex file that can be programmed on the target and run.
+This script provides a basic utility to combine the OAD application binary file with the MCUBoot hex file. The output is a combined hex file that can be programmed on the target and run.
 
 Run with:
-    python oad_merge_tool.py <App bin (CC13x2)/App hex (CC13x4)> <BIM (CC13x2)/MCUBoot (CC13x4) hex> <output>
+    python oad_merge_tool.py <App hex (CC13x4)> <MCUBoot (CC13x4) hex> <output>
 """
 
 import sys
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni b/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
index 79b7aa1f59a695..e79d3a0d65396d 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_arm_platform_config.gni
@@ -14,15 +14,7 @@
 
 import("ti_simplelink_board.gni")
 
-if (ti_simplelink_device_family == "cc13x2_26x2" ||
-    ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-  arm_arch = "armv7e-m"
-  arm_abi = "aapcs"
-  arm_cpu = "cortex-m4"
-  arm_float_abi = "hard"
-  arm_fpu = "fpv5-sp-d16"
-  arm_use_thumb = true
-} else if (ti_simplelink_device_family == "cc13x4_26x4") {
+if (ti_simplelink_device_family == "cc13x4_26x4") {
   arm_arch = ""
   arm_abi = ""
   arm_cpu = "cortex-m33"
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_board.gni b/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
index 146e3dbfb07257..f5b11d670166b1 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_board.gni
@@ -28,36 +28,14 @@ assert(ti_simplelink_board != "", "ti_simplelink_board must be specified")
 #
 # | Development Kit     | Device Family   | SoC           |                     |
 # | -----------------   | --------------- | ----------    | ------------------- |
-# | CC1352R1_LAUNCHXL   | cc13x2_26x2     | cc1352r1f3    | Thread MTD + no BLE |
-# | CC2652R1_LAUNCHXL   | cc13x2_26x2     | cc2652r1f3    | Thread MTD + no BLE |
-# | LP_CC2652R7         | cc13x2x7_26x2x7 | cc2652r1f7    | Thread FTD + BLE    |
 # | CC134P10_6_LAUNCHXL | cc13x4_26x4     | cc1354p10     | Thread FTD + BLE    |
 # | CC2674              | cc13x4_24x4     | CC2674P10RGZ  | Thread FTD + BLE    |
 # | CC2674              | cc13x4_24x4     | CC2674R10RGZ  | Thread FTD + BLE    |
 # | CC3220SF_LAUNCHXL   | cc32xx          | cc3220SF      | Wi-Fi               |
 # | CC3235SF_LAUNCHXL   | cc32xx          | cc3235SF      | Wi-Fi               |
 
-# XXX: Can we do an array with a case statement?
-if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
-  ti_simplelink_device_family = "cc13x2_26x2"
-  ti_simplelink_device_family_driverlib = "cc13x2_cc26x2"
-  ti_simplelink_soc_family = "cc13x2"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC13X2?
-  ti_simplelink_soc = "cc1352r1f3"
-  ti_simplelink_bim_name = "cc1352r1lp"
-} else if (ti_simplelink_board == "CC2652R1_LAUNCHXL") {
-  ti_simplelink_device_family = "cc13x2_26x2"
-  ti_simplelink_device_family_driverlib = "cc13x2_cc26x2"
-  ti_simplelink_soc_family = "cc26x2"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC26X2?
-  ti_simplelink_soc = "cc2652r1f3"
-  ti_simplelink_bim_name = "cc2652r1lp"
-} else if (ti_simplelink_board == "LP_EM_CC1354P10_6" ||
-           ti_simplelink_board == "LP_EM_CC1354P10_1") {
+if (ti_simplelink_board == "LP_EM_CC1354P10_6" ||
+    ti_simplelink_board == "LP_EM_CC1354P10_1") {
   ti_simplelink_device_family = "cc13x4_26x4"
   ti_simplelink_device_family_driverlib = "cc13x4_cc26x4"
   ti_simplelink_soc_family = "cc13x4"
@@ -69,15 +47,6 @@ if (ti_simplelink_board == "CC1352R1_LAUNCHXL") {
   ti_simplelink_device_family_driverlib = "cc13x4_cc26x4"
   ti_simplelink_soc_family = "cc13x4"  #ble path
   ti_simplelink_isa = "m33f"
-} else if (ti_simplelink_board == "LP_CC2652R7") {
-  ti_simplelink_device_family = "cc13x2x7_26x2x7"
-  ti_simplelink_device_family_driverlib = "cc13x2x7_cc26x2x7"
-  ti_simplelink_soc_family = "cc26x2x7"
-  ti_simplelink_isa = "m4f"
-
-  # set -DDeviceFamily_CC26X2?
-  ti_simplelink_soc = "cc2652r1f7"
-  ti_simplelink_bim_name = "cc2652r7lp"
 } else if (ti_simplelink_board == "CC3220SF_LAUNCHXL") {
   ti_simplelink_device_family = "cc32xx"
   ti_simplelink_soc_family = "cc32xx"
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
index e0a848a079c3f9..94e7851bc60a35 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
@@ -41,8 +41,7 @@ template("ti_simplelink_executable") {
   output_base_name = get_path_info(invoker.output_name, "name")
 
   #used for OTA image creator for the cc13xx
-  if (ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     objcopy_image_name = output_base_name + ".hex"
     objcopy_image_format = "ihex"
   } else {
@@ -72,19 +71,7 @@ template("ti_simplelink_executable") {
 
     public_configs = [ ":${simplelink_target_name}_config" ]
 
-    if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      if (chip_enable_ota_requestor) {
-        sources +=
-            [ "${chip_root}/src/platform/cc13xx_26xx/oad_image_header.c" ]
-        if (custom_factory_data) {
-          ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota_factory_data.lds"
-        } else {
-          ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos_ota.lds"
-        }
-      } else {
-        ldscript = "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/cc13x2x7_cc26x2x7_freertos.lds"
-      }
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       if (chip_enable_ota_requestor) {
         sources +=
             [ "${chip_root}/src/platform/cc13xx_26xx/oad_image_header.c" ]
@@ -116,181 +103,7 @@ template("ti_simplelink_executable") {
   }
 
   if (chip_enable_ota_requestor) {
-    if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      if (custom_factory_data) {
-        pw_python_action("${simplelink_target_name}-without-factory-data.hex") {
-          public_deps = [ ":${simplelink_target_name}.out.image" ]
-
-          script = "${ti_simplelink_sdk_build_root}/factory_data_trim.py"
-          sources = [ "${root_out_dir}/${objcopy_image_name}" ]
-          outputs =
-              [ "${root_out_dir}/${output_base_name}-without-factory-data.hex" ]
-
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.hex",
-                        root_out_dir),
-            rebase_path("${root_out_dir}/${output_base_name}.out.map",
-                        root_out_dir),
-            rebase_path(
-                "${root_out_dir}/${output_base_name}-without-factory-data.hex",
-                root_out_dir),
-            "cc13x2_26x2",
-          ]
-        }
-        pw_python_action("${simplelink_target_name}-factory-data.hex") {
-          script = "${ti_simplelink_sdk_build_root}/create_factory_data.py"
-          sources = [
-            "${chip_root}/src/platform/cc13xx_26xx/factory_data.schema",
-            "${chip_root}/src/platform/cc13xx_26xx/factory_data_cc13xx_26xx.json",
-          ]
-          outputs = [ "${root_out_dir}/${output_base_name}-factory-data.hex" ]
-
-          args = [
-            "-factory_data",
-            rebase_path(
-                "${chip_root}/src/platform/cc13xx_26xx/factory_data_cc13xx_26xx.json"),
-            "-schema",
-            rebase_path(
-                "${chip_root}/src/platform/cc13xx_26xx/factory_data.schema"),
-            "-o",
-            rebase_path("${root_out_dir}/${output_base_name}-factory-data.hex",
-                        root_out_dir),
-            "-device",
-            "cc13x2_26x2",
-          ]
-        }
-      }
-      pw_python_action("${simplelink_target_name}.bin") {
-        if (custom_factory_data) {
-          public_deps =
-              [ ":${simplelink_target_name}-without-factory-data.hex" ]
-        } else {
-          public_deps = [ ":${simplelink_target_name}.out.image" ]
-        }
-
-        script = "${ti_simplelink_sdk_root}//tools/common/oad/oad_image_tool.py"
-        if (custom_factory_data) {
-          sources =
-              [ "${root_out_dir}/${output_base_name}-without-factory-data.hex" ]
-          input_path =
-              "${root_out_dir}/${output_base_name}-without-factory-data.hex"
-        } else {
-          sources = [ "${root_out_dir}/${objcopy_image_name}" ]
-          input_path = "${root_out_dir}/${output_base_name}.hex"
-        }
-        outputs = [ "${root_out_dir}/${output_base_name}.bin" ]
-
-        args = [
-          "--verbose",
-          "ccs",
-          rebase_path(root_out_dir, root_build_dir),
-          "7",
-          "-hex1",
-          rebase_path(input_path, root_out_dir),
-          "-o",
-          output_base_name,
-        ]
-
-        if (defined(invoker.pem_file)) {
-          args += [
-            "-k",
-            rebase_path(invoker.pem_file, root_build_dir),
-          ]
-        } else {
-          args += [
-            "-k",
-            rebase_path(
-                "${ti_simplelink_sdk_root}/tools/common/oad/private.pem",
-                root_build_dir),
-          ]
-        }
-      }
-      pw_python_action("${simplelink_target_name}-bim.hex") {
-        public_deps = [ ":${simplelink_target_name}.bin" ]
-        if (custom_factory_data) {
-          public_deps += [ ":${simplelink_target_name}-factory-data.hex" ]
-
-          script = "${ti_simplelink_sdk_build_root}/oad_and_factory_data_merge_tool.py"
-          sources = [
-            "${root_out_dir}/${output_base_name}-factory-data.hex",
-            "${root_out_dir}/${output_base_name}.bin",
-          ]
-          outputs = [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-        } else {
-          script = "${ti_simplelink_sdk_build_root}/oad_merge_tool.py"
-          sources = [ "${root_out_dir}/${output_base_name}.bin" ]
-          outputs = [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-        }
-
-        if (defined(invoker.bim_hex)) {
-          bim_hex = invoker.bim_hex
-        } else {
-          bim_hex = "${ti_simplelink_sdk_root}/examples/nortos/${ti_simplelink_board}/bim/hexfiles/bim_offchip/Release/bim_offchip.hex"
-        }
-
-        if (custom_factory_data) {
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.bin",
-                        root_build_dir),
-            rebase_path(bim_hex, root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-factory-data.hex",
-                        root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-bim.hex",
-                        root_build_dir),
-          ]
-        } else {
-          args = [
-            rebase_path("${root_out_dir}/${output_base_name}.bin",
-                        root_build_dir),
-            rebase_path(bim_hex, root_build_dir),
-            rebase_path("${root_out_dir}/${output_base_name}-bim.hex",
-                        root_build_dir),
-          ]
-        }
-
-        args += [ "${root_out_dir}/${output_base_name}-bim.hex" ]
-      }
-      pw_python_action("${target_name}.ota") {
-        public_deps = [ ":${simplelink_target_name}-bim.hex" ]
-
-        script = "${chip_root}/src/app/ota_image_tool.py"
-        sources = [ "${root_out_dir}/${output_base_name}.bin" ]
-        outputs = [ "${root_out_dir}/${output_base_name}.ota" ]
-
-        args = [
-          "create",
-          rebase_path("${root_out_dir}/${output_base_name}.bin",
-                      root_build_dir),
-          rebase_path("${root_out_dir}/${output_base_name}.ota",
-                      root_build_dir),
-        ]
-
-        args += [
-          "-v",
-          matter_device_vid,
-          "-p",
-          matter_device_pid,
-          "-vn",
-          matter_software_ver,
-          "-vs",
-          matter_software_ver_str,
-        ]
-        if (defined(invoker.ota_digest)) {
-          args += [
-            "-da",
-            matter_ota_digest,
-          ]
-        } else {
-          args += [
-            "-da",
-            "sha256",
-          ]
-        }
-        if (defined(invoker.ota_args)) {
-          args += invoker.ota_args
-        }
-      }
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       if (custom_factory_data) {
         pw_python_action("${simplelink_target_name}-without-factory-data.hex") {
           public_deps = [ ":${simplelink_target_name}.out.image" ]
@@ -661,13 +474,7 @@ template("ti_simplelink_executable") {
   group(simplelink_target_name) {
     if (chip_enable_ota_requestor) {
       # Generating the ota binary image
-      if (ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-        data_deps = [
-          ":${simplelink_target_name}-bim.hex",
-          ":${simplelink_target_name}.ota",
-          ":${simplelink_target_name}.out",
-        ]
-      } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         data_deps = [
           ":${simplelink_target_name}-mcuboot.hex",
           ":${simplelink_target_name}.ota",
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
index 326d2b7e88540f..fe77dfc0033039 100644
--- a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
+++ b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
@@ -30,13 +30,9 @@ import("ti_simplelink_board.gni")
 declare_args() {
   # Location of the TI SimpleLink SDK.
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     ti_simplelink_sdk_root =
         "${chip_root}/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx"
-    ot_cc13x2_cc26x2 =
-        "${chip_root}/third_party/ti_simplelink_sdk/repo_ot-cc13x2_cc26x2"
   } else if (ti_simplelink_device_family == "cc32xx") {
     ti_simplelink_sdk_root =
         "${chip_root}/third_party/ti_simplelink_sdk/repo_cc32xx"
@@ -59,26 +55,6 @@ template("ti_sysconfig") {
     gen_outputs += [ output_dir + "/" + output ]
   }
 
-  config("cc13x2_26x2_${target_name}_config") {
-    ldflags = [
-      "-nostartfiles",
-      "-fno-exceptions",
-      "-fno-unwind-tables",
-    ]
-    defines = [ "DeviceFamily_CC13X2_CC26X2" ]
-  }
-
-  config("cc13x2x7_26x2x7_${target_name}_config") {
-    ldflags = [
-      "-nostartfiles",
-      "-fno-exceptions",
-      "-fno-unwind-tables",
-    ]
-
-    cflags = [ "-Wno-sign-compare" ]
-    defines = [ "DeviceFamily_CC26X2X7" ]
-  }
-
   config("cc13x4_26x4_${target_name}_config") {
     ldflags = [
       "-nostartfiles",
@@ -181,9 +157,7 @@ template("ti_simplelink_sdk") {
   assert(ti_simplelink_sdk_root != "",
          "ti_simplelink_sdk_root must be specified")
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     action("build_external_library") {
       script = "${ti_simplelink_sdk_build_root}/run_sdk_drivers_gen.py"
       outputs = [
@@ -211,16 +185,6 @@ template("ti_simplelink_sdk") {
 
   sdk_target_name = target_name
 
-  config("cc13x2_26x2_sdk_config") {
-    libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
-    defines = [ "DeviceFamily_CC13X2_CC26X2" ]
-  }
-
-  config("cc13x2x7_26x2x7_sdk_config") {
-    libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_cc26x2.a" ]
-    defines = [ "DeviceFamily_CC13X2X7_CC26X2X7" ]
-  }
-
   config("cc13x4_26x4_sdk_config") {
     libs = [ "${ti_simplelink_sdk_root}/source/ti/drivers/rf/lib/gcc/${ti_simplelink_isa}/rf_multiMode_${ti_simplelink_soc_family}.a" ]
     defines = [ "FLASH_ONLY_BUILD" ]
@@ -253,9 +217,7 @@ template("ti_simplelink_sdk") {
     ]
   }
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     config("external_library_config") {
       libs = [
         "${target_gen_dir}/drivers_${ti_simplelink_soc_family}.a",
@@ -299,17 +261,7 @@ template("ti_simplelink_sdk") {
       "${ti_simplelink_sdk_root}/kernel/freertos/dpl/SwiP_freertos.c",
       "${ti_simplelink_sdk_root}/kernel/freertos/dpl/SystemP_freertos.c",
     ]
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-      sources += [
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/ClockPCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/HwiPCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/PowerCC26X2_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/dpl/TimerPCC26XX_freertos.c",
-        "${ti_simplelink_sdk_root}/kernel/freertos/startup/startup_cc13x2_cc26x2_gcc.c",
-        "${ti_simplelink_sdk_root}/source/ti/drivers/sha2/SHA2CC26X2.c",
-      ]
-    } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       sources += [
         "${ti_simplelink_sdk_root}/kernel/freertos/dpl/ClockPCC26X2_freertos.c",
         "${ti_simplelink_sdk_root}/kernel/freertos/dpl/HwiPCC26X2_freertos.c",
@@ -376,9 +328,7 @@ template("ti_simplelink_sdk") {
     public_configs = [ ":${sdk_target_name}_config" ]
   }
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     source_set("${sdk_target_name}_nvocmp") {
       defines = [ "NVOCMP_POSIX_MUTEX" ]
       cflags = [
@@ -414,141 +364,6 @@ template("ti_simplelink_sdk") {
     }
   }
 
-  config("${sdk_target_name}_cc13x2_26x2_dmm_config") {
-    defines = [
-      "INCLUDE_BGET_STATS",
-      "USE_DMM",
-      "NVOCMP_FREERTOS_MUTEX=1",
-      "USEOT",
-      "ICALL_EVENTS",
-      "ICALL_JT",
-      "ICALL_LITE",
-      "ICALL_MAX_NUM_ENTITIES=6",
-      "ICALL_MAX_NUM_TASKS=3",
-      "ICALL_STACK0_ADDR",
-      "POWER_SAVING",
-      "TBM_ACTIVE_ITEMS_ONLY",
-      "NPI_USE_UART",
-      "NPI_FLOW_CTRL=0",
-      "OSAL_CBTIMER_NUM_TASKS=1",
-      "USE_ICALL",
-      "BLE_START",
-      "FREERTOS",
-    ]
-    cflags = [
-      "-Wno-conversion",
-      "-Wno-comment",
-      "-Wno-shadow",
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/build_components.opt",
-                        root_build_dir),
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/factory_config.opt",
-                        root_build_dir),
-    ]
-  }
-
-  config("${sdk_target_name}_cc13x2x7_26x2x7_dmm_config") {
-    include_dirs = []
-    libs = []
-
-    defines = [
-      "INCLUDE_BGET_STATS",
-      "USE_DMM",
-      "NVOCMP_FREERTOS_MUTEX=1",
-      "USEOT",
-      "ICALL_EVENTS",
-      "ICALL_JT",
-      "ICALL_LITE",
-      "ICALL_MAX_NUM_ENTITIES=6",
-      "ICALL_MAX_NUM_TASKS=3",
-      "ICALL_STACK0_ADDR",
-      "POWER_SAVING",
-      "TBM_ACTIVE_ITEMS_ONLY",
-      "NPI_USE_UART",
-      "NPI_FLOW_CTRL=0",
-      "OSAL_CBTIMER_NUM_TASKS=1",
-      "USE_ICALL",
-      "BLE_START",
-      "FREERTOS",
-    ]
-
-    libs += [
-      "${ti_simplelink_sdk_root}/source/ti/dmm/lib/gcc/m4f/libdmmlib_freertos.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/OneLib.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/StackWrapper.a",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/libraries/cc26x2r1/ble_r2.symbols",
-    ]
-
-    defines += [
-      "FLASH_ROM_BUILD",
-      "ONE_BLE_LIB_SIZE_OPTIMIZATION",
-      "STACK_LIBRARY",
-      "CC26XX",
-      "CC26X2",
-      "CC26X2R1_LAUNCHXL",
-    ]
-
-    include_dirs += [
-      # DMM/BLE:
-      "${ti_simplelink_sdk_root}/source",
-
-      # Eclipse the SDK config header from DMM
-      "${chip_root}/src/platform/cc13x2_26x2",
-
-      # CHIPoBLE Added include dirs
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/freertos/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/freertos/itm",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/thread/platform",
-      "${ti_simplelink_sdk_root}/source/",
-      "${ti_simplelink_sdk_root}/source/ti/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/thread/",
-      "${ti_simplelink_sdk_root}/source/ti/dmm/apps/common/thread/source/activity/",
-      "${ti_simplelink_sdk_root}/source/ti/common/nv",
-
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/inc",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/rf_patches",
-      "${ti_simplelink_sdk_root}/source/ti/devices/cc13x2x7_cc26x2x7/driverlib",
-
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/npi/stack/",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/rcosc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/controller/cc26xx/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/rom",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/freertos",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/heapmgr",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/dev_info",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/hal/src/target/_common/cc26xx/",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/simple_profile",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/osal/src/inc",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/controller/cc26xx/inc/",
-      "${ti_simplelink_sdk_root}/source/ti/common/cc26xx",
-      "${ti_simplelink_sdk_root}/source/ti/ble5stack/common/cc26xx/freertos/",
-    ]
-
-    cflags = [
-      "-Wno-conversion",
-      "-Wno-comment",
-      "-Wno-shadow",
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/build_components.opt",
-                        root_build_dir),
-      "@" + rebase_path(ti_simplelink_sdk_root +
-                            "/source/ti/ble5stack/config/factory_config.opt",
-                        root_build_dir),
-    ]
-  }
-
   config("${sdk_target_name}_cc13x4_26x4_dmm_config") {
     include_dirs = []
     libs = []
@@ -699,9 +514,7 @@ template("ti_simplelink_sdk") {
   }
 
   source_set("${sdk_target_name}_dmm") {
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x4_26x4" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       defines = []
       include_dirs = [
         "${chip_root}/third_party/openthread/repo/include/",
@@ -729,22 +542,7 @@ template("ti_simplelink_sdk") {
         "${ti_simplelink_sdk_root}/source/ti/dmm/dmm_priority_ble_thread.c",
       ]
 
-      if (ti_simplelink_device_family == "cc13x2_26x2" ||
-          ti_simplelink_device_family == "cc13x2x7_26x2x7") {
-        sources += [
-          "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/ble_user_config.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/host/gatt_uuid.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/host/gattservapp_util.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/app/icall_api_lite.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/icall_cc2650.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/src/icall_user_config.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/icall/stack/ble_user_config_stack.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/profiles/dev_info/cc26xx/devinfoservice.c",
-          "${ti_simplelink_sdk_root}/source/ti/ble5stack/rom/agama_r1/rom_init.c",
-        ]
-
-        include_dirs += [ "${chip_root}/src/platform/cc13xx_26xx/cc13x2_26x2/" ]
-      } else if (ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         sources += [
           "${chip_root}/src/platform/cc13xx_26xx/cc13x4_26x4/ble_user_config.c",
           "${ti_simplelink_sdk_root}/source/ti/ble5stack_flash/host/gatt_uuid.c",
@@ -780,9 +578,7 @@ template("ti_simplelink_sdk") {
       ":${sdk_target_name}_dpl",
       ":${sdk_target_name}_freertos",
     ]
-    if (ti_simplelink_device_family == "cc13x2_26x2" ||
-        ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-        ti_simplelink_device_family == "cc13x4_26x4") {
+    if (ti_simplelink_device_family == "cc13x4_26x4") {
       public_deps += [
         ":${sdk_target_name}_dmm",
         ":${sdk_target_name}_nvocmp",
@@ -791,9 +587,7 @@ template("ti_simplelink_sdk") {
     }
     if (defined(invoker.public_configs)) {
       public_configs = invoker.public_configs
-      if (ti_simplelink_device_family == "cc13x2_26x2" ||
-          ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-          ti_simplelink_device_family == "cc13x4_26x4") {
+      if (ti_simplelink_device_family == "cc13x4_26x4") {
         public_configs += [ ":external_library_config" ]
       }
     }
@@ -803,9 +597,7 @@ template("ti_simplelink_sdk") {
 template("freertos_target") {
   freertos_target_name = target_name
 
-  if (ti_simplelink_device_family == "cc13x2_26x2" ||
-      ti_simplelink_device_family == "cc13x2x7_26x2x7" ||
-      ti_simplelink_device_family == "cc13x4_26x4") {
+  if (ti_simplelink_device_family == "cc13x4_26x4") {
     _freertos_root = "${freertos_root}"
   } else {
     _freertos_root = "${freertos_root}/repo"