diff --git a/source/archive-reference-files/fundamentals/crud/write-read-pref.txt b/source/archive-reference-files/fundamentals/crud/write-read-pref.txt
index 91742fd3..3f3f2bf7 100644
--- a/source/archive-reference-files/fundamentals/crud/write-read-pref.txt
+++ b/source/archive-reference-files/fundamentals/crud/write-read-pref.txt
@@ -37,8 +37,6 @@ the following levels:
 In the following sections, you can learn how to customize the consistency and
 availability of the data in your replica sets.
 
-.. _golang-writeconcern:
-
 Write Concern
 -------------
 
diff --git a/source/archive-reference-files/fundamentals/enterprise-auth.txt b/source/archive-reference-files/fundamentals/enterprise-auth.txt
index cd539b55..68529c1a 100644
--- a/source/archive-reference-files/fundamentals/enterprise-auth.txt
+++ b/source/archive-reference-files/fundamentals/enterprise-auth.txt
@@ -198,8 +198,6 @@ address of your MongoDB server:
    authenticates using the PLAIN Simple Authentication and Security Layer
    (SASL) defined in `RFC-4616 <https://tools.ietf.org/html/rfc4616>`__.
 
-.. _golang-mongodb-oidc:
-
 MONGODB-OIDC
 ------------
 
@@ -479,8 +477,6 @@ callback function that you defined:
    :end-before: end-credential-callback
    :emphasize-lines: 6
 
-.. _golang-kubernetes-oidc:
-
 Kubernetes
 ~~~~~~~~~~
 
diff --git a/source/archive-reference-files/fundamentals/monitoring.txt b/source/archive-reference-files/fundamentals/monitoring.txt
index 0b47891d..c67c5e3c 100644
--- a/source/archive-reference-files/fundamentals/monitoring.txt
+++ b/source/archive-reference-files/fundamentals/monitoring.txt
@@ -1,4 +1,3 @@
-.. _golang-monitoring:
 
 ==========
 Monitoring
diff --git a/source/reference/release-notes.txt b/source/reference/release-notes.txt
index 12e7188b..92f5ad6e 100644
--- a/source/reference/release-notes.txt
+++ b/source/reference/release-notes.txt
@@ -1,8 +1,6 @@
 .. _golang-whats-new:
 .. _golang-release-notes:
 
-.. TODO clean up
-
 =============
 Release Notes
 =============
@@ -130,9 +128,8 @@ in the {+driver-short+} source code on GitHub.
 
 This release includes the following improvements and fixes:
 
-- Support for OpenID Connect (OIDC) authentication. To learn more, see
-  the :ref:`golang-mongodb-oidc` section of the Enterprise
-  Authentication Mechanisms guide.
+- Documentation support for OpenID Connect (OIDC) authentication. To learn more, see
+  the :ref:`golang-mongodb-oidc` guide.
 
 - You can access the GridFS API from the ``mongo`` package. In previous
   versions, you could access GridFS functions from the separate ``gridfs``
@@ -219,8 +216,7 @@ The 1.17 {+driver-short+} release includes the following improvements
 and fixes:
 
 - Adds support for OpenID Connect (OIDC) authentication. To learn more, see
-  the :ref:`golang-mongodb-oidc` section of the Enterprise
-  Authentication Mechanisms guide.
+  the :ref:`golang-mongodb-oidc` guide.
 
 - Adds support for Queryable Encryption (QE) range queries. To use this
   feature, your app must connect to {+mdb-server+} 8.0 or later. For
@@ -376,7 +372,7 @@ Logging Interface
 You can now record connection management and command execution events by
 using the ``LogSink`` logging interface.
 
-To learn more, see the :ref:`golang-logging` Fundamentals guide.
+To learn more, see the :ref:`golang-logging` guide.
 
 Additional BSON Marshalling Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~