more cleanups, version bump