Cruft cleanup.