Remove uses of autoload