CRUNCH-385: Cleanup Scrunch for Scala 2.10