diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
index 23e5c9d2..27bf88f2 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import org.junit.Assert;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,7 +43,9 @@ public class RuleBuilderController implements RuleBuilderResource {
 
         RulesResponse rulesResponse = new RulesResponse();
         String filteredRules = this.ruleBuilderService.cleanRuleFileOfSystemRules(systemRulesSeperationRequest.getRules(), true);
-        Assert.assertFalse("There was an error when cleaning the rulefile of system rules", filteredRules.isEmpty());
+        if (filteredRules.isEmpty()) {
+            throw new RuntimeException("There was an error when cleaning the rulefile of sytem rules");
+        }
         rulesResponse.setRules(filteredRules);
         return rulesResponse;
     }
@@ -56,7 +57,9 @@ public class RuleBuilderController implements RuleBuilderResource {
         RulesResponse rulesResponse = new RulesResponse();
         DroolsValidationResponse droolsValidationResponse;
         RuleMergingResult mergingResult = ruleBuilderService.mergeUserRulesAndSystemRules(rulesUpdateRequest.getExistingRules(), rulesUpdateRequest.getUpdatedRules());
-        Assert.assertFalse("There was an error when merging the user rule update", mergingResult.getMergedRules().isEmpty());
+        if (mergingResult.getMergedRules().isEmpty()) {
+            throw new RuntimeException("There was an error when merging the user rule update into the rule file");
+        }
         try {
             var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules()));
             droolsValidationResponse = DroolsValidationResponse.builder()
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SuperSection.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SuperSection.java
index 801190f1..1c0ef665 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SuperSection.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SuperSection.java
@@ -2,7 +2,6 @@ package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.FieldDefaults;
@@ -46,7 +45,6 @@ public class SuperSection extends AbstractSemanticNode {
     }
 
 
-
     @Override
     public String toString() {
 
@@ -86,5 +84,4 @@ public class SuperSection extends AbstractSemanticNode {
         return streamAllSubNodesOfType(NodeType.HEADLINE).anyMatch(h -> h.containsStringIgnoreCase(value));
     }
 
-
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleCompilationResult.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleCompilationResult.java
index b69c629c..c7e35460 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleCompilationResult.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleCompilationResult.java
@@ -51,7 +51,7 @@ public final class RuleCompilationResult {
 
         List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
                 .filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType))
-                .collect(Collectors.toList());
+                .toList();
         log.info("rules to be removed {}", rulesToBeRemoved);
         ruleClasses.removeAll(rulesToBeRemoved);
     }
@@ -63,7 +63,7 @@ public final class RuleCompilationResult {
 
         List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
                 .filter(ruleClass -> filterOutRule(ruleClass.ruleType(), systemRules))
-                .collect(Collectors.toList());
+                .toList();
         log.info("rules to be removed {}", rulesToBeRemoved);
         ruleClasses.removeAll(rulesToBeRemoved);
     }
@@ -87,7 +87,7 @@ public final class RuleCompilationResult {
 
         List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
                 .filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType))
-                .collect(Collectors.toList());
+                .toList();
         return rulesToBeRemoved.size();
     }
 
@@ -100,7 +100,7 @@ public final class RuleCompilationResult {
 
     public Set<String> getImportSplitByKeyword() {
 
-        return Arrays.stream(imports.replaceAll("\n", "").split("import"))
+        return Arrays.stream(imports.replace("\n", "").split("import"))
                 .map(String::trim)
                 .collect(Collectors.toSet());
     }
@@ -129,7 +129,7 @@ public final class RuleCompilationResult {
     public List<RuleIdentifier> getAllRuleIdentifiers() {
 
         return streamAllRules().map(BasicRule::getIdentifier)
-                .collect(Collectors.toList());
+                .toList();
     }