More cruft removal...