diff --git a/src/BUILD.gn b/src/BUILD.gn
index 14eb5e836c4d9a..08ea030e415ff2 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -83,7 +83,6 @@ if (chip_build_tests) {
       "${chip_root}/src/crypto/tests",
       "${chip_root}/src/data-model-providers/codedriven/endpoint/tests",
       "${chip_root}/src/inet/tests",
-      "${chip_root}/src/include/platform/tests",
       "${chip_root}/src/lib/address_resolve/tests",
       "${chip_root}/src/app/server-cluster/tests",
       "${chip_root}/src/lib/asn1/tests",
diff --git a/src/app/clusters/user-label-server/user-label-cluster.cpp b/src/app/clusters/user-label-server/user-label-cluster.cpp
index 8052183c309a41..83c0b03969109b 100644
--- a/src/app/clusters/user-label-server/user-label-cluster.cpp
+++ b/src/app/clusters/user-label-server/user-label-cluster.cpp
@@ -19,6 +19,8 @@
 #include <app/server/Server.h>
 #include <clusters/UserLabel/Metadata.h>
 
+#include <array>
+
 namespace chip::app::Clusters {
 
 using namespace UserLabel;
@@ -73,19 +75,6 @@ bool IsValidLabelEntry(const Structs::LabelStruct::Type & entry)
     return (entry.label.size() <= kMaxLabelSize) && (entry.value.size() <= kMaxValueSize);
 }
 
-bool IsValidLabelEntryList(const LabelList::TypeInfo::DecodableType & list)
-{
-    auto iter = list.begin();
-    while (iter.Next())
-    {
-        if (!IsValidLabelEntry(iter.GetValue()))
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
 CHIP_ERROR WriteLabelList(const ConcreteDataAttributePath & path, AttributeValueDecoder & decoder)
 {
     DeviceLayer::DeviceInfoProvider * provider = DeviceLayer::GetDeviceInfoProvider();
@@ -96,20 +85,22 @@ CHIP_ERROR WriteLabelList(const ConcreteDataAttributePath & path, AttributeValue
 
     if (!path.IsListItemOperation())
     {
-        DeviceLayer::AttributeList<Structs::LabelStruct::Type, DeviceLayer::kMaxUserLabelListLength> labelList;
+        size_t numLabels = 0;
+        std::array<Structs::LabelStruct::Type, DeviceLayer::kMaxUserLabelListLength> labels;
         LabelList::TypeInfo::DecodableType decodablelist;
 
         ReturnErrorOnFailure(decoder.Decode(decodablelist));
-        VerifyOrReturnError(IsValidLabelEntryList(decodablelist), CHIP_IM_GLOBAL_STATUS(ConstraintError));
-
         auto iter = decodablelist.begin();
         while (iter.Next())
         {
-            ReturnErrorOnFailure(labelList.add(iter.GetValue()));
+            auto & label = iter.GetValue();
+            VerifyOrReturnError(IsValidLabelEntry(label), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+            VerifyOrReturnError(numLabels < labels.size(), CHIP_ERROR_NO_MEMORY);
+            labels[numLabels++] = label;
         }
         ReturnErrorOnFailure(iter.GetStatus());
 
-        return provider->SetUserLabelList(endpoint, labelList);
+        return provider->SetUserLabelList(endpoint, Span(labels.data(), numLabels));
     }
 
     if (path.mListOp == ConcreteDataAttributePath::ListOperation::AppendItem)
diff --git a/src/include/platform/AttributeList.h b/src/include/platform/AttributeList.h
deleted file mode 100644
index 81fe3d12420a23..00000000000000
--- a/src/include/platform/AttributeList.h
+++ /dev/null
@@ -1,142 +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 is a list of attribute. Each entry is an attribute of type T.
- */
-
-#pragma once
-
-#include <lib/core/CHIPError.h>
-#include <lib/support/CodeUtils.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-template <typename T, size_t N>
-class AttributeList
-{
-public:
-    /* The iterator */
-    class Iterator
-    {
-    public:
-        Iterator(const AttributeList<T, N> * AttributeList, int index);
-        const T & operator*() const;
-        Iterator & operator++();
-        bool operator!=(const Iterator & other) const;
-        bool operator==(const Iterator & other) const;
-
-    private:
-        const AttributeList<T, N> * mAttributeListPtr;
-        int mIndex = -1;
-    };
-
-    AttributeList() = default;
-    ~AttributeList() { mSize = 0; }
-
-    CHIP_ERROR add(const T & label);
-
-    size_t size() const;
-    const T & operator[](int index) const;
-
-    Iterator begin() const;
-    Iterator end() const;
-
-private:
-    T mList[N];
-    int mSize = 0;
-};
-
-/*
- * AttributeList methods
- **/
-template <typename T, size_t N>
-inline CHIP_ERROR AttributeList<T, N>::add(const T & label)
-{
-    if (mSize == N)
-    {
-        return CHIP_ERROR_NO_MEMORY;
-    }
-
-    // add the new element
-    mList[mSize] = label;
-    ++mSize;
-    return CHIP_NO_ERROR;
-}
-
-template <typename T, size_t N>
-inline size_t AttributeList<T, N>::size() const
-{
-    return static_cast<size_t>(mSize);
-}
-
-template <typename T, size_t N>
-inline const T & AttributeList<T, N>::operator[](int index) const
-{
-    VerifyOrDie(index < mSize);
-    return mList[index];
-}
-
-template <typename T, size_t N>
-inline typename AttributeList<T, N>::Iterator AttributeList<T, N>::begin() const
-{
-    return AttributeList<T, N>::Iterator{ this, 0 };
-}
-
-template <typename T, size_t N>
-inline typename AttributeList<T, N>::Iterator AttributeList<T, N>::end() const
-{
-    return AttributeList<T, N>::Iterator{ this, mSize };
-}
-
-/*
- * Iterator methods
- **/
-template <typename T, size_t N>
-inline AttributeList<T, N>::Iterator::Iterator(const AttributeList<T, N> * pAttributeList, int index) :
-    mAttributeListPtr(pAttributeList), mIndex(index)
-{}
-
-template <typename T, size_t N>
-inline const T & AttributeList<T, N>::Iterator::operator*() const
-{
-    return mAttributeListPtr->operator[](mIndex);
-}
-
-template <typename T, size_t N>
-inline typename AttributeList<T, N>::Iterator & AttributeList<T, N>::Iterator::operator++()
-{
-    ++mIndex;
-    return *this;
-}
-
-template <typename T, size_t N>
-inline bool AttributeList<T, N>::Iterator::operator!=(const AttributeList<T, N>::Iterator & other) const
-{
-    return !(*this == other);
-}
-
-template <typename T, size_t N>
-inline bool AttributeList<T, N>::Iterator::operator==(const AttributeList<T, N>::Iterator & other) const
-{
-    return mAttributeListPtr == other.mAttributeListPtr && mIndex == other.mIndex;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/include/platform/DeviceInfoProvider.h b/src/include/platform/DeviceInfoProvider.h
index 33ff9b4424b536..fcd3bd3b418745 100644
--- a/src/include/platform/DeviceInfoProvider.h
+++ b/src/include/platform/DeviceInfoProvider.h
@@ -24,7 +24,7 @@
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>
-#include <platform/AttributeList.h>
+#include <lib/support/Span.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -101,7 +101,7 @@ class DeviceInfoProvider
      * @return CHIP_NO_ERROR on success.
      * @return CHIP_ERROR if an error occurs.
      */
-    CHIP_ERROR SetUserLabelList(EndpointId endpoint, const AttributeList<UserLabelType, kMaxUserLabelListLength> & labelList);
+    CHIP_ERROR SetUserLabelList(EndpointId endpoint, Span<const UserLabelType> labelList);
 
     /**
      * @brief Clears the user label list for a specified endpoint.
diff --git a/src/include/platform/PlatformManager.h b/src/include/platform/PlatformManager.h
index 8470e32642d5fd..8f2c086916c9fe 100644
--- a/src/include/platform/PlatformManager.h
+++ b/src/include/platform/PlatformManager.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include <platform/AttributeList.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CHIPDeviceEvent.h>
 #include <system/PlatformEventSupport.h>
diff --git a/src/include/platform/tests/BUILD.gn b/src/include/platform/tests/BUILD.gn
deleted file mode 100644
index ccfeab22b1313a..00000000000000
--- a/src/include/platform/tests/BUILD.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")
-import("//build_overrides/chip.gni")
-
-import("${chip_root}/build/chip/chip_test_suite.gni")
-
-chip_test_suite("tests") {
-  output_name = "libIncludePlatformTests"
-
-  test_sources = [ "TestAttributeList.cpp" ]
-
-  cflags = [ "-Wconversion" ]
-
-  public_deps = [ "${chip_root}/src/platform" ]
-}
diff --git a/src/include/platform/tests/TestAttributeList.cpp b/src/include/platform/tests/TestAttributeList.cpp
deleted file mode 100644
index ab34f0f75cc7f7..00000000000000
--- a/src/include/platform/tests/TestAttributeList.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include <pw_unit_test/framework.h>
-
-#include <platform/AttributeList.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-class TestAttributeList : public ::testing::Test
-{
-};
-
-// Test an empty list
-TEST_F(TestAttributeList, TestEmpty)
-{
-    AttributeList<int, 5> list;
-    EXPECT_EQ(list.size(), 0u);
-    EXPECT_EQ(list.begin(), list.end());
-
-    // This will abort/die
-    // list[0];
-}
-
-// Test adding elements and overflow
-TEST_F(TestAttributeList, TestAddAndOverflow)
-{
-    AttributeList<int, 5> list;
-
-    EXPECT_EQ(list.add(10), CHIP_NO_ERROR);
-    EXPECT_EQ(list.size(), 1u);
-
-    EXPECT_EQ(list.add(20), CHIP_NO_ERROR);
-    EXPECT_EQ(list.size(), 2u);
-
-    EXPECT_EQ(list.add(30), CHIP_NO_ERROR);
-    EXPECT_EQ(list.size(), 3u);
-
-    EXPECT_EQ(list.add(40), CHIP_NO_ERROR);
-    EXPECT_EQ(list.size(), 4u);
-
-    EXPECT_EQ(list.add(50), CHIP_NO_ERROR);
-    EXPECT_EQ(list.size(), 5u);
-
-    EXPECT_EQ(list.add(60), CHIP_ERROR_NO_MEMORY);
-    EXPECT_EQ(list.size(), 5u);
-}
-
-// Test operator[]
-TEST_F(TestAttributeList, TestIndexing)
-{
-    AttributeList<int, 5> list;
-
-    EXPECT_EQ(list.add(10), CHIP_NO_ERROR);
-    EXPECT_EQ(list.add(20), CHIP_NO_ERROR);
-    EXPECT_EQ(list.add(30), CHIP_NO_ERROR);
-
-    ASSERT_EQ(list.size(), 3u);
-
-    EXPECT_EQ(list[0], 10);
-    EXPECT_EQ(list[1], 20);
-    EXPECT_EQ(list[2], 30);
-
-    // This will abort/die
-    // list[3];
-}
-
-// Test the iterator methods
-TEST_F(TestAttributeList, TestIterator)
-{
-    AttributeList<int, 5> list;
-
-    EXPECT_EQ(list.begin(), list.end());
-
-    EXPECT_EQ(list.add(10), CHIP_NO_ERROR);
-    EXPECT_NE(list.begin(), list.end());
-
-    EXPECT_EQ(list.add(20), CHIP_NO_ERROR);
-    EXPECT_EQ(list.add(30), CHIP_NO_ERROR);
-
-    ASSERT_EQ(list.size(), 3u);
-
-    auto it = list.begin();
-    EXPECT_EQ(*it, 10);
-
-    ++it;
-    EXPECT_NE(it, list.end());
-    EXPECT_EQ(*it, 20);
-
-    ++it;
-    EXPECT_EQ(*it, 30);
-
-    ++it;
-    EXPECT_EQ(it, list.end());
-};
-
-// Test range-based for loop
-TEST_F(TestAttributeList, TestRangeBasedFor)
-{
-    AttributeList<int, 5> list;
-    EXPECT_EQ(list.add(10), CHIP_NO_ERROR);
-    EXPECT_EQ(list.add(20), CHIP_NO_ERROR);
-    EXPECT_EQ(list.add(30), CHIP_NO_ERROR);
-
-    int expected_values[] = { 10, 20, 30 };
-    int i                 = 0;
-    for (const auto & val : list)
-    {
-        ASSERT_LT(i, 3);
-        EXPECT_EQ(val, expected_values[i]);
-        i++;
-    }
-    EXPECT_EQ(i, 3);
-}
-
-// Test iterators from different lists
-TEST_F(TestAttributeList, TestIteratorFromDifferentLists)
-{
-    AttributeList<int, 5> list1;
-    AttributeList<int, 5> list2;
-
-    // Both iterators will have index 0, but point to different lists.
-    // They should not be equal.
-    EXPECT_NE(list1.begin(), list2.begin());
-
-    EXPECT_EQ(list1.add(10), CHIP_NO_ERROR);
-    EXPECT_EQ(list2.add(20), CHIP_NO_ERROR);
-
-    // Both iterators will have index 0, but point to different lists.
-    EXPECT_NE(list1.begin(), list2.begin());
-}
-
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/DeviceInfoProvider.cpp b/src/platform/DeviceInfoProvider.cpp
index 28191cd4f82352..105313a1445452 100644
--- a/src/platform/DeviceInfoProvider.cpp
+++ b/src/platform/DeviceInfoProvider.cpp
@@ -35,15 +35,16 @@ DeviceInfoProvider * gDeviceInfoProvider = nullptr;
 
 } // namespace
 
-CHIP_ERROR DeviceInfoProvider::SetUserLabelList(EndpointId endpoint,
-                                                const AttributeList<UserLabelType, kMaxUserLabelListLength> & labelList)
+CHIP_ERROR DeviceInfoProvider::SetUserLabelList(EndpointId endpoint, Span<const UserLabelType> labelList)
 {
     size_t index          = 0;
     size_t previousLength = 0;
     size_t currentLength  = labelList.size();
 
+    VerifyOrReturnError(labelList.size() <= kMaxUserLabelListLength, CHIP_ERROR_NO_MEMORY);
+
     CHIP_ERROR err = GetUserLabelLength(endpoint, previousLength);
-    VerifyOrReturnError(err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND || err == CHIP_NO_ERROR, err);
+    VerifyOrReturnError(err == CHIP_NO_ERROR || err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND, err);
 
     ReturnErrorOnFailure(SetUserLabelLength(endpoint, currentLength));
 
@@ -64,18 +65,7 @@ CHIP_ERROR DeviceInfoProvider::SetUserLabelList(EndpointId endpoint,
 
 CHIP_ERROR DeviceInfoProvider::ClearUserLabelList(EndpointId endpoint)
 {
-    size_t length;
-
-    CHIP_ERROR err = GetUserLabelLength(endpoint, length);
-    VerifyOrReturnError(err != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND, CHIP_NO_ERROR);
-    ReturnErrorOnFailure(err);
-
-    for (size_t i = 0; i < length; i++)
-    {
-        ReturnErrorOnFailure(DeleteUserLabelAt(endpoint, i));
-    }
-
-    return CHIP_NO_ERROR;
+    return SetUserLabelList(endpoint, Span<UserLabelType>());
 }
 
 CHIP_ERROR DeviceInfoProvider::AppendUserLabel(EndpointId endpoint, const UserLabelType & label)
@@ -84,11 +74,7 @@ CHIP_ERROR DeviceInfoProvider::AppendUserLabel(EndpointId endpoint, const UserLa
 
     // Fetch current list length
     ReturnErrorOnFailure(GetUserLabelLength(endpoint, length));
-
-    if (length >= kMaxUserLabelListLength)
-    {
-        return CHIP_ERROR_NO_MEMORY;
-    }
+    VerifyOrReturnError(length < kMaxUserLabelListLength, CHIP_ERROR_NO_MEMORY);
 
     // Add the new entry to the list
     ReturnErrorOnFailure(SetUserLabelLength(endpoint, length + 1));