removing autoload and more target-dir updates