Compiles with scala 2.10. Remove cruft