Cruft cleanup