Cleanup.
Even more cleanup.