diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
index efe7b17aa13d8c7f4c94bc44e761f7b471e65c21..db37b19cbd6fbf14d842dc66ee466492aa1de8b5 100644
--- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
+++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
@@ -86,11 +86,7 @@ int32_t IpcClientManager::Init(const std::string &pkgName)
         LOGE("InitDeviceManager Failed with ret %{public}d", ret);
         return ret;
     }
-    if (dmListener_.size() >= MAX_CONTAINER_SIZE) {
-        LOGE("dmListener_ size is more than max size");
-        return ERR_DM_FAILED;
-    }
-
+    CHECK_SIZE_RETURN(dmListener_, ERR_DM_FAILED);
     sptr<IpcClientStub> listener = sptr<IpcClientStub>(new IpcClientStub());
     std::shared_ptr<IpcRegisterListenerReq> req = std::make_shared<IpcRegisterListenerReq>();
     std::shared_ptr<IpcRsp> rsp = std::make_shared<IpcRsp>();
diff --git a/services/implementation/include/attest/dm_auth_attest_common.h b/services/implementation/include/attest/dm_auth_attest_common.h
index 00c9499309dfc475b0f2797ad5bc16e74e4fa43b..21d5f6296b259fd89506e7d953a1863142508dc3 100644
--- a/services/implementation/include/attest/dm_auth_attest_common.h
+++ b/services/implementation/include/attest/dm_auth_attest_common.h
@@ -16,10 +16,6 @@
 #ifndef OHOS_DM_AUTH_ATTEST_COMMON_H
 #define OHOS_DM_AUTH_ATTEST_COMMON_H
 
-#define DM_CERTS_COUNT 4
-#define UDID_BUF_LEN 65
-#define DM_CERTIFICATE_SIZE 8192
-
 #include <stdint.h>
 #include <string>
 
diff --git a/test/unittest/UTTest_ipc_server_stub.cpp b/test/unittest/UTTest_ipc_server_stub.cpp
index adc33ab53c1bb534285886645528d21208a98aec..875eb58d92375c6a601232210ac5cc886f39234a 100644
--- a/test/unittest/UTTest_ipc_server_stub.cpp
+++ b/test/unittest/UTTest_ipc_server_stub.cpp
@@ -647,7 +647,6 @@ HWTEST_F(IpcServerStubTest, OnAddSystemAbility_002, testing::ext::TestSize.Level
     int32_t systemAbilityId = 9999;
     std::string deviceId;
     IpcServerStub::GetInstance().OnAddSystemAbility(systemAbilityId, deviceId);
-    EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr);
 
     systemAbilityId = SOFTBUS_SERVER_SA_ID;
     IpcServerStub::GetInstance().registerToService_ = false;