diff --git a/server/src/main/java/org/opensearch/action/search/ViewSearchRequest.java b/server/src/main/java/org/opensearch/action/search/ViewSearchRequest.java
index 9010681362ed4..bd190ec1576f2 100644
--- a/server/src/main/java/org/opensearch/action/search/ViewSearchRequest.java
+++ b/server/src/main/java/org/opensearch/action/search/ViewSearchRequest.java
@@ -10,9 +10,11 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.cluster.metadata.View;
-import org.opensearch.common.at org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.common.annotation.ExperimentalApi;
+import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
-import org.opensearch.rest.action.admin.indicport java.util.Map;
+import java.io.IOException;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 
@@ -57,7 +59,6 @@ public void writeTo(final StreamOutput out) throws IOException {
 
     @Override
     public boolean equals(final Object o) {
-        // TODO: Maybe this isn't standard practice
         return this.hashCode() == o.hashCode();
     }
 
@@ -70,9 +71,4 @@ public int hashCode() {
     public String toString() {
         return super.toString().replace("SearchRequest{", "ViewSearchRequest{view=" + view + ",");
     }
-
-    @Override
-    public Map<String, String> getResourceTypeAndIds() {
-        return Map.of(RestViewAction.VIEW_ID, view.name);
-    }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ViewMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/ViewMetadata.java
index f308cfdfb55bf..78f9707f4b536 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/ViewMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/ViewMetadata.java
@@ -29,16 +29,6 @@
 
 import static org.opensearch.cluster.metadata.ComposableIndexTemplateMetadata.MINIMMAL_SUPPORTED_VERSION;
 
-/**
- * TODO: Tests with failures? `./gradlew :server:test`
-
- - org.opensearch.index.store.RemoteSegmentStoreDirectoryTests.testDeleteStaleCommitsActualDeleteIOException
- - org.opensearch.index.store.RemoteSegmentStoreDirectoryTests.testDeleteStaleCommitsDeleteDedup
- - org.opensearch.index.store.RemoteSegmentStoreDirectoryTests.testDeleteStaleCommitsActualDeleteNoSuchFileException
- - org.opensearch.index.store.RemoteSegmentStoreDirectoryTests.testDeleteStaleCommitsActualDelete
- *
- */
-
 public class ViewMetadata implements Metadata.Custom {
 
     public static final String TYPE = "view";