diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 705ff0a549..dd6b987f11 100755
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -91,6 +91,7 @@ pages:
 
 # Reference
 - ['reference/index.md', '**HIDDEN**']
+- ['reference/commandline/index.md', '**HIDDEN**']
 - ['reference/commandline/cli.md', 'Reference', 'Command line']
 - ['reference/builder.md', 'Reference', 'Dockerfile']
 - ['reference/run.md', 'Reference', 'Run Reference']
@@ -99,6 +100,7 @@ pages:
 - ['articles/security.md', 'Reference', 'Security']
 - ['articles/baseimages.md', 'Reference', 'Creating a Base Image']
 - ['use/networking.md', 'Reference', 'Advanced networking']
+- ['reference/api/index.md', '**HIDDEN**']
 - ['reference/api/docker-io_api.md', 'Reference', 'Docker.io API']
 - ['reference/api/registry_api.md', 'Reference', 'Docker Registry API']
 - ['reference/api/registry_index_spec.md', 'Reference', 'Registry & Index Spec']
@@ -109,24 +111,6 @@ pages:
 - ['reference/api/docker_io_oauth_api.md', 'Reference', 'Docker IO OAuth API']
 - ['reference/api/docker_io_accounts_api.md', 'Reference', 'Docker IO Accounts API']
 
-#archived API references
-- ['reference/api/docker_remote_api_v1.9.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.8.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.7.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.6.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.5.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.4.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.3.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.2.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.1.md', '**HIDDEN**']
-- ['reference/api/docker_remote_api_v1.0.md', '**HIDDEN**']
-
-# Contribute:
-- ['contributing/index.md', '**HIDDEN**']
-- ['contributing/contributing.md', 'Contribute', 'Contributing']
-- ['contributing/devenvironment.md', 'Contribute', 'Development environment']
-# - ['about/license.md', 'About', 'License']
-
 - ['jsearch.md', '**HIDDEN**']
 
 # - ['static_files/README.md', 'static_files', 'README']
@@ -138,3 +122,11 @@ pages:
 - ['terms/repository.md', '**HIDDEN**']
 - ['terms/filesystem.md', '**HIDDEN**']
 - ['terms/image.md', '**HIDDEN**']
+
+# TODO: our theme adds a dropdown even for sections that have no subsections.
+  #- ['faq.md', 'FAQ']
+
+# Contribute:
+- ['contributing/index.md', '**HIDDEN**']
+- ['contributing/contributing.md', 'Contribute', 'Contributing']
+- ['contributing/devenvironment.md', 'Contribute', 'Development environment']
diff --git a/docs/sources/docker-io/index.md b/docs/sources/docker-io/index.md
deleted file mode 100644
index 747b4ee491..0000000000
--- a/docs/sources/docker-io/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
-title
-:   Documentation
-
-description
-:   -- todo: change me
-
-keywords
-:   todo, docker, documentation, basic, builder
-
-Use
-===
-
-Contents:
-
-{{ site_name }}
diff --git a/docs/sources/reference/commandline.md b/docs/sources/reference/commandline.md
deleted file mode 100644
index b15f529394..0000000000
--- a/docs/sources/reference/commandline.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Commands
-
-## Contents:
-
-- [Command Line](cli/)
-