Cleanup.
More clean up.