remove unused classes

patch by dshelepov reviewed by dbrosius for cassandra-7197
fix CHANGES
Merge branch 'cassandra-2.1' into trunk