Build.scala cleanup