Remove more autoload cruft