diff --git a/common/coauth/src/coauth_funcs.c b/common/coauth/src/coauth_funcs.c
index e73dd39f38398156fd0c956b122530333c514518..7b842528ac128f283d367a916deb2cd857a945c2 100644
--- a/common/coauth/src/coauth_funcs.c
+++ b/common/coauth/src/coauth_funcs.c
@@ -71,7 +71,6 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke
         return RESULT_BAD_PARAM;
     }
     scheduleToken->scheduleResult = RESULT_GENERAL_ERROR;
-    // ExecutorResultInfo *resultInfo = Malloc(sizeof(ExecutorResultInfo));
     ExecutorResultInfo *resultInfo = GetExecutorResultInfo(executorMsg);
     if (resultInfo == NULL) {
         LOG_ERROR("tlv parse failed");
@@ -85,6 +84,10 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke
         goto EXIT;
     }
 
+    if (resultInfo->result != RESULT_SUCCESS) {
+        LOG_ERROR("executor result failed");
+        goto EXIT;
+    }
     Buffer *publicKey = NULL;
     uint32_t index;
     for (index = 0; index < coAuthSchedule.executorSize; index++) {
@@ -105,10 +108,6 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke
         goto EXIT;
     }
 
-    ret = RemoveCoAuthSchedule(coAuthSchedule.scheduleId);
-    if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("remove failed");
-    }
     ret = TokenDataGetAndSign(coAuthSchedule.executors[0].authType, resultInfo, scheduleToken);
     DestoryBuffer(publicKey);
 
diff --git a/common/user_auth/src/context_manager.c b/common/user_auth/src/context_manager.c
deleted file mode 100644
index 5c735a3b16b8bdd0353e846383517ce7085bae38..0000000000000000000000000000000000000000
--- a/common/user_auth/src/context_manager.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * 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 "context_manager.h"
-
-#include "adaptor_log.h"
-#include "auth_level.h"
-#include "coauth.h"
-#include "idm_database.h"
-
-static bool IsContextDuplicate(uint64_t contextId);
-static ResultCode CreateSchedules(UserAuthContext *context);
-static CoAuthSchedule *CreateCoauthSchedule(uint32_t userId, uint64_t contextId, uint32_t authType);
-static void DestroyContextNode(void *data);
-
-// Stores information about the current user authentication schedule.
-static LinkedList *g_contextList = NULL;
-
-ResultCode InitUserAuthContextList()
-{
-    if (g_contextList != NULL) {
-        return RESULT_SUCCESS;
-    }
-    g_contextList = CreateLinkedList(DestroyContextNode);
-    if (g_contextList == NULL) {
-        return RESULT_GENERAL_ERROR;
-    }
-    return RESULT_SUCCESS;
-}
-
-void DestoryUserAuthContextList(void)
-{
-    DestroyLinkedList(g_contextList);
-    g_contextList = NULL;
-}
-
-static void CopyParamToContext(UserAuthContext *context, AuthSolutionHal params)
-{
-    context->contextId = params.contextId;
-    context->userId = params.userId;
-    context->challenge = params.challenge;
-    context->authType = params.authType;
-    context->authTrustLevel = params.authTrustLevel;
-}
-
-UserAuthContext *GenerateContext(AuthSolutionHal params)
-{
-    LOG_INFO("begin");
-    if (g_contextList == NULL) {
-        LOG_ERROR("need init");
-        return NULL;
-    }
-    if (IsContextDuplicate(params.contextId)) {
-        LOG_ERROR("contextId is duplicate");
-        return NULL;
-    }
-    uint32_t authTypeAtl;
-    ResultCode ret = SingleAuthTrustLevel(params.userId, params.authType, &authTypeAtl);
-    if (ret != RESULT_SUCCESS || authTypeAtl < params.authTrustLevel) {
-        LOG_ERROR("authTrustLevel is satisfied");
-    }
-
-    UserAuthContext *context = Malloc(sizeof(UserAuthContext));
-    if (context == NULL) {
-        LOG_ERROR("context malloc failed");
-        return NULL;
-    }
-    CopyParamToContext(context, params);
-    ret = CreateSchedules(context);
-    if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("create schedule failed");
-        DestoryContext(context);
-        return NULL;
-    }
-    ret = g_contextList->insert(g_contextList, context);
-    if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("create schedule failed");
-        DestoryContext(context);
-        return NULL;
-    }
-    return context;
-}
-
-UserAuthContext *GetContext(uint64_t contextId)
-{
-    if (g_contextList == NULL) {
-        LOG_ERROR("context list is null");
-        return NULL;
-    }
-    uint32_t num = g_contextList->getSize(g_contextList);
-    LinkedListNode *tempNode = g_contextList->head;
-    UserAuthContext *contextRet = NULL;
-    for (uint32_t index = 0; index < num; index++) {
-        if (tempNode == NULL) {
-            LOG_ERROR("node is null");
-            return NULL;
-        }
-        contextRet = (UserAuthContext *)tempNode->data;
-        if (contextRet != NULL && contextRet->contextId == contextId) {
-            return contextRet;
-        }
-        tempNode = tempNode->next;
-    }
-    return NULL;
-}
-
-static ResultCode InsertScheduleToContext(CoAuthSchedule *schedule, UserAuthContext *context)
-{
-    LinkedList *scheduleList = context->scheduleList;
-    return scheduleList->insert(scheduleList, schedule);
-}
-
-static void DestroyScheduleNode(void *data)
-{
-    if (data == NULL) {
-        LOG_ERROR("schedule is null");
-        return;
-    }
-    Free(data);
-}
-
-static ResultCode CreateSchedules(UserAuthContext *context)
-{
-    LOG_INFO("begin");
-    context->scheduleList = CreateLinkedList(DestroyScheduleNode);
-    if (context->scheduleList == NULL) {
-        LOG_ERROR("schedule list create failed");
-        return RESULT_NO_MEMORY;
-    }
-    CoAuthSchedule *schedule = CreateCoauthSchedule(context->userId, context->contextId, context->authType);
-    if (schedule == NULL) {
-        LOG_INFO("the authType is invalid");
-        DestroyLinkedList(context->scheduleList);
-        context->scheduleList = NULL;
-        return RESULT_BAD_PARAM;
-    }
-    if (InsertScheduleToContext(schedule, context) != RESULT_SUCCESS) {
-        DestroyScheduleNode(schedule);
-        DestroyLinkedList(context->scheduleList);
-        context->scheduleList = NULL;
-        LOG_ERROR("insert failed");
-        return RESULT_UNKNOWN;
-    }
-    return RESULT_SUCCESS;
-}
-
-static CoAuthSchedule *CreateCoauthSchedule(uint32_t userId, uint64_t contextId, uint32_t authType)
-{
-    CredentialInfoHal credential;
-    ResultCode ret = QueryCredentialInfo(userId, authType, &credential);
-    if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("query credential info failed");
-        return NULL;
-    }
-
-    CoAuthSchedule *schedule = GenerateAuthSchedule(contextId, authType, DEFAULT_TYPE, credential.templateId);
-    if (schedule == NULL) {
-        LOG_ERROR("schedule is null");
-        return NULL;
-    }
-    ret = AddCoAuthSchedule(schedule);
-    if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("AddCoAuthSchedule failed");
-        DestroyCoAuthSchedule(schedule);
-        return NULL;
-    }
-    return schedule;
-}
-
-static bool IsContextDuplicate(uint64_t contextId)
-{
-    if (g_contextList == NULL) {
-        LOG_ERROR("context list is null");
-        return false;
-    }
-    LinkedListNode *tempNode = g_contextList->head;
-    while (tempNode != NULL) {
-        UserAuthContext *context = tempNode->data;
-        if (context == NULL) {
-            LOG_ERROR("context is null, please check");
-            continue;
-        }
-        if (context->contextId == contextId) {
-            return true;
-        }
-        tempNode = tempNode->next;
-    }
-    return false;
-}
-
-ResultCode GetScheduleIds(UserAuthContext *context, uint64_t **scheduleIds, uint32_t *scheduleNum)
-{
-    if (context == NULL || context->scheduleList == NULL || scheduleIds == NULL || scheduleNum == NULL) {
-        LOG_ERROR("param is null");
-        return RESULT_BAD_PARAM;
-    }
-    LinkedList *schedules = context->scheduleList;
-    *scheduleNum = schedules->getSize(schedules);
-    *scheduleIds = Malloc(*scheduleNum * sizeof(uint64_t));
-    if (*scheduleNum == 0) {
-        return RESULT_SUCCESS;
-    }
-    if (*scheduleIds == NULL) {
-        LOG_ERROR("scheduleIds malloc failed");
-        return RESULT_NO_MEMORY;
-    }
-
-    LinkedListNode *temp = schedules->head;
-    for (uint32_t index = 0; index < *scheduleNum; index++) {
-        if (temp == NULL) {
-            LOG_ERROR("something is wrong, please check");
-            goto EXIT;
-        }
-        CoAuthSchedule *schedule = temp->data;
-        if (schedule == NULL) {
-            LOG_ERROR("data is null");
-            goto EXIT;
-        }
-        (*scheduleIds)[index] = schedule->scheduleId;
-        temp = temp->next;
-    }
-    return RESULT_SUCCESS;
-
-EXIT:
-    Free(scheduleIds);
-    *scheduleIds = NULL;
-    return RESULT_GENERAL_ERROR;
-}
-
-static bool MatchSchedule(void *data, void *condition)
-{
-    if (data == NULL || condition == NULL) {
-        LOG_ERROR("param is null");
-        return false;
-    }
-    CoAuthSchedule *schedule = (CoAuthSchedule *)data;
-    if (schedule->scheduleId == *(uint64_t *)condition) {
-        return true;
-    }
-    return false;
-}
-
-ResultCode ScheduleOnceFinish(UserAuthContext *context, uint64_t scheduleId)
-{
-    if (context == NULL || context->scheduleList == NULL) {
-        LOG_ERROR("param is null");
-        return RESULT_BAD_PARAM;
-    }
-    return context->scheduleList->remove(context->scheduleList, &scheduleId, MatchSchedule);
-}
-
-static bool MatchContextSelf(void *data, void *condition)
-{
-    return data == condition;
-}
-
-void DestoryContext(UserAuthContext *context)
-{
-    if (context == NULL) {
-        LOG_ERROR("context is null");
-        return;
-    }
-
-    g_contextList->remove(g_contextList, context, MatchContextSelf);
-}
-
-static void DestroyContextNode(void *data)
-{
-    if (data == NULL) {
-        return;
-    }
-    LinkedList *schedules = ((UserAuthContext *)data)->scheduleList;
-    if (schedules != NULL) {
-        DestroyLinkedList(schedules);
-    }
-    Free(data);
-}