diff --git a/benchmark-rest/.attach_pid18032 b/benchmark-rest/.attach_pid18032
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/benchmark-rest/.attach_pid18905 b/benchmark-rest/.attach_pid18905
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/benchmark-rest/.attach_pid21332 b/benchmark-rest/.attach_pid21332
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/benchmark-rest/README.md b/benchmark-rest/README.md
deleted file mode 100644
index 8621646be9..0000000000
--- a/benchmark-rest/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### How to run a Gatling simulation
- - Below are two ways to run a simulation. You can pick one approach.
-#### Approach 1: Run simulation `AccessionRetrievalSimulation`
-```
-mvn test -Pbenchmark -Dgatling.simulationClass=AccessionRetrievalSimulation
-```
-#### Approach 2: Run simulation `FiltersWithDownloadSimulation`
-```
-mvn gatling:test -Dgatling.simulationClass=FiltersWithDownloadSimulation
-```
-- *The report will be generated in `target/gatling`.*
-- *The default server being used for simulation is `http://wwwdev.ebi.ac.uk`.*
-
-###### See the configuration in application.properties and other files in `src/test/resources` folder.
-
-#### Each Simulation scala class is divided into 4 sections :
-1. A class which extends Simulation base class
-2. Common http Configuration
-3. Scenario creation where we define what this scenario will do. The core of the testing.
-4. Simulation setup where we configure the number of concurrent users and assert the response time and or success rate.
-
diff --git a/benchmark-rest/pom.xml b/benchmark-rest/pom.xml
deleted file mode 100644
index 8c120412b1..0000000000
--- a/benchmark-rest/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
- 4.0.0
-
- org.uniprot
- uniprot-rest-api
- 1.0.37-SNAPSHOT
-
- benchmark-rest
-
-
- UTF-8
- 3.3.0
- 3.1.2
-
-
-
-
- org.uniprot
- core-common
- ${project.parent.version}
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
-
-
-
- org.projectlombok
- lombok
- true
-
-
-
-
- com.beust
- jcommander
- 1.81
-
-
-
-
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
-
-
- ch.qos.logback
- logback-classic
- ${logback.version}
-
-
-
-
- io.gatling.highcharts
- gatling-charts-highcharts
- ${gatling.highcharts.version}
- test
-
-
-
-
-
-
- io.gatling
- gatling-maven-plugin
- ${gatling-plugin.version}
-
-
-
-
-
- ${properties.dir}
-
- application.properties
-
-
-
-
-
-
-
- benchmark
-
-
-
- io.gatling
- gatling-maven-plugin
- ${gatling-plugin.version}
-
-
- test
-
- test
-
-
- target/gatling/results/advanced-search
- src/test/scala/advanced-search/
- true
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/benchmark-rest/src/test/java/org/uniprot/benchmark/idmapping/IdMappingCheckResponseTimes.java b/benchmark-rest/src/test/java/org/uniprot/benchmark/idmapping/IdMappingCheckResponseTimes.java
deleted file mode 100644
index 05ecef8af6..0000000000
--- a/benchmark-rest/src/test/java/org/uniprot/benchmark/idmapping/IdMappingCheckResponseTimes.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.uniprot.benchmark.idmapping;
-
-import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import org.springframework.http.*;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StopWatch;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-import org.uniprot.core.util.Utils;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Strings;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Interrogate a running Id Mapping service and determine how long fetching from PIR takes, and how
- * long it takes to process the results (including facet computation).
- *
- * The following shows sample program arguments one might wish to pass:
- *
- *
- * - -to UniProtKB
- *
- -from EMBL-GenBank-DDBJ_CDS
- *
- -host http://localhost:8090
- *
- -idMappingPath /uniprot/api/idmapping
- *
- -idFile -resultsParams
- * "facets=reviewed,model_organism,proteins_with,existence,annotation_score,length"
- *
- *
- * Created 09/03/2021
- *
- * @author Edd
- */
-@Slf4j
-public class IdMappingCheckResponseTimes {
- private static final HttpHeaders HTTP_HEADERS = new HttpHeaders();
- private final RestTemplate restTemplate =
- new RestTemplate(
- (new SimpleClientHttpRequestFactory() {
- protected void prepareConnection(
- HttpURLConnection connection, String httpMethod)
- throws IOException {
- super.prepareConnection(connection, httpMethod);
- connection.setInstanceFollowRedirects(false);
- }
- }));
- private final String from;
- private final String to;
- private final String host;
- private final String ids;
-
- static {
- HTTP_HEADERS.setContentType(APPLICATION_FORM_URLENCODED);
- HTTP_HEADERS.setAccept(List.of(APPLICATION_JSON));
- }
-
- private final String idMappingPath;
- private final StopWatch stopWatch;
- private final String resultsParams;
- private final String idFilePath;
-
- public IdMappingCheckResponseTimes(Parameters parameters) {
- from = parameters.from;
- to = parameters.to;
- host = parameters.host;
- idMappingPath = parameters.idMappingPath;
- idFilePath = parameters.idFile;
- if (Utils.notNullNotEmpty(parameters.ids)) {
- ids = parameters.ids;
- } else {
- ids = initIds();
- }
- stopWatch = new StopWatch();
- resultsParams =
- Utils.notNull(parameters.resultsParams) ? "?" + parameters.resultsParams : "";
- }
-
- private String initIds() {
- List ids = new ArrayList<>();
- try {
- // try to read file of IDs. If there is a problem with it, read from stdin
- InputStream in = System.in;
- if (Utils.notNullNotEmpty(idFilePath)) {
- in = new FileInputStream(idFilePath);
- }
- try (InputStreamReader streamReader = new InputStreamReader(in);
- BufferedReader reader = new BufferedReader(streamReader)) {
- String line;
- while ((line = reader.readLine()) != null) {
- ids.add(line.replace("\n", ""));
- }
- } catch (IOException ioException) {
- ioException.printStackTrace();
- System.exit(1);
- }
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
-
- return Strings.join(",", ids);
- }
-
- private void processAll() {
- log.info("===============================");
- log.info("MAPPING REQUEST INFO: STARTING");
- log.info("\tFrom: {}", from);
- log.info("\tTo: {}", to);
- int truncateIdsPos = Math.min(ids.length(), 40);
- log.info("\tIds: {} ...", ids.substring(0, truncateIdsPos));
- log.info("\tId count: {}", ids.chars().filter(c -> c == ',').count() + 1);
- log.info(
- "\tResult request params: {}",
- Utils.notNullNotEmpty(resultsParams) ? resultsParams : "");
-
- UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(runUrl());
-
- HttpEntity> requestBody =
- new HttpEntity<>(createPostBody(), HTTP_HEADERS);
-
- // ---- SUBMIT JOB ----
- stopWatch.start(builder.toUriString());
- ResponseEntity responseResponseEntity =
- restTemplate.postForEntity(builder.toUriString(), requestBody, JobIdResponse.class);
- stopWatch.stop();
-
- if (responseResponseEntity.getStatusCode().equals(HttpStatus.OK)) {
- JobIdResponse jobIdResponse = responseResponseEntity.getBody();
-
- String jobId = Objects.requireNonNull(jobIdResponse).getJobId();
-
- HttpEntity