Cleanups and version bump.