diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index bc4b4d6b8fda91268a2303c47c4278f859af1070..895af7e533a77eaf9acbb1f76367cfc84e8ed9ac 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -391,55 +391,6 @@ auto Transaction::ExecuteAsynchronously() noexcept -> StatusCode {
 }
 
 auto Transaction::WaitForIt() const noexcept -> TransactionStatus {
-  // if (this->response->responses_size() == 1) {
-  // auto *responses = this->response->mutable_responses(0);
-  // switch (responses->wrapped_response_case()) {
-  // case WrappedResponseCase::kRetrieveResponse: {
-  // auto *retrieve_response = responses->mutable_retrieve_response();
-  // switch (retrieve_response->query_response_case()) {
-  // case QueryResponseCase::kEntity: {
-  // auto *entity = retrieve_response->release_entity();
-  // if (!entity->errors().empty()) {
-  // this->status = TransactionStatus::TRANSACTION_ERROR(
-  //"The request returned with errors.");
-  //}
-  // this->result_set = std::make_unique<UniqueResult>(entity);
-  //} break;
-  // case QueryResponseCase::kSelectResult: {
-  //// TODO(tf) Select queries
-  //} break;
-  // case QueryResponseCase::kCountResult: {
-  // this->query_count = retrieve_response->count_result();
-  // std::vector<std::unique_ptr<Entity>> entities;
-  // this->result_set =
-  // std::make_unique<MultiResultSet>(std::move(entities));
-  //} break;
-  // default:
-  //// TODO(tf) Error
-  // break;
-  //}
-  //} break;
-  // case WrappedResponseCase::kUpdateResponse: {
-  // auto *updatedIdResponse = responses->mutable_update_response();
-  // if (!updatedIdResponse->entity_errors().empty()) {
-  // this->status = TransactionStatus::TRANSACTION_ERROR(
-  //"The request returned with errors.");
-  //}
-  // this->result_set = std::make_unique<UniqueResult>(updatedIdResponse);
-  //} break;
-  // case WrappedResponseCase::kInsertResponse: {
-  // auto *insertedIdResponse = responses->mutable_insert_response();
-  // if (!insertedIdResponse->entity_errors().empty()) {
-  // this->status = TransactionStatus::TRANSACTION_ERROR(
-  //"The request returned with errors.");
-  //}
-  // this->result_set = std::make_unique<UniqueResult>(insertedIdResponse);
-  //} break;
-  // default:
-  //// TODO(tf) Error and Update
-  // break;
-  //}
-  //} else {
   bool set_error = false;
   auto *responses = this->response->mutable_responses();
   std::vector<std::unique_ptr<Entity>> entities;
@@ -479,73 +430,6 @@ auto Transaction::WaitForIt() const noexcept -> TransactionStatus {
         CAOSDB_LOG_FATAL(logger_name) << "Received invalid QueryResponseCase.";
         break;
       }
-      //<<<<<<< HEAD
-      //} break;
-      // case WrappedResponseCase::kUpdateResponse: {
-      // auto *updatedIdResponse = responses->mutable_update_response();
-      // if (!updatedIdResponse->id_response().errors().empty()) {
-      // this->status = TransactionStatus::TRANSACTION_ERROR(
-      //"The request returned with errors.");
-      //}
-      // this->result_set = std::make_unique<UniqueResult>(
-      // updatedIdResponse->release_id_response());
-      //} break;
-      // case WrappedResponseCase::kInsertResponse: {
-      // auto *insertedIdResponse = responses->mutable_insert_response();
-      // if (!insertedIdResponse->id_response().errors().empty()) {
-      // this->status = TransactionStatus::TRANSACTION_ERROR(
-      //"The request returned with errors.");
-      //}
-      // this->result_set = std::make_unique<UniqueResult>(
-      // insertedIdResponse->release_id_response());
-      //} break;
-      // case WrappedResponseCase::kDeleteResponse: {
-      // auto *deletedIdResponse = responses->mutable_delete_response();
-      // if (!deletedIdResponse->id_response().errors().empty()) {
-      // this->status = TransactionStatus::TRANSACTION_ERROR(
-      //"The request returned with errors.");
-      //}
-      // this->result_set = std::make_unique<UniqueResult>(
-      // deletedIdResponse->release_id_response());
-      //} break;
-      // default:
-      // CAOSDB_LOG_FATAL(logger_name) << "Received invalid
-      // WrappedResponseCase."; break;
-      //}
-      //} else {
-      // auto *responses = this->response->mutable_responses();
-      // std::vector<std::unique_ptr<Entity>> entities;
-      // CAOSDB_LOG_DEBUG(logger_name)
-      //<< "Number of subresponses: " << responses->size();
-      // for (auto sub_response : *responses) {
-      // switch (sub_response.wrapped_response_case()) {
-      // case TransactionResponseCase::kRetrieveResponse:
-      // entities.push_back(std::make_unique<Entity>(
-      // sub_response.mutable_retrieve_response()->release_entity_response()));
-      // break;
-      // case TransactionResponseCase::kInsertResponse:
-      // entities.push_back(std::make_unique<Entity>(
-      // sub_response.mutable_insert_response()->release_id_response()));
-      // break;
-      // case TransactionResponseCase::kDeleteResponse:
-      // entities.push_back(std::make_unique<Entity>(
-      // sub_response.mutable_delete_response()->release_id_response()));
-      // break;
-      // case TransactionResponseCase::kUpdateResponse:
-      // entities.push_back(std::make_unique<Entity>(
-      // sub_response.mutable_update_response()->release_id_response()));
-      // break;
-      // default:
-      // CAOSDB_LOG_FATAL(logger_name)
-      //<< "Received invalid TransactionResponseCase.";
-      // break;
-      //}
-      //}
-      // this->result_set =
-      // std::make_unique<MultiResultSet>(std::move(entities));
-      //=======
-
-      break;
     }
 
     case TransactionResponseCase::kInsertResponse: {
@@ -621,58 +505,4 @@ auto Transaction::RegisterUploadFile(RegisterFileUploadResponse *response)
   assert(ok);
 }
 
-// auto Transaction::UploadFile(FileUploadResponse *response,
-// const FileDescriptor &file_descriptor,
-// const std::string &registration_id) -> void {
-// grpc::Status grpc_status;
-// CompletionQueue cq;
-// grpc::ClientContext context;
-
-// FileUploadRequest request;
-// auto *chunk = request.mutable_chunk();
-// auto *file_transmission_id = chunk->mutable_file_transmission_id();
-// file_transmission_id->set_registration_id(registration_id);
-// file_transmission_id->set_file_id("test.txt");
-// chunk->set_data("this is some data");
-
-// std::unique_ptr<ClientAsyncResponseReader<FileUploadResponse>> rpc(
-// this->file_service->PrepareAsyncFileUpload(&context, request, &cq));
-
-// rpc->StartCall();
-
-// int tag = 1;
-// void *send_tag = static_cast<void *>(&tag);
-// rpc->Finish(response, &grpc_status, send_tag);
-// void *recv_tag = nullptr;
-// bool ok = false;
-
-// cq.Next(&recv_tag, &ok);
-// assert(recv_tag == send_tag);
-// assert(ok);
-//}
-
-// auto Transaction::DownloadFile(FileDownloadResponse *response,
-// const FileTransmissionId &file_transmission_id)
-//-> void {
-
-// FileDownloadRequest request;
-// request.mutable_file_transmission_id()->CopyFrom(file_transmission_id);
-// grpc::Status grpc_status;
-// CompletionQueue cq;
-
-// grpc::ClientContext context;
-// std::unique_ptr<ClientAsyncResponseReader<FileDownloadResponse>> rpc(
-// this->file_service->PrepareAsyncFileDownload(&context, request, &cq));
-
-// rpc->StartCall();
-
-// int tag = 1;
-// void *send_tag = static_cast<void *>(&tag);
-// rpc->Finish(response, &grpc_status, send_tag);
-// void *recv_tag = nullptr;
-// bool ok = false;
-
-// cq.Next(&recv_tag, &ok);
-//}
-
 } // namespace caosdb::transaction