Import cruft cleanup