Cleanup and changes for scala 2.10