Clean up cruft.