More cruft removal.