remove dead code
Merge branch 'cassandra-2.0' into trunk
use long math for long results
remove dead params