more clean up and version bump