Cleanup.

Lots of stuff.