diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
index 5a7c835274b..db36fb763f8 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
@@ -24,14 +24,11 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import org.openmetadata.catalog.api.services.CreateMessagingService;
 import org.openmetadata.catalog.api.services.CreatePipelineService;
-import org.openmetadata.catalog.api.services.UpdateMessagingService;
 import org.openmetadata.catalog.api.services.UpdatePipelineService;
 import org.openmetadata.catalog.entity.data.Dashboard;
 import org.openmetadata.catalog.entity.services.MessagingService;
 import org.openmetadata.catalog.entity.services.PipelineService;
-import org.openmetadata.catalog.jdbi3.MessagingServiceRepository;
 import org.openmetadata.catalog.jdbi3.PipelineServiceRepository;
 import org.openmetadata.catalog.resources.Collection;
 import org.openmetadata.catalog.security.CatalogAuthorizer;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tasks/TaskResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tasks/TaskResource.java
index 6d928228c78..e4e222efa84 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tasks/TaskResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tasks/TaskResource.java
@@ -30,7 +30,6 @@ import org.openmetadata.catalog.api.data.CreateTask;
 import org.openmetadata.catalog.entity.data.Chart;
 import org.openmetadata.catalog.entity.data.Dashboard;
 import org.openmetadata.catalog.entity.data.Task;
-import org.openmetadata.catalog.jdbi3.ChartRepository;
 import org.openmetadata.catalog.jdbi3.TaskRepository;
 import org.openmetadata.catalog.resources.Collection;
 import org.openmetadata.catalog.security.CatalogAuthorizer;
diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/pipelines/PipelineResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/pipelines/PipelineResourceTest.java
index 1fe75cb749e..95e4c436acb 100644
--- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/pipelines/PipelineResourceTest.java
+++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/pipelines/PipelineResourceTest.java
@@ -468,16 +468,16 @@ public class PipelineResourceTest extends CatalogApplicationTest {
     // Ensure Pipeline ID can't be changed using patch
     Pipeline pipeline = createPipeline(create(test), adminAuthHeaders());
     UUID pipelineId = pipeline.getId();
-    String PipelineJson = JsonUtils.pojoToJson(pipeline);
+    String pipelineJson = JsonUtils.pojoToJson(pipeline);
     pipeline.setId(UUID.randomUUID());
     HttpResponseException exception = assertThrows(HttpResponseException.class, () ->
-            patchPipeline(pipelineId, PipelineJson, pipeline, adminAuthHeaders()));
+            patchPipeline(pipelineId, pipelineJson, pipeline, adminAuthHeaders()));
     assertResponse(exception, BAD_REQUEST, readOnlyAttribute(Entity.PIPELINE, "id"));
 
     // ID can't be deleted
     pipeline.setId(null);
     exception = assertThrows(HttpResponseException.class, () ->
-            patchPipeline(pipelineId, PipelineJson, pipeline, adminAuthHeaders()));
+            patchPipeline(pipelineId, pipelineJson, pipeline, adminAuthHeaders()));
     assertResponse(exception, BAD_REQUEST, readOnlyAttribute(Entity.PIPELINE, "id"));
   }
 
@@ -566,11 +566,11 @@ public class PipelineResourceTest extends CatalogApplicationTest {
   }
 
   // Make sure in GET operations the returned Pipeline has all the required information passed during creation
-  public static Pipeline getAndValidate(UUID PipelineId,
+  public static Pipeline getAndValidate(UUID pipelineId,
                                         CreatePipeline create,
                                         Map<String, String> authHeaders) throws HttpResponseException {
     // GET the newly created Pipeline by ID and validate
-    Pipeline pipeline = getPipeline(PipelineId, "service,owner,tasks", authHeaders);
+    Pipeline pipeline = getPipeline(pipelineId, "service,owner,tasks", authHeaders);
     validatePipeline(pipeline, create.getDescription(), create.getOwner(), create.getService());
 
     // GET the newly created Pipeline by name and validate
@@ -653,7 +653,7 @@ public class PipelineResourceTest extends CatalogApplicationTest {
   private static Pipeline validatePipeline(Pipeline pipeline, String expectedDescription,
                                              EntityReference expectedOwner, EntityReference expectedService,
                                               List<TagLabel> expectedTags,
-                                              List<EntityReference> TASKs) throws HttpResponseException {
+                                              List<EntityReference> tasks) throws HttpResponseException {
     assertNotNull(pipeline.getId());
     assertNotNull(pipeline.getHref());
     assertEquals(expectedDescription, pipeline.getDescription());
@@ -672,16 +672,16 @@ public class PipelineResourceTest extends CatalogApplicationTest {
       assertEquals(expectedService.getId(), pipeline.getService().getId());
       assertEquals(expectedService.getType(), pipeline.getService().getType());
     }
-    validatePipelineTASKs(pipeline, TASKs);
+    validatePipelineTASKs(pipeline, tasks);
     validateTags(expectedTags, pipeline.getTags());
     return pipeline;
   }
 
-  private static void validatePipelineTASKs(Pipeline pipeline, List<EntityReference> Tasks) {
-    if (Tasks != null) {
+  private static void validatePipelineTASKs(Pipeline pipeline, List<EntityReference> tasks) {
+    if (tasks != null) {
       List<UUID> expectedTASKReferences = new ArrayList<>();
-      for (EntityReference Task: Tasks) {
-        expectedTASKReferences.add(Task.getId());
+      for (EntityReference task: tasks) {
+        expectedTASKReferences.add(task.getId());
       }
       List<UUID> actualTaskReferences = new ArrayList<>();
       for (EntityReference task: pipeline.getTasks()) {
@@ -715,7 +715,7 @@ public class PipelineResourceTest extends CatalogApplicationTest {
                                                      EntityReference newOwner, List<TagLabel> tags,
                                                      Map<String, String> authHeaders)
           throws JsonProcessingException, HttpResponseException {
-    String PipelineJson = JsonUtils.pojoToJson(pipeline);
+    String pipelineJson = JsonUtils.pojoToJson(pipeline);
 
     // Update the table attributes
     pipeline.setDescription(newDescription);
@@ -723,14 +723,14 @@ public class PipelineResourceTest extends CatalogApplicationTest {
     pipeline.setTags(tags);
 
     // Validate information returned in patch response has the updates
-    Pipeline updatedPipeline = patchPipeline(PipelineJson, pipeline, authHeaders);
+    Pipeline updatedPipeline = patchPipeline(pipelineJson, pipeline, authHeaders);
     validatePipeline(updatedPipeline, pipeline.getDescription(), newOwner, null, tags,
             pipeline.getTasks());
 
     // GET the table and Validate information returned
     Pipeline getPipeline = getPipeline(pipeline.getId(), "service,owner", authHeaders);
-    validatePipeline(updatedPipeline, pipeline.getDescription(), newOwner, null, tags,
-            pipeline.getTasks());
+    validatePipeline(updatedPipeline, getPipeline.getDescription(), newOwner, null, tags,
+            getPipeline.getTasks());
     return updatedPipeline;
   }
 
diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tasks/TaskResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tasks/TaskResourceTest.java
index ffded0a9df1..53238106bc7 100644
--- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tasks/TaskResourceTest.java
+++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tasks/TaskResourceTest.java
@@ -330,7 +330,7 @@ public class TaskResourceTest extends CatalogApplicationTest {
 
     // Update null description with a new description
     Task task = updateAndCheckTask(request.withDescription("newDescription").withDisplayName("newTask")
-            , OK, adminAuthHeaders());
+            ,OK, adminAuthHeaders());
     assertEquals("newDescription", task.getDescription());
     assertEquals("newTask", task.getDisplayName());
   }
@@ -394,7 +394,8 @@ public class TaskResourceTest extends CatalogApplicationTest {
   }
 
   @Test
-  public void patch_taskAttributes_200_ok(TestInfo test) throws HttpResponseException, JsonProcessingException, URISyntaxException {
+  public void patch_taskAttributes_200_ok(TestInfo test) throws HttpResponseException, JsonProcessingException,
+          URISyntaxException {
     // Create task without description, owner
     Task task = createTask(create(test), adminAuthHeaders());
     assertNull(task.getDescription());