Cleanup.
Part 2