ScalaCL: cleanup