diff --git a/src/java/org/apache/lucene/analysis/Token.java b/src/java/org/apache/lucene/analysis/Token.java
index 98cb24e9a41..c2d4f949c33 100644
--- a/src/java/org/apache/lucene/analysis/Token.java
+++ b/src/java/org/apache/lucene/analysis/Token.java
@@ -54,8 +54,6 @@ package org.apache.lucene.analysis;
*
The document portion names each document containing
diff --git a/src/java/org/apache/lucene/index/TermInfosReader.java b/src/java/org/apache/lucene/index/TermInfosReader.java
index c4e767136c3..7d8e2730559 100644
--- a/src/java/org/apache/lucene/index/TermInfosReader.java
+++ b/src/java/org/apache/lucene/index/TermInfosReader.java
@@ -57,7 +57,6 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.InputStream;
/** This stores a monotonically increasing set of Subclasses implement search scoring.
diff --git a/src/java/org/apache/lucene/search/SloppyPhraseScorer.java b/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
index effce5f1343..28975ea624a 100644
--- a/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
+++ b/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
@@ -55,7 +55,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Vector;
+
import org.apache.lucene.util.*;
import org.apache.lucene.index.*;
diff --git a/src/java/org/apache/lucene/search/TermScorer.java b/src/java/org/apache/lucene/search/TermScorer.java
index 4e1c20f0a63..d14d8f76d20 100644
--- a/src/java/org/apache/lucene/search/TermScorer.java
+++ b/src/java/org/apache/lucene/search/TermScorer.java
@@ -55,7 +55,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import org.apache.lucene.index.Term;
+
import org.apache.lucene.index.TermDocs;
final class TermScorer extends Scorer {
diff --git a/src/java/org/apache/lucene/search/WildcardTermEnum.java b/src/java/org/apache/lucene/search/WildcardTermEnum.java
index 80da98f69eb..9af4de9837a 100644
--- a/src/java/org/apache/lucene/search/WildcardTermEnum.java
+++ b/src/java/org/apache/lucene/search/WildcardTermEnum.java
@@ -55,9 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermEnum;
/**
* Subclass of FilteredTermEnum for enumerating all terms that match the
diff --git a/src/java/org/apache/lucene/store/FSDirectory.java b/src/java/org/apache/lucene/store/FSDirectory.java
index 91c97cce730..94ed97001d5 100644
--- a/src/java/org/apache/lucene/store/FSDirectory.java
+++ b/src/java/org/apache/lucene/store/FSDirectory.java
@@ -57,7 +57,6 @@ package org.apache.lucene.store;
import java.io.IOException;
import java.io.File;
import java.io.RandomAccessFile;
-import java.io.FileNotFoundException;
import java.util.Hashtable;
import org.apache.lucene.util.Constants;
1/sqrt(numTerms)
. */
diff --git a/src/java/org/apache/lucene/search/ExactPhraseScorer.java b/src/java/org/apache/lucene/search/ExactPhraseScorer.java
index 32f941d4c70..3c2facc3da4 100644
--- a/src/java/org/apache/lucene/search/ExactPhraseScorer.java
+++ b/src/java/org/apache/lucene/search/ExactPhraseScorer.java
@@ -55,7 +55,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Vector;
import org.apache.lucene.util.*;
import org.apache.lucene.index.*;
diff --git a/src/java/org/apache/lucene/search/FuzzyTermEnum.java b/src/java/org/apache/lucene/search/FuzzyTermEnum.java
index f4e4232b350..c69cf50d9a9 100644
--- a/src/java/org/apache/lucene/search/FuzzyTermEnum.java
+++ b/src/java/org/apache/lucene/search/FuzzyTermEnum.java
@@ -57,7 +57,6 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermEnum;
/** Subclass of FilteredTermEnum for enumerating all terms that are similiar to the specified filter term.
diff --git a/src/java/org/apache/lucene/search/Hits.java b/src/java/org/apache/lucene/search/Hits.java
index 1588e720e53..5a6d9709ff3 100644
--- a/src/java/org/apache/lucene/search/Hits.java
+++ b/src/java/org/apache/lucene/search/Hits.java
@@ -56,9 +56,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Vector;
-import java.util.BitSet;
+
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexReader;
/** A ranked list of documents, used to hold search results. */
public final class Hits {
diff --git a/src/java/org/apache/lucene/search/IndexSearcher.java b/src/java/org/apache/lucene/search/IndexSearcher.java
index 86a8496035d..5b665faa9d7 100644
--- a/src/java/org/apache/lucene/search/IndexSearcher.java
+++ b/src/java/org/apache/lucene/search/IndexSearcher.java
@@ -61,7 +61,6 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.util.PriorityQueue;
/** Implements search over a single IndexReader.
*
diff --git a/src/java/org/apache/lucene/search/MultiSearcher.java b/src/java/org/apache/lucene/search/MultiSearcher.java
index fdc26b72a9e..8b8f583f123 100644
--- a/src/java/org/apache/lucene/search/MultiSearcher.java
+++ b/src/java/org/apache/lucene/search/MultiSearcher.java
@@ -55,11 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Vector;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
-import org.apache.lucene.util.PriorityQueue;
/** Implements search over a set of Searchables
.
*
diff --git a/src/java/org/apache/lucene/search/MultiTermQuery.java b/src/java/org/apache/lucene/search/MultiTermQuery.java
index 2acb27e15a6..a8aa55679ce 100644
--- a/src/java/org/apache/lucene/search/MultiTermQuery.java
+++ b/src/java/org/apache/lucene/search/MultiTermQuery.java
@@ -55,10 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Vector;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermEnum;
/**
* A {@link Query} that matches documents containing a subset of terms provided
diff --git a/src/java/org/apache/lucene/search/PhrasePrefixQuery.java b/src/java/org/apache/lucene/search/PhrasePrefixQuery.java
index c90d14c60d5..a6bd9ff920c 100644
--- a/src/java/org/apache/lucene/search/PhrasePrefixQuery.java
+++ b/src/java/org/apache/lucene/search/PhrasePrefixQuery.java
@@ -62,7 +62,6 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultipleTermPositions;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermPositions;
-import org.apache.lucene.index.TermDocs;
import org.apache.lucene.search.Query;
/**
diff --git a/src/java/org/apache/lucene/search/PhraseQuery.java b/src/java/org/apache/lucene/search/PhraseQuery.java
index 5c2bb4f1350..d192ffbf568 100644
--- a/src/java/org/apache/lucene/search/PhraseQuery.java
+++ b/src/java/org/apache/lucene/search/PhraseQuery.java
@@ -58,7 +58,6 @@ import java.io.IOException;
import java.util.Vector;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermPositions;
import org.apache.lucene.index.IndexReader;
diff --git a/src/java/org/apache/lucene/search/PhraseScorer.java b/src/java/org/apache/lucene/search/PhraseScorer.java
index f316c4621b0..c49131fa760 100644
--- a/src/java/org/apache/lucene/search/PhraseScorer.java
+++ b/src/java/org/apache/lucene/search/PhraseScorer.java
@@ -55,7 +55,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Vector;
+
import org.apache.lucene.util.*;
import org.apache.lucene.index.*;
diff --git a/src/java/org/apache/lucene/search/PrefixQuery.java b/src/java/org/apache/lucene/search/PrefixQuery.java
index b8a6c66a7a3..a38b85f281e 100644
--- a/src/java/org/apache/lucene/search/PrefixQuery.java
+++ b/src/java/org/apache/lucene/search/PrefixQuery.java
@@ -55,9 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.IndexReader;
/** A Query that matches documents containing terms with a specified prefix. */
diff --git a/src/java/org/apache/lucene/search/RangeQuery.java b/src/java/org/apache/lucene/search/RangeQuery.java
index 6eaa1af9568..dbe377efdbe 100644
--- a/src/java/org/apache/lucene/search/RangeQuery.java
+++ b/src/java/org/apache/lucene/search/RangeQuery.java
@@ -55,9 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.IndexReader;
/** A Query that matches documents within an exclusive range. */
diff --git a/src/java/org/apache/lucene/search/RemoteSearchable.java b/src/java/org/apache/lucene/search/RemoteSearchable.java
index 62474f1ab42..1921610bc3d 100644
--- a/src/java/org/apache/lucene/search/RemoteSearchable.java
+++ b/src/java/org/apache/lucene/search/RemoteSearchable.java
@@ -55,15 +55,15 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.IndexReader;
import java.rmi.Naming;
import java.rmi.RemoteException;
import java.rmi.RMISecurityManager;
import java.rmi.server.UnicastRemoteObject;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.Term;
+
/** A remote searchable implementation. */
public class RemoteSearchable
extends UnicastRemoteObject
diff --git a/src/java/org/apache/lucene/search/Searchable.java b/src/java/org/apache/lucene/search/Searchable.java
index fdef0d28086..111fd9d8f1a 100644
--- a/src/java/org/apache/lucene/search/Searchable.java
+++ b/src/java/org/apache/lucene/search/Searchable.java
@@ -55,9 +55,9 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.IndexReader;
/** The interface for search implementations.
*
diff --git a/src/java/org/apache/lucene/search/Searcher.java b/src/java/org/apache/lucene/search/Searcher.java
index 5cf9a3e33ed..63c5a3333e2 100644
--- a/src/java/org/apache/lucene/search/Searcher.java
+++ b/src/java/org/apache/lucene/search/Searcher.java
@@ -55,9 +55,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.IndexReader;
/** An abstract base class for search implementations.
* Implements some common utility methods.
diff --git a/src/java/org/apache/lucene/search/Similarity.java b/src/java/org/apache/lucene/search/Similarity.java
index 2b522b5fd91..67cbc9d4838 100644
--- a/src/java/org/apache/lucene/search/Similarity.java
+++ b/src/java/org/apache/lucene/search/Similarity.java
@@ -56,11 +56,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Vector;
+
import org.apache.lucene.index.Term;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
/** Expert: Scoring API.
*