diff --git a/src/org/apache/cassandra/service/HttpRequestVerbHandler.java b/src/org/apache/cassandra/service/HttpRequestVerbHandler.java
index 0c847fff7e..4257ad5577 100644
--- a/src/org/apache/cassandra/service/HttpRequestVerbHandler.java
+++ b/src/org/apache/cassandra/service/HttpRequestVerbHandler.java
@@ -23,15 +23,18 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;
 import java.lang.management.RuntimeMXBean;
-import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.CalloutDeployMessage;
 import org.apache.cassandra.db.CalloutManager;
 import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.RowMutation;
 import org.apache.cassandra.db.Table;
 import org.apache.cassandra.dht.Range;
@@ -48,8 +51,6 @@ import org.apache.cassandra.net.http.HttpRequest;
 import org.apache.cassandra.net.http.HttpWriteResponse;
 import org.apache.cassandra.procedures.GroovyScriptRunner;
 import org.apache.cassandra.utils.LogUtil;
-import org.apache.log4j.Logger;
-import org.apache.cassandra.net.*;
 
 /*
  * This class handles the incoming HTTP request after
diff --git a/src/org/apache/cassandra/service/StorageServiceMBean.java b/src/org/apache/cassandra/service/StorageServiceMBean.java
index b3a49a1537..3995af7707 100644
--- a/src/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/org/apache/cassandra/service/StorageServiceMBean.java
@@ -19,9 +19,6 @@
 package org.apache.cassandra.service;
 
 import java.io.IOException;
-import java.math.BigInteger;
-
-import org.apache.cassandra.net.EndPoint;
 
 
 /**
diff --git a/src/org/apache/cassandra/tools/MembershipCleaner.java b/src/org/apache/cassandra/tools/MembershipCleaner.java
index 3ce4abf5e1..4d5548dd02 100644
--- a/src/org/apache/cassandra/tools/MembershipCleaner.java
+++ b/src/org/apache/cassandra/tools/MembershipCleaner.java
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.tools;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -27,7 +26,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Serializable;
-import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.cassandra.io.ICompactSerializer;
@@ -36,8 +34,6 @@ import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
 
 public class MembershipCleaner
 {
diff --git a/src/org/apache/cassandra/tools/TokenUpdateVerbHandler.java b/src/org/apache/cassandra/tools/TokenUpdateVerbHandler.java
index b381359ea1..94029b00b7 100644
--- a/src/org/apache/cassandra/tools/TokenUpdateVerbHandler.java
+++ b/src/org/apache/cassandra/tools/TokenUpdateVerbHandler.java
@@ -18,11 +18,14 @@
 
 package org.apache.cassandra.tools;
 
-import java.util.*;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.DataInputBuffer;
@@ -33,9 +36,6 @@ import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.tools.TokenUpdater.TokenInfoMessage;
 import org.apache.cassandra.utils.LogUtil;
-import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.config.*;
 
 /**
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
diff --git a/src/org/apache/cassandra/tools/TokenUpdater.java b/src/org/apache/cassandra/tools/TokenUpdater.java
index bc33402e9d..28d5f915c1 100644
--- a/src/org/apache/cassandra/tools/TokenUpdater.java
+++ b/src/org/apache/cassandra/tools/TokenUpdater.java
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.tools;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -36,8 +35,6 @@ import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
 
 public class TokenUpdater
 {
diff --git a/src/org/apache/cassandra/utils/BasicUtilities.java b/src/org/apache/cassandra/utils/BasicUtilities.java
index 75b42fa493..2cbf952813 100644
--- a/src/org/apache/cassandra/utils/BasicUtilities.java
+++ b/src/org/apache/cassandra/utils/BasicUtilities.java
@@ -18,10 +18,6 @@
 
 package org.apache.cassandra.utils;
 
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor; 
-import java.math.BigInteger;
 import java.nio.ByteBuffer;
 
 /**
diff --git a/src/org/apache/cassandra/utils/FBUtilities.java b/src/org/apache/cassandra/utils/FBUtilities.java
index eeecc56ea6..0cea2e0e4f 100644
--- a/src/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/org/apache/cassandra/utils/FBUtilities.java
@@ -18,19 +18,28 @@
 
 package org.apache.cassandra.utils;
 
-import java.util.*;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.zip.Deflater;
-import java.util.zip.DataFormatException;
-import java.util.zip.Inflater;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.security.MessageDigest;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.io.*;
-import java.net.*;
-import java.nio.channels.SocketChannel;
-import java.nio.ByteBuffer;
-import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.zip.DataFormatException;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
 /**
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
  */