Cleanup.
More cleanup and what-not.