diff --git a/services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp b/services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp
index a7650bf1c..5b30da4fd 100644
--- a/services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp
+++ b/services/backup/docker-server/contents/server/src/BackupServiceImpl.cpp
@@ -1,120 +1,98 @@
 #include "BackupServiceImpl.h"
 
 #include "BidiReactorBase.h"
 #include "ReadReactorBase.h"
 
 #include <aws/core/Aws.h>
 
 namespace comm {
 namespace network {
 
 BackupServiceImpl::BackupServiceImpl() {
   Aws::InitAPI({});
 }
 
 BackupServiceImpl::~BackupServiceImpl() {
   Aws::ShutdownAPI({});
 }
 
 grpc::ServerBidiReactor<
     backup::CreateNewBackupRequest,
     backup::CreateNewBackupResponse> *
 BackupServiceImpl::CreateNewBackup(grpc::CallbackServerContext *context) {
   class CreateNewBackupReactor : public BidiReactorBase<
                                      backup::CreateNewBackupRequest,
                                      backup::CreateNewBackupResponse> {
-    auth::AuthenticationManager authenticationManager;
-
   public:
     std::unique_ptr<grpc::Status> handleRequest(
         backup::CreateNewBackupRequest request,
         backup::CreateNewBackupResponse *response) override {
-      if (this->authenticationManager.getState() !=
-              auth::AuthenticationState::SUCCESS &&
-          !request.has_authenticationrequestdata()) {
-        return std::make_unique<grpc::Status>(
-            grpc::StatusCode::INTERNAL,
-            "authentication has not been finished properly");
-      }
-      if (this->authenticationManager.getState() ==
-          auth::AuthenticationState::FAIL) {
-        return std::make_unique<grpc::Status>(
-            grpc::StatusCode::INTERNAL, "authentication failure");
-      }
-      if (this->authenticationManager.getState() !=
-          auth::AuthenticationState::SUCCESS) {
-        backup::FullAuthenticationResponseData *authResponse =
-            this->authenticationManager.processRequest(
-                request.authenticationrequestdata());
-        response->set_allocated_authenticationresponsedata(authResponse);
-        return nullptr;
-      }
       // TODO handle request
       return std::make_unique<grpc::Status>(
           grpc::StatusCode::UNIMPLEMENTED, "unimplemented");
     }
   };
 
   return new CreateNewBackupReactor();
 }
 
 grpc::ServerReadReactor<backup::SendLogRequest> *BackupServiceImpl::SendLog(
     grpc::CallbackServerContext *context,
     google::protobuf::Empty *response) {
   class SendLogReactor : public ReadReactorBase<
                              backup::SendLogRequest,
                              google::protobuf::Empty> {
   public:
     using ReadReactorBase<backup::SendLogRequest, google::protobuf::Empty>::
         ReadReactorBase;
     std::unique_ptr<grpc::Status>
     readRequest(backup::SendLogRequest request) override {
       // TODO handle request
       return std::make_unique<grpc::Status>(
           grpc::StatusCode::UNIMPLEMENTED, "unimplemented");
     }
   };
 
   return new SendLogReactor(response);
 }
 
 grpc::ServerBidiReactor<
     backup::RecoverBackupKeyRequest,
     backup::RecoverBackupKeyResponse> *
 BackupServiceImpl::RecoverBackupKey(grpc::CallbackServerContext *context) {
   class RecoverBackupKeyReactor : public BidiReactorBase<
                                       backup::RecoverBackupKeyRequest,
                                       backup::RecoverBackupKeyResponse> {
   public:
     std::unique_ptr<grpc::Status> handleRequest(
         backup::RecoverBackupKeyRequest request,
         backup::RecoverBackupKeyResponse *response) override {
       // TODO handle request
       return std::make_unique<grpc::Status>(
           grpc::StatusCode::UNIMPLEMENTED, "unimplemented");
     }
   };
 
   return new RecoverBackupKeyReactor();
 }
 
 grpc::ServerBidiReactor<backup::PullBackupRequest, backup::PullBackupResponse> *
 BackupServiceImpl::PullBackup(grpc::CallbackServerContext *context) {
   class PullBackupReactor : public BidiReactorBase<
                                 backup::PullBackupRequest,
                                 backup::PullBackupResponse> {
   public:
     std::unique_ptr<grpc::Status> handleRequest(
         backup::PullBackupRequest request,
         backup::PullBackupResponse *response) override {
       // TODO handle request
       return std::make_unique<grpc::Status>(
           grpc::StatusCode::UNIMPLEMENTED, "unimplemented");
     }
   };
 
   return new PullBackupReactor();
 }
 
 } // namespace network
 } // namespace comm