diff --git a/src/main/java/eu/dissco/core/translator/repository/SourceSystemRepository.java b/src/main/java/eu/dissco/core/translator/repository/SourceSystemRepository.java
index 97eed40..0776c77 100644
--- a/src/main/java/eu/dissco/core/translator/repository/SourceSystemRepository.java
+++ b/src/main/java/eu/dissco/core/translator/repository/SourceSystemRepository.java
@@ -5,7 +5,6 @@
 import eu.dissco.core.translator.domain.SourceSystemInformation;
 import lombok.RequiredArgsConstructor;
 import org.jooq.DSLContext;
-import org.jooq.Record1;
 import org.jooq.Record2;
 import org.springframework.stereotype.Repository;
 
@@ -23,7 +22,7 @@ public SourceSystemInformation getSourceSystem(String sourceSystemId) {
   }
 
   private SourceSystemInformation mapToSourceSystemInformation(
-      Record2<String, String> record) {
-    return new SourceSystemInformation(record.value1(), record.value2());
+      Record2<String, String> dbRecord) {
+    return new SourceSystemInformation(dbRecord.value1(), dbRecord.value2());
   }
 }
diff --git a/src/main/java/eu/dissco/core/translator/service/DwcaService.java b/src/main/java/eu/dissco/core/translator/service/DwcaService.java
index 13c47a0..e280d01 100644
--- a/src/main/java/eu/dissco/core/translator/service/DwcaService.java
+++ b/src/main/java/eu/dissco/core/translator/service/DwcaService.java
@@ -19,9 +19,7 @@
 import eu.dissco.core.translator.properties.DwcaProperties;
 import eu.dissco.core.translator.properties.EnrichmentProperties;
 import eu.dissco.core.translator.properties.FdoProperties;
-import eu.dissco.core.translator.properties.WebClientProperties;
 import eu.dissco.core.translator.repository.DwcaRepository;
-import eu.dissco.core.translator.repository.SourceSystemRepository;
 import eu.dissco.core.translator.terms.BaseDigitalObjectDirector;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/eu/dissco/core/translator/terms/BaseDigitalObjectDirector.java b/src/main/java/eu/dissco/core/translator/terms/BaseDigitalObjectDirector.java
index acefbd5..882c752 100644
--- a/src/main/java/eu/dissco/core/translator/terms/BaseDigitalObjectDirector.java
+++ b/src/main/java/eu/dissco/core/translator/terms/BaseDigitalObjectDirector.java
@@ -7,7 +7,6 @@
 import eu.dissco.core.translator.exception.OrganisationException;
 import eu.dissco.core.translator.exception.UnknownPhysicalSpecimenIdType;
 import eu.dissco.core.translator.properties.FdoProperties;
-import eu.dissco.core.translator.properties.WebClientProperties;
 import eu.dissco.core.translator.schema.Agent;
 import eu.dissco.core.translator.schema.Citation;
 import eu.dissco.core.translator.schema.DigitalMedia;
diff --git a/src/main/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirector.java b/src/main/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirector.java
index aeb47d5..9013737 100644
--- a/src/main/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirector.java
+++ b/src/main/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirector.java
@@ -6,7 +6,6 @@
 import eu.dissco.core.translator.component.OrganisationNameComponent;
 import eu.dissco.core.translator.component.SourceSystemComponent;
 import eu.dissco.core.translator.properties.FdoProperties;
-import eu.dissco.core.translator.properties.WebClientProperties;
 import eu.dissco.core.translator.schema.Citation;
 import eu.dissco.core.translator.schema.DigitalSpecimen;
 import eu.dissco.core.translator.schema.Identification;
diff --git a/src/main/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirector.java b/src/main/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirector.java
index bdb89a3..91f4878 100644
--- a/src/main/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirector.java
+++ b/src/main/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirector.java
@@ -6,7 +6,6 @@
 import eu.dissco.core.translator.component.OrganisationNameComponent;
 import eu.dissco.core.translator.component.SourceSystemComponent;
 import eu.dissco.core.translator.properties.FdoProperties;
-import eu.dissco.core.translator.properties.WebClientProperties;
 import eu.dissco.core.translator.schema.Citation;
 import eu.dissco.core.translator.schema.DigitalSpecimen;
 import eu.dissco.core.translator.schema.Identification;
diff --git a/src/test/java/eu/dissco/core/translator/service/BioCaseServiceTest.java b/src/test/java/eu/dissco/core/translator/service/BioCaseServiceTest.java
index 6d88961..d9c0477 100644
--- a/src/test/java/eu/dissco/core/translator/service/BioCaseServiceTest.java
+++ b/src/test/java/eu/dissco/core/translator/service/BioCaseServiceTest.java
@@ -1,16 +1,12 @@
 package eu.dissco.core.translator.service;
 
-import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_ID;
-import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_NAME;
 import static eu.dissco.core.translator.TestUtils.givenDigitalMedia;
 import static eu.dissco.core.translator.TestUtils.givenDigitalSpecimen;
-import static eu.dissco.core.translator.TestUtils.givenSourceSystemInformation;
 import static eu.dissco.core.translator.TestUtils.loadResourceFile;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.times;
@@ -24,7 +20,6 @@
 import eu.dissco.core.translator.properties.EnrichmentProperties;
 import eu.dissco.core.translator.properties.FdoProperties;
 import eu.dissco.core.translator.properties.WebClientProperties;
-import eu.dissco.core.translator.repository.SourceSystemRepository;
 import eu.dissco.core.translator.schema.DigitalMedia;
 import eu.dissco.core.translator.schema.DigitalSpecimen;
 import eu.dissco.core.translator.terms.BaseDigitalObjectDirector;
diff --git a/src/test/java/eu/dissco/core/translator/service/DwcaServiceTest.java b/src/test/java/eu/dissco/core/translator/service/DwcaServiceTest.java
index 711841d..86acb39 100644
--- a/src/test/java/eu/dissco/core/translator/service/DwcaServiceTest.java
+++ b/src/test/java/eu/dissco/core/translator/service/DwcaServiceTest.java
@@ -2,10 +2,8 @@
 
 import static eu.dissco.core.translator.TestUtils.MAPPER;
 import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_ID;
-import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_NAME;
 import static eu.dissco.core.translator.TestUtils.givenDigitalMedia;
 import static eu.dissco.core.translator.TestUtils.givenDigitalSpecimen;
-import static eu.dissco.core.translator.TestUtils.givenSourceSystemInformation;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -28,9 +26,7 @@
 import eu.dissco.core.translator.properties.DwcaProperties;
 import eu.dissco.core.translator.properties.EnrichmentProperties;
 import eu.dissco.core.translator.properties.FdoProperties;
-import eu.dissco.core.translator.properties.WebClientProperties;
 import eu.dissco.core.translator.repository.DwcaRepository;
-import eu.dissco.core.translator.repository.SourceSystemRepository;
 import eu.dissco.core.translator.schema.DigitalMedia;
 import eu.dissco.core.translator.schema.DigitalSpecimen;
 import eu.dissco.core.translator.terms.BaseDigitalObjectDirector;
diff --git a/src/test/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirectorTest.java b/src/test/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirectorTest.java
index afede38..11556ee 100644
--- a/src/test/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirectorTest.java
+++ b/src/test/java/eu/dissco/core/translator/terms/BiocaseDigitalObjectDirectorTest.java
@@ -1,7 +1,6 @@
 package eu.dissco.core.translator.terms;
 
 import static eu.dissco.core.translator.TestUtils.MAPPER;
-import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirectorTest.java b/src/test/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirectorTest.java
index 63c20d0..e74d906 100644
--- a/src/test/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirectorTest.java
+++ b/src/test/java/eu/dissco/core/translator/terms/DwcaDigitalObjectDirectorTest.java
@@ -1,7 +1,6 @@
 package eu.dissco.core.translator.terms;
 
 import static eu.dissco.core.translator.TestUtils.MAPPER;
-import static eu.dissco.core.translator.TestUtils.SOURCE_SYSTEM_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/eu/dissco/core/translator/terms/specimen/identification/AbcdTypeInformationTest.java b/src/test/java/eu/dissco/core/translator/terms/specimen/identification/AbcdTypeInformationTest.java
index 27f754c..c956771 100644
--- a/src/test/java/eu/dissco/core/translator/terms/specimen/identification/AbcdTypeInformationTest.java
+++ b/src/test/java/eu/dissco/core/translator/terms/specimen/identification/AbcdTypeInformationTest.java
@@ -1,7 +1,6 @@
 package eu.dissco.core.translator.terms.specimen.identification;
 
 import static eu.dissco.core.translator.TestUtils.MAPPER;
-import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import eu.dissco.core.translator.schema.DigitalSpecimen;