Cleanup, revision and version bump.