More cleanups.

Author: andy31415

src/app/clusters/general-commissioning-server/CodegenIntegration.cpp

@@ -28,6 +28,10 @@
 #include <platform/DeviceControlServer.h>
 #include <platform/PlatformManager.h>
 
+#if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
+#include <app/server/TermsAndConditionsManager.h>
+#endif
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
@@ -83,8 +87,7 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
         return &gServer.Cluster();
     }
 
-    // Nothing to destroy: gRegistration is a global static that handles destruction
-    void ReleaseRegistration(unsigned clusterInstanceIndex) override {}
+    void ReleaseRegistration(unsigned clusterInstanceIndex) override { gServer.Destroy(); }
 };
 
 } // namespace

src/app/clusters/general-commissioning-server/general-commissioning-cluster.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "general-commissioning-cluster.h"
-#include "platform/ConfigurationManager.h"
 
 #include <app/AppConfig.h>
 #include <app/reporting/reporting.h>
@@ -27,6 +26,7 @@
 #include <clusters/GeneralCommissioning/Metadata.h>
 #include <cstdint>
 #include <optional>
+#include <platform/ConfigurationManager.h>
 #include <platform/DeviceControlServer.h>
 #include <platform/PlatformManager.h>
 #include <tracing/macros.h>