Cleanup, simplify, and stuff.