Cleanup build.scala