More cruft cleanup.