Final cleanup.
More cleanup after the final cleanup.