Remove more misc Scala code (from other projects)
Simplify build
Simplify Build
Remove build cruft
Finish simplifying build