diff --git a/apps/amo/context_processors.py b/apps/amo/context_processors.py
index 72f259e146..1ccbbe131c 100644
--- a/apps/amo/context_processors.py
+++ b/apps/amo/context_processors.py
@@ -88,28 +88,19 @@ def global_settings(request):
             'href': remora_url('/users/logout?to=' + urlquote(request.path)),
         })
 
-        if not settings.APP_PREVIEW:
-            if request.amo_user.is_developer:
-                tools_links.append({'text': _('Manage My Add-ons'),
-                                    'href': reverse('devhub.addons')})
-            tools_links.append({'text': _('Submit a New Add-on'),
-                                'href': reverse('devhub.submit.1')})
-
-        if waffle.flag_is_active(request, 'accept-webapps'):
-            if settings.APP_PREVIEW or request.amo_user.is_developer:
-                tools_links.append({'text': _('Manage My Apps'),
-                                    'href': reverse('devhub.apps')})
-            tools_links.append({'text': _('Submit a New App'),
-                                'href': reverse('devhub.submit_apps.1')})
+        if request.amo_user.is_developer:
+            tools_links.append({'text': _('Manage My Add-ons'),
+                                'href': reverse('devhub.addons')})
+        tools_links.append({'text': _('Submit a New Add-on'),
+                            'href': reverse('devhub.submit.1')})
 
         if waffle.flag_is_active(request, 'submit-personas'):
             # TODO(cvan)(fligtar): Do we want this here?
             tools_links.append({'text': 'Submit a New Persona',
                                 'href': reverse('devhub.personas.submit')})
 
-        if not settings.APP_PREVIEW:
-            tools_links.append({'text': _('Developer Hub'),
-                                'href': reverse('devhub.index')})
+        tools_links.append({'text': _('Developer Hub'),
+                            'href': reverse('devhub.index')})
 
         if acl.check_reviewer(request):
             tools_links.append({'text': _('Editor Tools'),
diff --git a/apps/amo/tests/test_views.py b/apps/amo/tests/test_views.py
index 09a10d8910..ddbc9301dc 100644
--- a/apps/amo/tests/test_views.py
+++ b/apps/amo/tests/test_views.py
@@ -49,7 +49,7 @@ class TestCommon(amo.tests.TestCase):
 
     def setUp(self):
         self.url = reverse('home')
-        # TODO: Remove when `accept-webapps` flag is gone.
+        # TODO: Remove when `submit-personas` flag is gone.
         self.patcher = mock.patch('waffle.flag_is_active')
         self.patcher.start().return_value = True
         self.addCleanup(self.patcher.stop)
@@ -66,7 +66,6 @@ class TestCommon(amo.tests.TestCase):
         eq_(doc('#site-notice').length, 0)
         eq_(doc('#site-nonfx').length, 1)
         eq_(doc('#site-welcome').length, 1)
-        eq_(doc('#site-noinstall-apps').length, 0)
 
     @mock.patch.object(settings, 'READ_ONLY', True)
     def test_balloons_readonly(self):
@@ -75,7 +74,6 @@ class TestCommon(amo.tests.TestCase):
         eq_(doc('#site-notice').length, 1)
         eq_(doc('#site-nonfx').length, 1)
         eq_(doc('#site-welcome').length, 1)
-        eq_(doc('#site-noinstall-apps').length, 0)
 
     @mock.patch.object(settings, 'READ_ONLY', False)
     def test_thunderbird_balloons_no_readonly(self):
@@ -92,7 +90,6 @@ class TestCommon(amo.tests.TestCase):
         eq_(doc('#site-nonfx').length, 0,
             'This balloon should appear for Firefox only')
         eq_(doc('#site-welcome').length, 1)
-        eq_(doc('#site-noinstall-apps').length, 0)
 
     def test_tools_loggedout(self):
         r = self.client.get(self.url, follow=True)
@@ -106,7 +103,6 @@ class TestCommon(amo.tests.TestCase):
         expected = [
             ('Tools', '#'),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
         ]
@@ -124,8 +120,6 @@ class TestCommon(amo.tests.TestCase):
             ('Tools', '#'),
             ('Manage My Add-ons', reverse('devhub.addons')),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Manage My Apps', reverse('devhub.apps')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
         ]
@@ -141,7 +135,6 @@ class TestCommon(amo.tests.TestCase):
         expected = [
             ('Tools', '#'),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
             ('Editor Tools', reverse('editors.home')),
@@ -162,8 +155,6 @@ class TestCommon(amo.tests.TestCase):
             ('Tools', '#'),
             ('Manage My Add-ons', reverse('devhub.addons')),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Manage My Apps', reverse('devhub.apps')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
             ('Editor Tools', reverse('editors.home')),
@@ -182,7 +173,6 @@ class TestCommon(amo.tests.TestCase):
         expected = [
             ('Tools', '#'),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
             ('Editor Tools', reverse('editors.home')),
@@ -207,8 +197,6 @@ class TestCommon(amo.tests.TestCase):
             ('Tools', '#'),
             ('Manage My Add-ons', reverse('devhub.addons')),
             ('Submit a New Add-on', reverse('devhub.submit.1')),
-            ('Manage My Apps', reverse('devhub.apps')),
-            ('Submit a New App', reverse('devhub.submit_apps.1')),
             ('Submit a New Persona', reverse('devhub.personas.submit')),
             ('Developer Hub', reverse('devhub.index')),
             ('Editor Tools', reverse('editors.home')),