diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 990eaa7a82..2b76297362 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1623,30 +1623,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         return CompactionManager.instance.submitTruncate(this, truncatedAt);
     }
 
-    // if this errors out, we are in a world of hurt.
-    public void renameSSTables(String newCfName) throws IOException
-    {
-        // complete as much of the job as possible.  Don't let errors long the way prevent as much renaming as possible
-        // from happening.
-        IOException mostRecentProblem = null;
-        for (File existing : DefsTable.getFiles(table.name, columnFamily))
-        {
-            try
-            {
-                String newFileName = existing.getName().replaceFirst("\\w+-", newCfName + "-");
-                FileUtils.renameWithConfirm(existing, new File(existing.getParent(), newFileName));
-            }
-            catch (IOException ex)
-            {
-                mostRecentProblem = ex;
-            }
-        }
-        if (mostRecentProblem != null)
-            throw new IOException("One or more IOExceptions encountered while renaming files. Most recent problem is included.", mostRecentProblem);
-
-        indexManager.renameIndexes(newCfName);
-    }
-
     public long getBloomFilterFalsePositives()
     {
         return data.getBloomFilterFalsePositives();
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index 4f43993e48..42e9cf7c45 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@ -123,14 +123,7 @@ public abstract class SecondaryIndex
      * @param columnName the indexed column to remove
      */
     public abstract void removeIndex(ByteBuffer columnName) throws IOException;
-    
-    /**
-     * Renames the underlying index files to reflect the new CF name
-     * @param newCfName new column family name.
-     * @throws IOException on any I/O error.
-     */
-    public abstract void renameIndex(String newCfName) throws IOException;
-    
+
     /**
      * Remove the index and unregisters this index's mbean if one exists
      */
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 6db5976848..88528ede7d 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -247,16 +247,6 @@ public class SecondaryIndexManager
             entry.getValue().invalidate();
     }
 
-    /**
-     * Rename all underlying index files
-     * @param newCfName the new index Name
-     */
-    public void renameIndexes(String newCfName) throws IOException
-    {
-        for (Map.Entry<ByteBuffer, SecondaryIndex> entry : indexesByColumn.entrySet())
-            entry.getValue().renameIndex(newCfName);
-    }
-    
     /**
      * Flush all indexes to disk
      * @throws ExecutionException
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java b/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
index 492a0278a8..17a210477f 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
@@ -148,11 +148,6 @@ public class KeysIndex extends PerColumnSecondaryIndex
         return indexCfs.columnFamily;
     }
 
-    public void renameIndex(String newCfName) throws IOException
-    {
-        indexCfs.renameSSTables(indexCfs.columnFamily.replace(baseCfs.columnFamily, newCfName));
-    }
-
     public void validateOptions() throws ConfigurationException
     {
         // no options used