Clean-up Build.scala