cleanup + correct version