diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
index 3f2eb7f0e..f04a00710 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
@@ -50,12 +50,12 @@ public class DigitalSignatureService {
 
     public void updateDigitalSignature(DigitalSignature digitalSignatureModel) {
 
-        digitalSignatureRepository.findById(DigitalSignature.ID).ifPresentOrElse((digitalSignature -> {
+        digitalSignatureRepository.findById(DigitalSignature.ID).ifPresentOrElse(digitalSignature -> {
             digitalSignature.setCertificateName(digitalSignatureModel.getCertificateName());
             digitalSignature.setLocation(digitalSignatureModel.getLocation());
             digitalSignature.setContactInfo(digitalSignatureModel.getContactInfo());
             digitalSignature.setReason(digitalSignatureModel.getReason());
-        }), () -> {
+        }, () -> {
             throw new NotFoundException("Digital Signature Not found");
         });
     }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java
index 5cea4a250..656d037e1 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java
@@ -49,7 +49,7 @@ public class FileService {
         var dossier = dossierPersistenceService.getAndValidateDossier(request.getDossierId());
 
         var fileId = generateFileId(request);
-        var existingStatus = retrieveStatus(dossier.getId(), fileId);
+        var existingStatus = retrieveStatus(fileId);
 
         if (existingStatus != null) {
             if (existingStatus.getStatus().name().equals(Status.APPROVED.name())) {
@@ -87,7 +87,7 @@ public class FileService {
     }
 
 
-    private File retrieveStatus(String dossierId, String fileId) {
+    private File retrieveStatus(String fileId) {
 
         try {
             return fileStatusService.getStatus(fileId);
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileStatusService.java
index e6b054e6c..d4719934e 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileStatusService.java
@@ -15,7 +15,6 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Hibernate;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
@@ -212,7 +211,7 @@ public class FileStatusService {
             return;
         }
 
-        var fileAttributes = fileStatus.getFileAttributes();
+//        var fileAttributes = fileStatus.getFileAttributes();
 
         setStatusProcessing(fileId);
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/ManualRedactionService.java
index f65b75303..5741957b6 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/ManualRedactionService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/ManualRedactionService.java
@@ -43,7 +43,7 @@ public class ManualRedactionService {
 
     public ManualAddResponse addAddRedaction(String dossierId, String fileId, AddRedactionRequest addRedactionRequest) {
 
-        var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
+        dossierPersistenceService.getAndValidateDossier(dossierId);
 
         if (addRedactionRequest.isAddToDictionary()) {
             try {
@@ -82,7 +82,7 @@ public class ManualRedactionService {
     public ManualAddResponse addRemoveRedaction(String dossierId, String fileId,
                                                 RemoveRedactionRequest removeRedactionRequest) {
 
-        var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
+        dossierPersistenceService.getAndValidateDossier(dossierId);
 
         OffsetDateTime now = OffsetDateTime.now();
         removeRedactionPersistenceService.insert(fileId, removeRedactionRequest);
@@ -261,8 +261,10 @@ public class ManualRedactionService {
 
     public void deleteRemoveRedaction(String dossierId, String fileId, String annotationId) {
 
+        dossierPersistenceService.getAndValidateDossier(dossierId);
+
         var removeRedaction = getRemoveRedaction(fileId, annotationId);
-        var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
+
         handleRemoveFromDictionary(dossierId, fileId, annotationId, removeRedaction.getStatus(),
                 removeRedaction.isRemoveFromDictionary(), true);
         removeRedactionPersistenceService.softDelete(fileId, annotationId, OffsetDateTime.now());
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java
index a579c801a..f932dc8ec 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java
@@ -48,7 +48,7 @@ public class DownloadPreparationService {
         try (FileSystemBackedArchiver fileSystemBackedArchiver = new FileSystemBackedArchiver()) {
 
             generateAndAddFiles(downloadStatus, fileSystemBackedArchiver, dossier.isWatermarkEnabled());
-            addReports(reportResultMessage, downloadStatus, fileSystemBackedArchiver, dossier.getDossierTemplateId());
+            addReports(reportResultMessage, fileSystemBackedArchiver);
             storeZipFile(downloadStatus, fileSystemBackedArchiver);
 
             downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatus.DownloadStatusValue.READY, fileSystemBackedArchiver
@@ -99,8 +99,7 @@ public class DownloadPreparationService {
     }
 
 
-    private void addReports(ReportResultMessage reportResultMessage, DownloadStatus downloadStatus,
-                            FileSystemBackedArchiver fileSystemBackedArchiver, String dossierTemplateId) {
+    private void addReports(ReportResultMessage reportResultMessage, FileSystemBackedArchiver fileSystemBackedArchiver) {
 
         long addReportsStart = System.currentTimeMillis();
         for (StoredFileInformation storedFileInformation : reportResultMessage.getStoredFileInformation()) {