diff --git a/README.md b/README.md
index 79b5f49..87467d2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 This repository contains the [Editor's Draft](https://w3c.github.io/security-questionnaire/) of the [Self-Review Questionnaire: Security and Privacy](https://www.w3.org/TR/security-privacy-questionnaire/) document, which spec authors can use to identify and work through possible security and privacy concerns related to their spec.
 
-The questionnaire is a joint product of three groups: the [TAG](https://tag.w3.org/), [PING](https://www.w3.org/Privacy/IG/), and the [Security Interest Group](https://www.w3.org/groups/ig/security/).
+The questionnaire is a joint product of two groups: the [Privacy Working Group](https://www.w3.org/groups/wg/privacy/), and the [Security Interest Group](https://www.w3.org/groups/ig/security/).
 
 When folks request a [design review](https://github.com/w3ctag/design-reviews) from the TAG, [filling out](questionnaire.markdown) the security and privacy questionnaire helps the TAG to understand potential security and privacy issues and mitigations for the design, and can save us asking redundant questions.
 
diff --git a/index.bs b/index.bs
index ce67070..f75f0a0 100644
--- a/index.bs
+++ b/index.bs
@@ -6,14 +6,14 @@ ED: https://w3c.github.io/security-questionnaire/
 Shortname: security-privacy-questionnaire
 Repository: w3c/security-questionnaire
 Level: None
-Editor: Theresa O’Connor, w3cid 40614, Apple Inc. https://apple.com, hober@apple.com
 Editor: Peter Snyder, w3cid 109401, Brave Software https://brave.com, pes@brave.com
 Editor: Simone Onofri, w3cid 38211, W3C https://w3.org, simone@w3.org
 Former Editor: Jason Novak, Apple Inc., https://apple.com
 Former Editor: Lukasz Olejnik, Independent researcher, https://lukaszolejnik.com
 Former Editor: Mike West, Google Inc., mkwst@google.com
+Former Editor: Theresa O’Connor, w3cid 40614, Apple Inc. https://apple.com, hober@apple.com
 Former Editor: Yan Zhu, Yahoo Inc., yan@brave.com
-Group: tag
+Group: privacywg
 Markup Shorthands: css no, markdown yes
 Local Boilerplate: status yes
 Local Boilerplate: copyright yes
@@ -1328,9 +1328,6 @@ practices before the site prompted for location.
 
 <h2 id="acknowledgements" class="no-num">Acknowledgements</h2>
 
-<!-- Current TAG participants who would otherwise be ackked are
-     commented out. Please uncomment them when their term on the TAG
-     ends! -->
 Many thanks to
 Alice Boxhall,
 Alex Russell,
@@ -1338,15 +1335,15 @@ Anne van Kesteren,
 Chris Cunningham,
 Coralie Mercier,
 Corentin Wallez,
-<!-- Daniel Appelquist, -->
+Daniel Appelquist,
 David Baron,
 Domenic Denicola,
 Dominic Battre,
-<!-- Hadley Beeman, -->
+Hadley Beeman,
 Jeffrey Yasskin,
 Jeremy Roman,
 Jonathan Kingston,
-<!-- Kenneth Rohde Christiansen, -->
+Kenneth Rohde Christiansen,
 Marcos Caceres,
 Marijn Kruisselbrink,
 Mark Nottingham,
@@ -1356,12 +1353,12 @@ Mike Perry,
 Nick Doty,
 Robert Linder,
 Piotr Bialecki,
-<!-- Rossen Atanassov, -->
+Rossen Atanassov,
 Samuel Weiler,
-<!-- Sangwhan Moon, -->
+Sangwhan Moon,
 Tantek Çelik,
 Thomas Steiner,
-<!-- Yves Lafon, -->
+Yves Lafon,
 Wendy Seltzer,
 and
 the many current and former participants in PING, the Privacy Working Group,
@@ -1377,11 +1374,13 @@ Mike West
 wrote the initial version of this document
 and edited it for a number of years.
 Yan Zhu
-took over from Mike and, in turn,
+took over from Mike.
 Jason Novak
 and
 Lukasz Olejnik
-took it over from her.
+took it over from her,
+and the TAG as a whole evolved and published the document for several years```
+before handing it over to the current maintainers.
 The current editors are indebted to all of their hard work.
 We hope we haven't made it (much) worse.
 
diff --git a/status.include b/status.include
index 123cae3..bac969f 100644
--- a/status.include
+++ b/status.include
@@ -1,6 +1,6 @@
 <p><em>This section describes the status of this document at the time of its publication. A list of current W3C publications and the latest revision of this technical report can be found in the <a href="https://www.w3.org/TR/">W3C technical reports index</a> at https://www.w3.org/TR/.</em></p>
 
-<p>This document was published by the <a href="https://www.w3.org/groups/other/tag">Technical Architecture Group</a>, the <a href="https://www.w3.org/groups/wg/privacy">Privacy Working Group</a>, and the <a href="https://www.w3.org/groups/ig/security/">Security Interest Group</a> as a Group Note using the Note track.</p>
+<p>This document was published by the <a href="https://www.w3.org/groups/wg/privacy">Privacy Working Group</a> and the <a href="https://www.w3.org/groups/ig/security/">Security Interest Group</a> as a Group Note using the Note track.</p>
 
   <p>Group Notes are not endorsed by <abbr title="World Wide Web Consortium">W3C</abbr> nor its Members. </p>
 
@@ -20,7 +20,7 @@
     <a href="https://github.com/[REPOSITORY]/">GitHub repository</a>.
   </p>
 
-  <p data-deliverer="34270,160680,49310">
+  <p data-deliverer="160680,49310">
     The <a href="https://www.w3.org/policies/patent-policy/">W3C Patent Policy</a> does not carry any licensing requirements or commitments on this document.
   </p>
 
diff --git a/w3c.json b/w3c.json
index 8f58c33..b9463c1 100644
--- a/w3c.json
+++ b/w3c.json
@@ -1,5 +1,5 @@
 {
-    "group": ["other/tag", "wg/privacy", "ig/security"],
-    "contacts": ["tjwhalen", "ylafon", "simoneonofri"],
+    "group": ["wg/privacy", "ig/security"],
+    "contacts": ["tjwhalen", "simoneonofri"],
     "repo-type": "note"
 }