diff --git a/src/app/clusters/groups-client/groups-client.cpp b/src/app/clusters/groups-client/groups-client.cpp
deleted file mode 100644
index 6983aeb7a63bee..00000000000000
--- a/src/app/clusters/groups-client/groups-client.cpp
+++ /dev/null
@@ -1,59 +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 <app/CommandHandler.h>
-#include <app/util/af.h>
-
-using namespace chip;
-
-bool emberAfGroupsClusterAddGroupResponseCallback(app::CommandHandler * commandObj, uint8_t status, GroupId groupId)
-{
-    emberAfGroupsClusterPrintln("RX: AddGroupResponse 0x%x, 0x%2x", status, groupId);
-    commandObj->AddStatus(commandPath, Status::Success);
-    return true;
-}
-
-bool emberAfGroupsClusterViewGroupResponseCallback(app::CommandHandler * commandObj, uint8_t status, GroupId groupId,
-                                                   uint8_t * groupName)
-{
-    emberAfGroupsClusterPrint("RX: ViewGroupResponse 0x%x, 0x%2x, \"", status, groupId);
-    emberAfGroupsClusterPrintString(groupName);
-    emberAfGroupsClusterPrintln("\"");
-    commandObj->AddStatus(commandPath, Status::Success);
-    return true;
-}
-
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(app::CommandHandler * commandObj, uint8_t capacity, uint8_t groupCount,
-                                                            uint8_t * groupList)
-{
-    uint8_t i;
-    emberAfGroupsClusterPrint("RX: GetGroupMembershipResponse 0x%x, 0x%x,", capacity, groupCount);
-    for (i = 0; i < groupCount; i++)
-    {
-        emberAfGroupsClusterPrint(" [0x%2x]", emberAfGetInt16u(groupList + (i << 1), 0, 2));
-    }
-    emberAfGroupsClusterPrintln("%s", "");
-    commandObj->AddStatus(commandPath, Status::Success);
-    return true;
-}
-
-bool emberAfGroupsClusterRemoveGroupResponseCallback(app::CommandHandler * commandObj, uint8_t status, GroupId groupId)
-{
-    emberAfGroupsClusterPrintln("RX: RemoveGroupResponse 0x%x, 0x%2x", status, groupId);
-    commandObj->AddStatus(commandPath, Status::Success);
-    return true;
-}
diff --git a/src/app/clusters/identify-client/identify-client.cpp b/src/app/clusters/identify-client/identify-client.cpp
deleted file mode 100644
index c778c77d547dc7..00000000000000
--- a/src/app/clusters/identify-client/identify-client.cpp
+++ /dev/null
@@ -1,35 +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
- * @brief Routines for the Identify Client plugin, the
- *        client implementation of the Identify cluster.
- *******************************************************************************
- ******************************************************************************/
-
-#include <app/CommandHandler.h>
-#include <app/util/af.h>
-
-using namespace chip;
-
-bool emberAfIdentifyClusterIdentifyQueryResponseCallback(app::CommandHandler * commandObj, uint16_t timeout)
-{
-    emberAfIdentifyClusterPrintln("RX: IdentifyQueryResponse 0x%4x", timeout);
-    commandObj->AddStatus(commandPath, Status::Success);
-    return true;
-}