Scala project code cleanup.