Fixup for 6271
Remove dead code

patch by slebresne; reviewed by jbellis for CASSANDRA-6580
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
Fix previous merge