Clean up of Sbt build