remove unused code
minor cleanup
work around SI-6191

warning wasn't triggered here by 2.10.0, but is in 2.10.1
super annoying changes needed to pass -Xlint under 2.10.1

see comments at https://issues.scala-lang.org/browse/SI-6923
upgrade to Scala 2.10.1