Further clean up bundles, autocmds and outdated settings