More cruft cleanup