Update stuff.
More cleanup.