diff --git a/docker-compose.yml b/docker-compose.yml
index b4a20ccca..698de2fc3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,6 @@ services:
     - schema-store
     volumes:
     - logs:/logs
-    - "/mnt/c/Users/dgupta/secrets:/secrets"
     command:
     - java
     - -jar
@@ -101,7 +100,6 @@ services:
       - rabbitmq
     volumes:
       - logs:/logs
-      - "/mnt/c/Users/dgupta/secrets:/secrets"
     command:
       - java
       - -jar
diff --git a/webapps/core/src/main/java/uk/ac/ebi/biosamples/service/SamplePageService.java b/webapps/core/src/main/java/uk/ac/ebi/biosamples/service/SamplePageService.java
index daca984ae..15cb77ffd 100644
--- a/webapps/core/src/main/java/uk/ac/ebi/biosamples/service/SamplePageService.java
+++ b/webapps/core/src/main/java/uk/ac/ebi/biosamples/service/SamplePageService.java
@@ -99,11 +99,7 @@ public Page<Sample> getSamplesByText(
         pageFutureSample.map(
             ss -> {
               try {
-                if (ss.get().isPresent()) {
-                  return ss.get().get();
-                } else {
-                  return null;
-                }
+                return ss.get().orElse(null);
               } catch (final InterruptedException | ExecutionException e) {
                 throw new RuntimeException(e);
               }
@@ -143,7 +139,7 @@ private List<Sample> collectSampleFutures(final List<Future<Optional<Sample>>> l
         .map(
             ss -> {
               try {
-                return ss.get().get();
+                return ss.get().orElse(null);
               } catch (final InterruptedException | ExecutionException e) {
                 throw new RuntimeException(e);
               }