diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index c06acb455..667328fb2 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -896,66 +896,3 @@ describe "PackageManager", ->
           expect(atom.config.get('core.themes')).not.toContain packageName
           expect(atom.config.get('core.themes')).not.toContain packageName
           expect(atom.config.get('core.disabledPackages')).not.toContain packageName
-
-  describe "deleting non-bundled autocomplete packages", ->
-    [autocompleteCSSPath, autocompletePlusPath] = []
-    fs = require 'fs-plus'
-    path = require 'path'
-
-    beforeEach ->
-      fixturePath = path.resolve(__dirname, './fixtures/packages')
-      autocompleteCSSPath = path.join(fixturePath, 'autocomplete-css')
-      autocompletePlusPath = path.join(fixturePath, 'autocomplete-plus')
-
-      try
-        fs.mkdirSync(autocompleteCSSPath)
-        fs.writeFileSync(path.join(autocompleteCSSPath, 'package.json'), '{}')
-        fs.symlinkSync(path.join(fixturePath, 'package-with-main'), autocompletePlusPath, 'dir')
-
-      expect(fs.isDirectorySync(autocompleteCSSPath)).toBe true
-      expect(fs.isSymbolicLinkSync(autocompletePlusPath)).toBe true
-
-      jasmine.unspy(atom.packages, 'uninstallAutocompletePlus')
-
-    afterEach ->
-      try
-        fs.unlink autocompletePlusPath, ->
-
-    it "removes the packages", ->
-      atom.packages.loadPackages()
-
-      waitsFor ->
-        not fs.isDirectorySync(autocompleteCSSPath)
-
-      runs ->
-        expect(fs.isDirectorySync(autocompleteCSSPath)).toBe false
-        expect(fs.isSymbolicLinkSync(autocompletePlusPath)).toBe true
-
-  describe "when the deprecated sublime-tabs package is installed", ->
-    grim = require 'grim'
-    includeDeprecatedAPIs = null
-
-    beforeEach ->
-      {includeDeprecatedAPIs} = grim
-      grim.includeDeprecatedAPIs = false
-
-    afterEach ->
-      grim.includeDeprecatedAPIs = includeDeprecatedAPIs
-
-    it "enables the tree-view and tabs package", ->
-      atom.config.pushAtKeyPath('core.disabledPackages', 'tree-view')
-      atom.config.pushAtKeyPath('core.disabledPackages', 'tabs')
-
-      spyOn(atom.packages, 'getAvailablePackagePaths').andReturn [
-        path.join(__dirname, 'fixtures', 'packages', 'sublime-tabs')
-        path.resolve(__dirname, '..', 'node_modules', 'tree-view')
-        path.resolve(__dirname, '..', 'node_modules', 'tabs')
-      ]
-      atom.packages.loadPackages()
-
-      waitsFor ->
-        not atom.packages.isPackageDisabled('tree-view') and not atom.packages.isPackageDisabled('tabs')
-
-      runs ->
-        expect(atom.packages.isPackageLoaded('tree-view')).toBe true
-        expect(atom.packages.isPackageLoaded('tabs')).toBe true
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 20845d9c1..085db7835 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -156,8 +156,6 @@ beforeEach ->
   spyOn(clipboard, 'writeText').andCallFake (text) -> clipboardContent = text
   spyOn(clipboard, 'readText').andCallFake -> clipboardContent
 
-  spyOn(atom.packages, 'uninstallAutocompletePlus')
-
   addCustomMatchers(this)
 
 afterEach ->
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index 0978a3e95..d14c98ddb 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -327,14 +327,7 @@ class PackageManager
     # of the first package isn't skewed by being the first to require atom
     require '../exports/atom'
 
-    # TODO: remove after a few atom versions.
-    @uninstallAutocompletePlus()
-
     packagePaths = @getAvailablePackagePaths()
-
-    # TODO: remove after a few atom versions.
-    @migrateSublimeTabsSettings(packagePaths)
-
     packagePaths = packagePaths.filter (packagePath) => not @isPackageDisabled(path.basename(packagePath))
     packagePaths = _.uniq packagePaths, (packagePath) -> path.basename(packagePath)
     @loadPackage(packagePath) for packagePath in packagePaths
@@ -455,35 +448,6 @@ class PackageManager
     message = "Failed to load the #{path.basename(packagePath)} package"
     atom.notifications.addError(message, {stack, detail, dismissable: true})
 
-  # TODO: remove these autocomplete-plus specific helpers after a few versions.
-  uninstallAutocompletePlus: ->
-    packageDir = null
-    devDir = path.join("dev", "packages")
-    for packageDirPath in @packageDirPaths
-      if not packageDirPath.endsWith(devDir)
-        packageDir = packageDirPath
-        break
-
-    if packageDir?
-      dirsToRemove = [
-        path.join(packageDir, 'autocomplete-plus')
-        path.join(packageDir, 'autocomplete-atom-api')
-        path.join(packageDir, 'autocomplete-css')
-        path.join(packageDir, 'autocomplete-html')
-        path.join(packageDir, 'autocomplete-snippets')
-      ]
-      for dirToRemove in dirsToRemove
-        @uninstallDirectory(dirToRemove)
-    return
-
-  # TODO: remove this after a few versions
-  migrateSublimeTabsSettings: (packagePaths) ->
-    return if Grim.includeDeprecatedAPIs
-    for packagePath in packagePaths when path.basename(packagePath) is 'sublime-tabs'
-      atom.config.removeAtKeyPath('core.disabledPackages', 'tree-view')
-      atom.config.removeAtKeyPath('core.disabledPackages', 'tabs')
-    return
-
   uninstallDirectory: (directory) ->
     symlinkPromise = new Promise (resolve) ->
       fs.isSymbolicLink directory, (isSymLink) -> resolve(isSymLink)