Cleanup, and more cleanup.