From 102570410fe791d982e3a7a1431739fef8009b12 Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Wed, 16 Mar 2022 01:41:55 -0400
Subject: [PATCH] Remove some unused commisisoning states. (#16263)

---
 src/controller/AutoCommissioner.cpp     | 3 ---
 src/controller/CHIPDeviceController.cpp | 3 ---
 src/controller/CommissioningDelegate.h  | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index 56fd26caf7ac10..5947a8d3220a59 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -201,9 +201,6 @@ CommissioningStage AutoCommissioner::GetNextCommissioningStage(CommissioningStag
     case CommissioningStage::kSendComplete:
         return CommissioningStage::kCleanup;
 
-    // Currently unimplemented.
-    case CommissioningStage::kConfigACL:
-        return CommissioningStage::kError;
     // Neither of these have a next stage so return kError;
     case CommissioningStage::kCleanup:
     case CommissioningStage::kError:
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 7a26eada2a22ba..8fc7096f35658a 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -2002,9 +2002,6 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         SendOperationalCertificate(proxy, params.GetNoc().Value(), params.GetIcac().Value(), params.GetIpk().Value(),
                                    params.GetAdminSubject().Value());
         break;
-    case CommissioningStage::kConfigACL:
-        // TODO: Implement
-        break;
     case CommissioningStage::kWiFiNetworkSetup: {
         if (!params.GetWiFiCredentials().HasValue())
         {
diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
index b75168a9d47e3e..4eb1825aeb36fb 100644
--- a/src/controller/CommissioningDelegate.h
+++ b/src/controller/CommissioningDelegate.h
@@ -33,9 +33,6 @@ enum CommissioningStage : uint8_t
     kSecurePairing,
     kReadCommissioningInfo,
     kArmFailsafe,
-    // kConfigTime,  // NOT YET IMPLEMENTED
-    // kConfigTimeZone,  // NOT YET IMPLEMENTED
-    // kConfigDST,  // NOT YET IMPLEMENTED
     kConfigRegulatory,
     kSendPAICertificateRequest,
     kSendDACCertificateRequest,
@@ -52,7 +49,6 @@ enum CommissioningStage : uint8_t
     kFindOperational,
     kSendComplete,
     kCleanup,
-    kConfigACL,
 };
 
 struct WiFiCredentials