scala
cleanup