move cleanup into package.scala