More cruft removal