Clean up cruft