Also clean up some unused autoloads. Fixes: debbugs:9298
Attach a file by drag & drop or click to upload