diff --git a/layouts/shortcodes/figure.bak.html b/layouts/shortcodes/figure.bak.html
deleted file mode 100644
index b58b09b..0000000
--- a/layouts/shortcodes/figure.bak.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-  SPDX-FileCopyrightText: 2020 Max Mehl <mail@mehl.mx>
-  SPDX-License-Identifier: MIT
--->
-<!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/snap-gallery.css" />{{ end }}
-{{- $.Page.Scratch.Add "figurecount" 1 -}}
-<!-- use src image -->
-{{- $thumb := .Get "src" -}}
-
-<!-- set unique ID depending on whether part of gallery or alone -->
-{{- $figid := "" -}}
-{{- $galid := "" -}}
-{{- $id := "" -}}
-{{- $previd := "" -}}
-{{- $nextid := "" -}}
-{{- if .Parent -}} <!-- gallery -->
-  {{- $galid = .Page.Scratch.Get "gallery" -}}
-  {{- if not $galid }}{{ $galid = 0 }}{{ end -}}
-  {{- $galid = add $galid 1 -}}
-  {{- $.Page.Scratch.Add "thisgalfig" 1 -}}
-  {{- $figid = .Page.Scratch.Get "thisgalfig" -}}
-{{- else -}} <!-- standalone figure -->
-  {{- $.Page.Scratch.Add "nogalfig" 1 -}}
-  {{- $figid = .Page.Scratch.Get "nogalfig" -}}
-{{- end -}}
-{{- if $galid -}} <!-- gallery -->
-  {{- $id = print "gal" $galid "-" "fig" $figid -}}
-  {{- $previd = print "gal" $galid "-" "fig" (sub $figid 1) -}}
-  {{- $nextid = print "gal" $galid "-" "fig" (add $figid 1) -}}
-{{- else -}} <!-- standalone figure -->
-  {{- $id = print "fig" $figid -}}
-{{- end -}}
-
-<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-  <div class="snap-wrapper">
-    {{ if (.Get "link") -}}
-      <a href="{{ .Get "link" }}"
-         {{- with .Get "target" }} target="{{ . }}"{{ end -}}
-         {{- with .Get "rel" }} rel="{{ . }}"{{ end -}}
-         >
-    {{ else -}}
-      {{ if not (eq (.Get "lightbox") "none") }}<a href="#{{ $id }}">{{ end }}
-    {{- end -}}
-    <!-- THUMBNAIL -->
-      <img src="{{ $thumb | relURL }}" class="snap-thumb"
-      {{- with .Get "alt" }} alt="{{ . }}"{{ end -}}
-      {{- with .Get "title" }} title="{{ . }}"{{ end -}}
-      {{- with .Get "height" }} height="{{ . }}"{{ end -}}
-      {{- with .Get "width" }} width="{{ . }}"{{ end -}}
-       />
-      {{- if or (.Get "caption") (.Get "attr")}}
-        <figcaption>
-          {{- .Get "caption" | markdownify -}}
-          {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
-        </figcaption>
-      {{- end }}
-    </a>
-    <!-- FULL IMAGE; HIDDEN -->
-    {{- if not (eq (.Get "lightbox") "none") -}}
-      <div class="snap-lightbox" id="{{ $id }}">
-        <a href="#_" class="snap-lightbox-close"></a>
-        <div class="snap-lightbox-inner">
-          <img src="{{ .Get "src" }}" {{ with .Get "alt" }}alt="{{ . }}"{{ end }} />
-          <p>
-          {{- if or (.Get "caption") (.Get "attr") -}}
-            {{- .Get "caption" | markdownify -}}
-            {{- with .Get "attrlink" }} <a href="{{ . }}">{{- end -}}
-            {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
-            {{- with .Get "attrlink" }}</a>{{- end -}}
-          {{- end }}
-          </p>
-        </div>
-        <a href="#_" class="snap-lightbox-close-button"><i class="snap-lightbox-x"></i></a>
-        {{- if .Parent -}}
-          {{- if not (eq $figid 1) -}}
-            <a href="#{{ $previd }}" class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></a>
-          {{- else -}}
-            <span class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></span>
-          {{- end -}}
-          <!-- TODO: Somehow try to identify whether this is the last element in the gallery -->
-          <a href="#{{ $nextid }}" class="snap-lightbox-next"><i class="snap-lightbox-arrow"></i></a>
-        {{- end }}
-      </div>
-    {{- end -}}
-  </div>
-</figure>
diff --git a/layouts/shortcodes/gallery.bak.html b/layouts/shortcodes/gallery.bak.html
deleted file mode 100644
index fca5650..0000000
--- a/layouts/shortcodes/gallery.bak.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  SPDX-FileCopyrightText: 2020 Max Mehl <mail@mehl.mx>
-  SPDX-License-Identifier: MIT
--->
-<!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- .Page.Scratch.Add "gallery" 1 -}}
-<div class="snap-gallery">
-  {{ .Inner }}
-</div>
-<!-- delete count of gallery figures (but not those of standalone figures -->
-{{- .Page.Scratch.Delete "thisgalfig" -}}
diff --git a/layouts/shortcodes/snap-dir.bak.html b/layouts/shortcodes/snap-dir.bak.html
deleted file mode 100644
index ca67df6..0000000
--- a/layouts/shortcodes/snap-dir.bak.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-  SPDX-FileCopyrightText: 2020 Max Mehl <mail@mehl.mx>
-  SPDX-License-Identifier: MIT
--->
-<!-- This file is a variation of figure.html specifically to load all
-     files from a directory. Assumes that is has the gallery shortcode
-     as parent
--->
-<!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/snap-gallery.css" />{{ end }}
-{{- $.Page.Scratch.Add "figurecount" 1 -}}
-
-{{- $files := readDir (print "/static" (.Get "srcdir")) -}}
-{{- $maxid := len $files -}}
-
-{{- range $files -}}
-  {{ $src := (print ($.Get "srcdir") "/" .Name) }}
-  {{- $thumb := $src -}}
-
-  <!-- set unique ID for gallery and figure -->
-  {{- $figid := "" -}}
-  {{- $galid := "" -}}
-  {{- $id := "" -}}
-  {{- $previd := "" -}}
-  {{- $nextid := "" -}}
-  {{- $galid = $.Page.Scratch.Get "gallery" -}}
-  {{- if not $galid }}{{ $galid = 0 }}{{ end -}}
-  {{- $galid = add $galid 1 -}}
-  {{- $.Page.Scratch.Add "thisgalfig" 1 -}}
-  {{- $figid = $.Page.Scratch.Get "thisgalfig" -}}
-  {{- $id = print "gal" $galid "-" "fig" $figid -}}
-  {{- $previd = print "gal" $galid "-" "fig" (sub $figid 1) -}}
-  {{- $nextid = print "gal" $galid "-" "fig" (add $figid 1) -}}
-
-  <figure>
-    <!-- THUMBNAIL -->
-    <a href="#{{ $id }}">
-      <img src="{{ $thumb | relURL }}" class="snap-thumb" />
-    </a>
-    <!-- FULL IMAGE; HIDDEN -->
-    <div class="snap-lightbox" id="{{ $id }}">
-      <a href="#_" class="snap-lightbox-close"></a>
-      <div class="snap-lightbox-inner">
-        <img src='{{ $src }}' />
-      </div>
-      <a href="#_" class="snap-lightbox-close-button"><i class="snap-lightbox-x"></i></a>
-      {{- if not (eq $figid 1) -}}
-        <a href="#{{ $previd }}" class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></a>
-      {{- else -}}
-        <span class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></span>
-      {{- end -}}
-      {{- if not (eq $figid $maxid) -}}
-        <a href="#{{ $nextid }}" class="snap-lightbox-next"><i class="snap-lightbox-arrow"></i></a>
-      {{- else -}}
-        <span class="snap-lightbox-next"><i class="snap-lightbox-arrow"></i></span>
-      {{- end }}
-    </div>
-  </figure>
-{{ end }}