Clean up a lot of cruft.