Revert "Revert "remove unnecessary autoloads""

This issue was actually caused by some advice.

This reverts commit dec4c2198d25e02d4c457e3a8d709b07262d21a0.
Version 2.0.1

Remove spurious autoloads.