Yet more cleanup.
More cleanup.