cleanup and version bump