Cleanup.
More cleanup.
Yet more cleanup.