Actually remove UnsortedColumns (CASSANDRA-6630 followup)