Cleaning up cruft.