remove dead code (unused assignments)
Merge branch 'cassandra-1.2' into trunk