Cleanup and version bump.