diff --git a/layouts/partials/processed-content.html b/layouts/partials/processed-content.html
index eb0d9d9..7e6cc2b 100644
--- a/layouts/partials/processed-content.html
+++ b/layouts/partials/processed-content.html
@@ -1,6 +1,6 @@
 {{ if .Params.footnote_heading -}}
 
-<!--Add heading to footnotes-->
+<!--Add heading to footnotes, remove unused class-->
 {{ $references    := `(<section class="footnotes" role="doc-endnotes">
 <hr>)` -}}
 {{ $heading :=  .Params.footnote_heading -}}
@@ -17,7 +17,7 @@
 
 <!--Move the Table of Contents heading *inside* the <nav> element-->
 {{ $tocHeadingOutside := `<h2>Table of Contents</h2><nav id="TableOfContents">` }}
-{{ $tocHeadingInside := `<nav id=TableOfContents><h2>Table of Contents</h2>` }}
+{{ $tocHeadingInside := `<nav id=TableOfContents role="doc-toc"><h2>Table of Contents</h2>` }}
 
 {{ .Content | replaceRE $references $referencesWithHeading | replaceRE $endnote $noEndnote | replaceRE $preWithoutTabIndex $preWithTabIndex | replaceRE $tocHeadingOutside $tocHeadingInside | safeHTML -}}
 {{ else -}}
diff --git a/layouts/shortcodes/toc.html b/layouts/shortcodes/toc.html
index c762bbc..c563e7e 100644
--- a/layouts/shortcodes/toc.html
+++ b/layouts/shortcodes/toc.html
@@ -1,5 +1,3 @@
 <aside>
-<section role="doc-toc">
 <h2>Table of Contents</h2>{{.Page.TableOfContents}}
-</section>
 </aside>