diff --git a/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java b/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
index aed19a8bbc..406196b22e 100644
--- a/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
+++ b/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
@@ -33,7 +33,6 @@ import org.apache.cassandra.service.StorageProxy;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
 
 /**
  * A Row Source Defintion (RSD) for doing a range query on a column map
@@ -112,7 +111,7 @@ public class ColumnRangeQueryRSD extends RowSourceDef
         List<Map<String, String>> rows = new LinkedList<Map<String, String>>();
         if (row != null)
         {
-            Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+            Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
             if (cfMap != null && cfMap.size() > 0)
             {
                 ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
diff --git a/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java b/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
index 33b3087962..a44f28b006 100644
--- a/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
+++ b/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.cql.common;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -32,11 +31,8 @@ import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.Row;
 import org.apache.cassandra.service.StorageProxy;
 import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.service.column_t;
-import org.apache.cassandra.service.superColumn_t;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
 
 /**
  * A Row Source Defintion (RSD) for doing a super column range query on a Super Column Family.
@@ -84,7 +80,7 @@ public class SuperColumnRangeQueryRSD extends RowSourceDef
         List<Map<String, String>> rows = new LinkedList<Map<String, String>>();
         if (row != null)
         {
-            Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+            Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
             if (cfMap != null && cfMap.size() > 0)
             {
                 ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
diff --git a/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java b/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
index 867463fb1e..d4a315a72c 100644
--- a/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
+++ b/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
@@ -33,7 +33,6 @@ import org.apache.cassandra.service.StorageProxy;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
 
 /**
  * A Row Source Defintion (RSD) for looking up a unique column within a column family.
@@ -96,7 +95,7 @@ public class UniqueKeyQueryRSD extends RowSourceDef
 
         if (row != null)
         {
-            Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+            Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
             if (cfMap != null && cfMap.size() > 0)
             {
                 ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
diff --git a/src/org/apache/cassandra/db/CommitLog.java b/src/org/apache/cassandra/db/CommitLog.java
index fd8d3bac9d..ff4911cdd9 100644
--- a/src/org/apache/cassandra/db/CommitLog.java
+++ b/src/org/apache/cassandra/db/CommitLog.java
@@ -21,22 +21,18 @@ package org.apache.cassandra.db;
 import java.io.*;
 import java.util.*;
 
-import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.cassandra.io.IFileReader;
 import org.apache.cassandra.io.IFileWriter;
 import org.apache.cassandra.io.SequenceFile;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.FileUtils;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
 
 /*
  * Commit Log tracks every write operation into the system. The aim
@@ -376,7 +372,7 @@ class CommitLog
                     try
                     {                        
                         Row row = Row.serializer().deserialize(bufIn);
-                        Map<String, ColumnFamily> columnFamilies = new HashMap<String, ColumnFamily>(row.getColumnFamilies());
+                        Map<String, ColumnFamily> columnFamilies = new HashMap<String, ColumnFamily>(row.getColumnFamilyMap());
                         /* remove column families that have already been flushed */
                     	Set<String> cNames = columnFamilies.keySet();
 
@@ -423,7 +419,7 @@ class CommitLog
     */
     private void updateHeader(Row row) throws IOException
     {
-    	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+    	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Table table = Table.open(table_);
         Set<String> cNames = columnFamilies.keySet();
         for ( String cName : cNames )
diff --git a/src/org/apache/cassandra/db/DBManager.java b/src/org/apache/cassandra/db/DBManager.java
index 5828b88e13..51e95fb44e 100644
--- a/src/org/apache/cassandra/db/DBManager.java
+++ b/src/org/apache/cassandra/db/DBManager.java
@@ -18,10 +18,8 @@
 
 package org.apache.cassandra.db;
 
-import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.net.InetAddress;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
@@ -31,14 +29,10 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.DataOutputBuffer;
-import org.apache.cassandra.io.IFileWriter;
-import org.apache.cassandra.io.SequenceFile;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.BasicUtilities;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.GuidGenerator;
-import org.apache.cassandra.utils.HashingSchemes;
 
 
 /**
@@ -190,7 +184,7 @@ public class DBManager
         else
         {
             /* we crashed and came back up need to bump generation # */
-        	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         	Set<String> cfNames = columnFamilies.keySet();
 
             for ( String cfName : cfNames )
diff --git a/src/org/apache/cassandra/db/Row.java b/src/org/apache/cassandra/db/Row.java
index fa55e45756..eda283890e 100644
--- a/src/org/apache/cassandra/db/Row.java
+++ b/src/org/apache/cassandra/db/Row.java
@@ -18,9 +18,7 @@
 
 package org.apache.cassandra.db;
 
-import java.io.DataInput;
 import java.io.DataInputStream;
-import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -30,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
 
 /**
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -79,7 +76,14 @@ public class Row implements Serializable
         return columnFamilies_.get(cfName);
     }
 
-    public Map<String, ColumnFamily> getColumnFamilies()
+    public Collection<ColumnFamily> getColumnFamilies()
+    {
+        return columnFamilies_.values();
+    }
+
+    @Deprecated
+    // (use getColumnFamilies or getColumnFamilyNames)
+    public Map<String, ColumnFamily> getColumnFamilyMap()
     {
         return columnFamilies_;
     }
@@ -113,7 +117,7 @@ public class Row implements Serializable
     */
     void merge(Row row)
     {
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Set<String> cfNames = columnFamilies.keySet();
 
         for ( String cfName : cfNames )
@@ -135,7 +139,7 @@ public class Row implements Serializable
      */
     public void repair(Row row)
     {
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Set<String> cfNames = columnFamilies.keySet();
 
         for ( String cfName : cfNames )
@@ -162,7 +166,7 @@ public class Row implements Serializable
     public Row diff(Row row)
     {
         Row rowDiff = new Row(key_);
-    	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+    	Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Set<String> cfNames = columnFamilies.keySet();
 
         for ( String cfName : cfNames )
@@ -170,15 +174,15 @@ public class Row implements Serializable
             ColumnFamily cf = columnFamilies_.get(cfName);
             ColumnFamily cfDiff = null;
             if ( cf == null )
-            	rowDiff.getColumnFamilies().put(cfName, columnFamilies.get(cfName));
+            	rowDiff.getColumnFamilyMap().put(cfName, columnFamilies.get(cfName));
             else
             {
             	cfDiff = cf.diff(columnFamilies.get(cfName));
             	if(cfDiff != null)
-            		rowDiff.getColumnFamilies().put(cfName, cfDiff);
+            		rowDiff.getColumnFamilyMap().put(cfName, cfDiff);
             }
         }
-        if(rowDiff.getColumnFamilies().size() != 0)
+        if(rowDiff.getColumnFamilyMap().size() != 0)
         	return rowDiff;
         else
         	return null;
@@ -225,7 +229,7 @@ class RowSerializer implements ICompactSerializer<Row>
     public void serialize(Row row, DataOutputStream dos) throws IOException
     {
         dos.writeUTF(row.key());        
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         int size = columnFamilies.size();        
         dos.writeInt(size);
         
diff --git a/src/org/apache/cassandra/db/RowMutation.java b/src/org/apache/cassandra/db/RowMutation.java
index 57060f236e..c0bfb18b87 100644
--- a/src/org/apache/cassandra/db/RowMutation.java
+++ b/src/org/apache/cassandra/db/RowMutation.java
@@ -65,7 +65,7 @@ public class RowMutation implements Serializable
     {
         table_ = table;
         key_ = row.key();
-        Map<String, ColumnFamily> cfSet = row.getColumnFamilies();
+        Map<String, ColumnFamily> cfSet = row.getColumnFamilyMap();
         Set<String> keyset = cfSet.keySet();
         for(String cfName : keyset)
         {
diff --git a/src/org/apache/cassandra/db/SystemTable.java b/src/org/apache/cassandra/db/SystemTable.java
index 615320fb85..441aa405b3 100644
--- a/src/org/apache/cassandra/db/SystemTable.java
+++ b/src/org/apache/cassandra/db/SystemTable.java
@@ -18,25 +18,12 @@
 
 package org.apache.cassandra.db;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.cassandra.io.IFileReader;
@@ -45,8 +32,6 @@ import org.apache.cassandra.io.SequenceFile;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
 
 /**
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -167,7 +152,7 @@ public class SystemTable
     {
         if ( systemRow_ != null )
         {
-            Map<String, ColumnFamily> columnFamilies = systemRow_.getColumnFamilies();
+            Map<String, ColumnFamily> columnFamilies = systemRow_.getColumnFamilyMap();
             /* Retrieve the "LocationInfo" column family */
             ColumnFamily columnFamily = columnFamilies.get(SystemTable.cfName_);
             long oldTokenColumnTimestamp = columnFamily.getColumn(SystemTable.token_).timestamp();
diff --git a/src/org/apache/cassandra/db/Table.java b/src/org/apache/cassandra/db/Table.java
index 24c320a8a7..3b3912fc4d 100644
--- a/src/org/apache/cassandra/db/Table.java
+++ b/src/org/apache/cassandra/db/Table.java
@@ -19,18 +19,14 @@
 package org.apache.cassandra.db;
 
 import java.util.*;
-import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.cassandra.analytics.DBAnalyticsSource;
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.continuations.Suspendable;
 import org.apache.cassandra.dht.BootstrapInitiateMessage;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.io.DataInputBuffer;
@@ -52,9 +48,6 @@ import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.FileUtils;
 import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
-import org.apache.cassandra.service.*;
 
 /**
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -822,7 +815,7 @@ public class Table
         long start = System.currentTimeMillis();
                
         CommitLog.CommitLogContext cLogCtx = CommitLog.open(table_).add(row);
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Set<String> cNames = columnFamilies.keySet();
         for ( String cName : cNames )
         {
@@ -838,7 +831,7 @@ public class Table
     void applyNow(Row row) throws IOException
     {
         String key = row.key();
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
 
         Set<String> cNames = columnFamilies.keySet();
         for ( String cName : cNames )
@@ -861,7 +854,7 @@ public class Table
     void delete(Row row) throws IOException
     {
         String key = row.key();
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
 
         /* Add row to commit log */
         CommitLog.open(table_).add(row);
@@ -881,7 +874,7 @@ public class Table
         /* Add row to the commit log. */
         long start = System.currentTimeMillis();
                 
-        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+        Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
         Set<String> cNames = columnFamilies.keySet();
         for ( String cName : cNames )
         {
diff --git a/src/org/apache/cassandra/service/CassandraServer.java b/src/org/apache/cassandra/service/CassandraServer.java
index 4f4efd0673..5db0a5b9cd 100644
--- a/src/org/apache/cassandra/service/CassandraServer.java
+++ b/src/org/apache/cassandra/service/CassandraServer.java
@@ -26,19 +26,13 @@ import com.facebook.thrift.protocol.*;
 import com.facebook.fb303.FacebookBase;
 import com.facebook.fb303.fb_status;
 import java.io.*;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.net.*;
-import org.apache.cassandra.utils.*;
+
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.cql.common.CqlResult;
@@ -48,8 +42,6 @@ import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.Row;
 import org.apache.cassandra.db.RowMutation;
 import org.apache.cassandra.db.RowMutationMessage;
-import org.apache.cassandra.gms.FailureDetector;
-import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.net.EndPoint;
 import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
@@ -120,7 +112,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 			{
 				throw new CassandraException("No row exists for key " + key);			
 			}
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{				
 				logger_	.info("ERROR ColumnFamily " + columnFamily + " map is missing.....: " + "   key:" + key );
@@ -162,7 +154,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily " + columnFamily_column + " map is missing.....: " + "   key:" + key);
@@ -277,7 +269,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily " + columnFamily_column + " map is missing.....: " + "   key:" + key);
@@ -345,7 +337,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 			
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily map is missing.....: "
@@ -417,7 +409,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily map is missing.....: "
@@ -683,7 +675,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily map is missing.....: "
@@ -758,7 +750,7 @@ public class CassandraServer extends FacebookBase implements Cassandra.Iface
 	        	throw new CassandraException("ERROR No row for this key .....: " + key);	        	
 			}
 
-			Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+			Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 			if (cfMap == null || cfMap.size() == 0)
 			{
 				logger_	.info("ERROR ColumnFamily map is missing.....: "
diff --git a/src/org/apache/cassandra/service/ReadResponseResolver.java b/src/org/apache/cassandra/service/ReadResponseResolver.java
index 21ffd250be..56a8042112 100644
--- a/src/org/apache/cassandra/service/ReadResponseResolver.java
+++ b/src/org/apache/cassandra/service/ReadResponseResolver.java
@@ -141,7 +141,7 @@ public class ReadResponseResolver implements IResponseResolver<Row>
 				continue;
 			// create the row mutation message based on the diff and schedule a read repair 
 			RowMutation rowMutation = new RowMutation(table, key);            			
-	    	Map<String, ColumnFamily> columnFamilies = diffRow.getColumnFamilies();
+	    	Map<String, ColumnFamily> columnFamilies = diffRow.getColumnFamilyMap();
 	        Set<String> cfNames = columnFamilies.keySet();
 	        
 	        for ( String cfName : cfNames )
diff --git a/src/org/apache/cassandra/test/DataImporter.java b/src/org/apache/cassandra/test/DataImporter.java
index 4a9e74b16f..4e9803425f 100644
--- a/src/org/apache/cassandra/test/DataImporter.java
+++ b/src/org/apache/cassandra/test/DataImporter.java
@@ -20,12 +20,8 @@ package org.apache.cassandra.test;
 
 import com.facebook.thrift.transport.TTransport;
 import com.facebook.thrift.transport.TSocket;
-import com.facebook.thrift.transport.THttpClient;
-import com.facebook.thrift.transport.TFramedTransport;
 import com.facebook.thrift.protocol.TBinaryProtocol;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.net.*;
-import org.apache.cassandra.service.*;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,25 +29,17 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.StringTokenizer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
-import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
 import org.apache.cassandra.concurrent.ThreadFactoryImpl;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.IColumn;
@@ -70,8 +58,7 @@ import org.apache.cassandra.service.batch_mutation_super_t;
 import org.apache.cassandra.service.batch_mutation_t;
 import org.apache.cassandra.service.column_t;
 import org.apache.cassandra.service.superColumn_t;
-import org.apache.cassandra.utils.BasicUtilities;
-import org.apache.cassandra.utils.LogUtil;
+
 import org.apache.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
@@ -907,7 +894,7 @@ public class DataImporter {
                 Thread.sleep(1000/requestsPerSecond_, 1000%requestsPerSecond_);
 				errorCount_++;
 			} else {
-				Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+				Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
 				if (cfMap == null || cfMap.size() == 0) {
 					logger_
 							.debug("ERROR ColumnFamil map is missing.....: "