Part 1 of major cleanup.
Part 2 of major cleanup.