diff --git a/src/layouts/_default/baseof.html b/src/layouts/_default/baseof.html
index 43f338ab2..83334389f 100644
--- a/src/layouts/_default/baseof.html
+++ b/src/layouts/_default/baseof.html
@@ -12,10 +12,10 @@
         <div class="sidebar">
           {{ partial "hero" . }}
         </div>
-        <div class="main">
+        <main class="main">
           {{ block "main" . }}
           {{ end }}
-        </div>
+        </main>
       </div>
     </div>
 
diff --git a/src/layouts/partials/analytics.html b/src/layouts/partials/analytics.html
index c238a6276..818c82a55 100644
--- a/src/layouts/partials/analytics.html
+++ b/src/layouts/partials/analytics.html
@@ -1 +1,3 @@
+{{- if hugo.IsProduction }}
 <script async src="https://cdn.usefathom.com/script.js" data-site="{{ .Site.Params.analytics.fathom_site }}"></script>
+{{- end }}
diff --git a/src/layouts/partials/head.html b/src/layouts/partials/head.html
index 890ceb095..f1543193b 100644
--- a/src/layouts/partials/head.html
+++ b/src/layouts/partials/head.html
@@ -25,6 +25,4 @@
 {{ partial "favicons" . -}}
 {{ partial "social" . -}}
 {{ partial "scripts" . -}}
-{{- if hugo.IsProduction }}
 {{ partial "analytics" . -}}
-{{- end }}
diff --git a/src/layouts/sitemap.xml b/src/layouts/sitemap.xml
deleted file mode 100644
index 9c626df18..000000000
--- a/src/layouts/sitemap.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  {{- range where .Data.Pages "Params.sitemap.exclude" "ne" true -}}{{ if .Permalink }}
-  <url>
-    <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
-    <lastmod>{{ safeHTML (.Lastmod.Format "2006-01-02T15:04:05-07:00") }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
-    <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
-    <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
-    <xhtml:link rel="alternate" hreflang="{{ .Language.LanguageCode }}" href="{{ .Permalink }}"/>{{ end }}
-    <xhtml:link rel="alternate" hreflang="{{ .Language.LanguageCode }}" href="{{ .Permalink }}"/>{{ end }}
-  </url>{{ end }}{{ end }}
-</urlset>