diff --git a/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java b/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java
index 98c8113702e..5b6e094824a 100644
--- a/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java
+++ b/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java
@@ -21,7 +21,6 @@ public class BufferingTermFreqIteratorWrapper implements TermFreqIterator {
       this.freq = freq;
     }
     
-    @Override
     public int compareTo(Entry o) {
       return word.compareTo(o.word);
     }    
@@ -42,24 +41,20 @@ public class BufferingTermFreqIteratorWrapper implements TermFreqIterator {
     curPos = 0;
   }
 
-  @Override
   public float freq() {
     return curEntry.freq;
   }
 
-  @Override
   public boolean hasNext() {
     return curPos < entries.size();
   }
 
-  @Override
   public String next() {
     curEntry = entries.get(curPos);
     curPos++;
     return curEntry.word;
   }
 
-  @Override
   public void remove() {
     throw new UnsupportedOperationException("remove is not supported");
   }
diff --git a/solr/src/java/org/apache/solr/util/TermFreqIterator.java b/solr/src/java/org/apache/solr/util/TermFreqIterator.java
index 0abcf831bc5..ac8e8df186b 100644
--- a/solr/src/java/org/apache/solr/util/TermFreqIterator.java
+++ b/solr/src/java/org/apache/solr/util/TermFreqIterator.java
@@ -13,22 +13,18 @@ public interface TermFreqIterator extends Iterator<String> {
       this.wrapped = wrapped;
     }
 
-    @Override
     public float freq() {
       return 1.0f;
     }
 
-    @Override
     public boolean hasNext() {
       return wrapped.hasNext();
     }
 
-    @Override
     public String next() {
       return wrapped.next().toString();
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
diff --git a/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
index 32c00b93dee..133392eaf03 100644
--- a/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
+++ b/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
@@ -20,16 +20,12 @@ package org.apache.solr.spelling.suggest;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.SpellingParams;
-import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.spelling.suggest.Lookup.LookupResult;
 import org.apache.solr.spelling.suggest.jaspell.JaspellLookup;
 import org.apache.solr.spelling.suggest.tst.TSTLookup;
-import org.apache.solr.util.RefCounted;
 import org.apache.solr.util.TermFreqIterator;
-import org.apache.solr.util.TestHarness;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 import java.util.HashMap;
 import java.util.List;