diff --git a/content/en/templates/files.md b/content/en/templates/files.md
index 2170f9a7e..943428f07 100644
--- a/content/en/templates/files.md
+++ b/content/en/templates/files.md
@@ -48,7 +48,6 @@ If you are going to create [custom shortcodes](/templates/shortcode-templates/)
 {{% /warning %}}
 
 [called directly in the Hugo docs]: https://github.com/gohugoio/hugoDocs/blob/master/content/en/templates/files.md
-[dirindex]: https://github.com/gohugoio/hugo/blob/master/docs/layouts/shortcodes/directoryindex.html
 [osfileinfo]: https://golang.org/pkg/os/#FileInfo
 [readDir]: /functions/readdir/
 [readFile]: /functions/readfile/
diff --git a/layouts/shortcodes/content-tree.html b/layouts/shortcodes/content-tree.html
deleted file mode 100644
index 0cb527cb5..000000000
--- a/layouts/shortcodes/content-tree.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="code">
-    <pre><code>
-        ├── blog
-        │   ├── _index.md [section]
-        │   ├── first-post.md [page]
-        │   └── second-post
-        │       ├── index.md [page bundle]
-        │       └── photo.jpg [page resource]
-        └── tags
-            ├── _index.md [taxonomy]
-            └── funny
-                └── _index.md [term]
-    </code></pre>
-</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/directoryindex.html b/layouts/shortcodes/directoryindex.html
deleted file mode 100644
index 37e7d3ad1..000000000
--- a/layouts/shortcodes/directoryindex.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- $pathURL := .Get "pathURL" -}}
-{{- $path := .Get "path" -}}
-{{- $files := readDir $path -}}
-<table>
-    <th>Size in bytes</th>
-    <th>Name</th>
-{{- range $files }}
-    <tr>
-        <td>{{ .Size }}</td>
-        <td><a href="{{ $pathURL }}{{ .Name | relURL }}" target="_blank"> {{ .Name }}</a></td>
-    </tr>
-{{- end }}
-</table>
diff --git a/layouts/shortcodes/docfile.html b/layouts/shortcodes/docfile.html
deleted file mode 100644
index 2f982aae8..000000000
--- a/layouts/shortcodes/docfile.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ $file := .Get 0}}
-{{ $filepath := $file }}
-{{ $syntax := index (split $file ".") 1 }}
-{{ $syntaxoverride := eq (len .Params) 2 }}
-<div class="code-copy" id="{{$file | urlize}}">
-	<div class="code-copy-header"><div class="action-buttons"></div><span title="" class="filename">{{$filepath}}</span><i class="icon-{{$syntax}} input"></i></div>
-	<button class="copy-button" title="Copy to clipboard" data-clipboard-snippet>
-			<div class="copy-text"><i class="icon-clipboard"></i> COPY</div>
-	</button>
-	<pre><code class="language-{{if $syntaxoverride}}{{.Get 1}}{{else}}{{$syntax}}{{end}}">{{- readFile $file -}}</code></pre>
-</div>
diff --git a/layouts/shortcodes/exfile.html b/layouts/shortcodes/exfile.html
deleted file mode 100644
index 226782957..000000000
--- a/layouts/shortcodes/exfile.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ $file := .Get 0}}
-{{ $filepath := replace $file "static/" ""}}
-{{ $syntax := index (split $file ".") 1 }}
-{{ $syntaxoverride := eq (len .Params) 2 }}
-<div class="code-copy" id="{{$file | urlize}}">
-	<div class="code-copy-header examplesite"><div class="action-buttons"></div><span class="filename"><i class="icon-website"></i>{{$filepath}}</span><i class="icon-{{$syntax}} input"></i></div>
-	<button class="copy-button" title="Copy to clipboard" data-clipboard-snippet>
-			<div class="copy-text"><i class="icon-clipboard"></i> COPY</div>
-	</button>
-	<pre><code class="language-{{if $syntaxoverride}}{{.Get 1}}{{else}}{{$syntax}}{{end}}">{{- readFile $file -}}</code></pre>
-	<a role="button" target="_blank" href="{{$.Site.Params.ghdocsrepo}}{{$file}}" title="See {{$filepath}} source on GitHub" class="tooltip see-on-github" data-tooltip="See {{$filepath}} source on GitHub">Source<i class="icon-github"></i></a>
-</div>
diff --git a/layouts/shortcodes/exfm.html b/layouts/shortcodes/exfm.html
deleted file mode 100644
index c0429bbe1..000000000
--- a/layouts/shortcodes/exfm.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Similar to exfile.html but *only* pulls the front matter from the example/content/*md -->
-{{ $file := .Get 0}}
-{{ $filepath := replace $file "static/" ""}}
-{{ $syntax := index (split $file ".") 1 }}
-{{ $syntaxoverride := eq (len .Params) 2 }}
-<div class="code-copy" id="{{$file | urlize}}">
-	<div class="code-copy-header examplesite"><div class="action-buttons"></div><span title="" class="filename">{{$filepath}}</span><i class="icon-{{$syntax}} input"></i></div>
-	<button class="copy-button" title="Copy to clipboard" data-clipboard-snippet>
-			<div class="copy-text"><i class="icon-clipboard"></i> COPY</div>
-	</button>
-	<pre><code class="language-{{if $syntaxoverride}}{{.Get 1}}{{else}}{{$syntax}}{{end}}">{{- readFile $file -}}</code></pre>
-	<a role="button" target="_blank" href="{{$.Site.Params.ghdocsrepo}}{{$file}}" title="See {{$filepath}} on GitHub" class="see-on-github">Source<i class="icon-github"></i></a>
-</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/gh.html b/layouts/shortcodes/gh.html
deleted file mode 100644
index 981f4b838..000000000
--- a/layouts/shortcodes/gh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ range .Params }}
-	{{   if eq (substr . 0 1) "@" }}
-	<a href="//github.com/{{ substr . 1 }}">{{ . }}</a>
-	{{   else if eq (substr . 0 2) "0x" }}
-	<a href="//github.com/gohugoio/hugo/commit/{{ substr . 2 }}">{{ substr . 2 6 }}</a>
-	{{   else }}
-	<a href="//github.com/gohugoio/hugo/issues/{{ . }}">#{{ . }}</a>
-	{{ end }}
-{{ end }}
diff --git a/layouts/shortcodes/ghrepo.html b/layouts/shortcodes/ghrepo.html
deleted file mode 100644
index e9df40d6a..000000000
--- a/layouts/shortcodes/ghrepo.html
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{{$.Site.Params.ghrepo}}" target="_blank">GitHub repository</a>
\ No newline at end of file
diff --git a/layouts/shortcodes/nohighlight.html b/layouts/shortcodes/nohighlight.html
deleted file mode 100644
index 238234f17..000000000
--- a/layouts/shortcodes/nohighlight.html
+++ /dev/null
@@ -1 +0,0 @@
-<pre><code class="hljs nohighlight">{{ .Inner }}</code></pre>
\ No newline at end of file
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
deleted file mode 100644
index 24d2cd0b2..000000000
--- a/layouts/shortcodes/note.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
-<aside class="admonition note">
-	<div class="note-icon">
-		{{partial "svg/exclamation.svg" (dict "size" "20px" ) }}
-	</div>
-	<!-- <h2 id="{{if .Get 0}}{{.Get 0 | urlize}}{{else}}note{{end}}">{{if .Get 0}}{{.Get 0 | markdownify}}{{else}}Note{{end}}</h2> -->
-	<!-- <h3>Note</h3> -->
-	<div class="admonition-content">{{- .Inner -}}</div>
-</aside>
diff --git a/layouts/shortcodes/tip.html b/layouts/shortcodes/tip.html
deleted file mode 100644
index 139e3376b..000000000
--- a/layouts/shortcodes/tip.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
-<aside class="admonition tip">
-	<div class="tip-icon">
-		{{partial "svg/exclamation.svg" .}}
-	</div>
-	<!-- <h2 id="{{if .Get 0}}{{.Get 0 | urlize}}{{else}}tip{{end}}">{{if .Get 0}}{{.Get 0 | markdownify}}{{else}}Tip{{end}}</h2> -->
-	<!-- <h3>Tip</h3> -->
-	<div class="admonition-content">{{- .Inner -}}</div>
-</aside>
diff --git a/layouts/shortcodes/warning.html b/layouts/shortcodes/warning.html
deleted file mode 100644
index c9147be64..000000000
--- a/layouts/shortcodes/warning.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
-<aside class="admonition warning">
-	<div class="admonition-icon">
-		{{partial "svg/exclamation.svg" .}}
-	</div>
-	<!-- <h2 id="{{if .Get 0}}{{.Get 0 | urlize}}{{else}}warning{{end}}">{{if .Get 0}}{{.Get 0 | markdownify}}{{else}}Warning{{end}}</h2> -->
-	<!-- <h3>Warning</h3> -->
-	<div class="admonition-content">{{- .Inner -}}</div>
-</aside>
diff --git a/layouts/shortcodes/yt.html b/layouts/shortcodes/yt.html
deleted file mode 100644
index 6915cec5f..000000000
--- a/layouts/shortcodes/yt.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="video-wrapper" data-streaming="youtube" data-videoid="{{.Get "id"}}" >
-	<i class="icon-video-play-button shortcode"></i>
-	{{if (.Get "thumbnail")}}
-	<div style="background-image:url(/images/thumbnails/{{.Get "thumbnail"}})" alt="YouTube Thumbnail" class="video-thumbnail"></div>
-	{{else}}
-	<div style="background-image:url(//img.youtube.com/vi/{{.Get "id"}}/0.jpg)" alt="YouTube Thumbnail" class="video-thumbnail"></div>
-	{{end}}
-</div>
-{{ if (.Get "description") }}
-<div class="video-description">{{ .Get "description" | markdownify }}</div>
-{{ end }}
\ No newline at end of file