More cleanup.
More changes.