Cleanup.
Some simplification.