Remove commented code
Merge branch 'master' of https://github.com/datastax/java-driver