diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade
index 52c6a88151..6f4019aad3 100644
--- a/public/_includes/_docs-nav.jade
+++ b/public/_includes/_docs-nav.jade
@@ -11,10 +11,12 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav
         name = page.menuTitle || page.title
         selected =  current.path[3] == slug ? 'is-selected':''
 
-
         // PRIMARY NAVIGATION
-        li(class="#{selected}") <a href="/docs/#{current.path[1]}/#{current.path[2]}/#{slug}" md-button><span class="side-nav-icon icon-#{page.icon}"></span> #{name}</a>
+        if public.docs[current.path[1]][current.path[2]][slug]
+          li(class="#{selected}") <a href="/docs/#{current.path[1]}/#{current.path[2]}/#{slug}/" md-button><span class="side-nav-icon icon-#{page.icon}"></span> #{name}</a>
 
+        else
+          li(class="#{selected}") <a href="/docs/#{current.path[1]}/#{current.path[2]}/#{slug}.html" md-button><span class="side-nav-icon icon-#{page.icon}"></span> #{name}</a>
 
           // SECONDARY NAVIGATION
           if selected
diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade
index b45fb1c61b..4fd77b376b 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/public/_includes/_version-dropdown.jade
@@ -11,8 +11,10 @@ if current.path[2]
 
 <!-- Replace _ undscores with . dots -->
 if current.path[3]
-  page = current.path[3]
-
+  if public.docs[current.path[1]][current.path[2]][current.path[3]]
+    page = current.path[3] + '/'
+  else
+    page = current.path[3] + '.html'
 
 <!-- VERSION TREE CREATOR MIXIN -->
 mixin tree(directory, urlPrefix, name, latest)
diff --git a/public/docs/js/latest/api.jade b/public/docs/js/latest/api.jade
deleted file mode 100644
index c293164238..0000000000
--- a/public/docs/js/latest/api.jade
+++ /dev/null
@@ -1,18 +0,0 @@
-.l-main-section
-
-  .callout.is-helpful
-    header Developer Preview
-    p.
-      The Angular 2.0 API is currently in active development and not production ready.
-      This page will showcase a preview of proposed methods to help further the discussion
-      in the development community. If you're building a production app today, please
-      <a href="https://docs.angularjs.org/api">use Angular 1.X</a>.
-
-number = 1;
-ul
-  for page, slug in public.docs[current.path[1]][current.path[2]].api._data
-    url = "/docs/" + current.path[1] + "/" + current.path[2] + "/" + current.path[3] + "/" + slug + ".html"
-    num = number++
-
-    li.c8
-      != partial("../../../_includes/_hover-card", { number: num, name: page.title, url: url })