diff --git a/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedDataService.java b/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedDataService.java
index af4362902..a61ffbcdf 100644
--- a/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedDataService.java
+++ b/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedDataService.java
@@ -19,7 +19,6 @@
 import org.opensearch.action.support.GroupedActionListener;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.client.Client;
-import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.unit.TimeValue;
@@ -38,7 +37,6 @@
 import org.opensearch.securityanalytics.threatIntel.feedMetadata.BuiltInTIFMetadataLoader;
 import org.opensearch.securityanalytics.threatIntel.jobscheduler.TIFJobSchedulerMetadata;
 import org.opensearch.securityanalytics.threatIntel.jobscheduler.TIFJobSchedulerMetadataService;
-import org.opensearch.securityanalytics.util.IndexUtils;
 import org.opensearch.securityanalytics.util.SecurityAnalyticsException;
 
 import java.io.IOException;
@@ -54,8 +52,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.opensearch.securityanalytics.threatIntel.jobscheduler.TIFJobSchedulerMetadata.THREAT_INTEL_DATA_INDEX_NAME_PREFIX;
-
 /**
  * Service to handle CRUD operations on Threat Intel Feed Data
  */
diff --git a/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedIndexService.java b/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedIndexService.java
index c4109ca3c..cc6fad4d0 100644
--- a/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedIndexService.java
+++ b/src/main/java/org/opensearch/securityanalytics/threatIntel/ThreatIntelFeedIndexService.java
@@ -46,7 +46,6 @@
 
 /**
  * Service to handle CRUD operations on threat intel feeds indices
- * TODO: Rename to TIFIndexService
  */
 public class ThreatIntelFeedIndexService {
     private static final Logger log = LogManager.getLogger(ThreatIntelFeedIndexService.class);