diff --git a/internal/fetch/dochtml/dochtml.go b/internal/fetch/dochtml/dochtml.go
index 117f069..daf10f8 100644
--- a/internal/fetch/dochtml/dochtml.go
+++ b/internal/fetch/dochtml/dochtml.go
@@ -4,8 +4,7 @@
 
 // Package dochtml renders Go package documentation into HTML.
 //
-// This package and its API are under development (see b/137567588).
-// It currently relies on copies of external packages with active CLs applied.
+// This package and its API are under development (see golang.org/issue/39883).
 // The plan is to iterate on the development internally for x/pkgsite
 // needs first, before factoring it out somewhere non-internal where its
 // API can no longer be easily modified.
diff --git a/internal/fetch/dochtml/internal/render/linkify.go b/internal/fetch/dochtml/internal/render/linkify.go
index dfa913b..660c440 100644
--- a/internal/fetch/dochtml/internal/render/linkify.go
+++ b/internal/fetch/dochtml/internal/render/linkify.go
@@ -26,7 +26,7 @@
 of converting words into links.
 */
 
-// TODO: Support hiding deprecated declarations (https:/golang.org/issue/17056).
+// TODO(golang.org/issue/17056): Support hiding deprecated declarations.
 
 const (
 	// Regexp for URLs.
diff --git a/internal/fetch/dochtml/internal/render/render.go b/internal/fetch/dochtml/internal/render/render.go
index 7c24f6c..6689537 100644
--- a/internal/fetch/dochtml/internal/render/render.go
+++ b/internal/fetch/dochtml/internal/render/render.go
@@ -3,11 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package render formats Go documentation as HTML.
-//
-// This is a temporary copy of CL 72890 (golang.org/cl/72890) for
-// testing of and iteration on its implementation and design.
-// It doesn't need to be updated other than as part of work on
-// b/137567588. Please /cc dmitshur@ on all changes to it.
+// It is an internal component that powers dochtml.
 package render
 
 import (
diff --git a/internal/fetch/dochtml/template.go b/internal/fetch/dochtml/template.go
index 9e1b8dc..d7860d9 100644
--- a/internal/fetch/dochtml/template.go
+++ b/internal/fetch/dochtml/template.go
@@ -13,8 +13,8 @@
 )
 
 // htmlPackage is the template used to render documentation HTML.
-// TODO: finalize URL scheme and design for notes, then factor out
-// inline CSS style.
+// TODO(golang.org/issue/5060): finalize URL scheme and design for notes,
+// then it becomes more viable to factor out inline CSS style.
 var htmlPackage = template.Must(template.New("package").Funcs(
 	map[string]interface{}{
 		"ternary": func(q, a, b interface{}) interface{} {
diff --git a/internal/fetch/internal/doc/doc.go b/internal/fetch/internal/doc/doc.go
index 096b82e..45b55ea 100644
--- a/internal/fetch/internal/doc/doc.go
+++ b/internal/fetch/internal/doc/doc.go
@@ -6,8 +6,11 @@
 //
 // This is a temporary copy of go/doc from Go 1.14 standard library
 // for testing of and validation of CL 204830 (golang.org/cl/204830).
-// It doesn't need to be updated other than as part of work on
-// b/137567588. Please /cc dmitshur@ on all changes to it.
+// Go 1.14 has been released, so go/doc can be used in its place as
+// soon as Go 1.14 is used for deployment.
+//
+// This package shouldn't be modified unless it's a part of a plan to
+// make an upstream change in go/doc package in the standard library.
 package doc
 
 import (
diff --git a/internal/source/source.go b/internal/source/source.go
index 27b83ae..af9f074 100644
--- a/internal/source/source.go
+++ b/internal/source/source.go
@@ -473,7 +473,7 @@
 			Directory: "{repo}/+/{commit}/{dir}",
 			File:      "{repo}/+/{commit}/{file}",
 			Line:      "{repo}/+/{commit}/{file}#{line}",
-			// no raw support (b/13912564)
+			// Gitiles has no support for serving raw content at this time.
 		},
 	},
 	{
diff --git a/internal/testing/integration/frontend_test.go b/internal/testing/integration/frontend_test.go
index 236e3d9..5be9e3d 100644
--- a/internal/testing/integration/frontend_test.go
+++ b/internal/testing/integration/frontend_test.go
@@ -27,8 +27,8 @@
 )
 
 func TestModulePackageDirectoryResolution(t *testing.T) {
-	// The shared test state sets up the following scenario to exercise the types
-	// of problems discussed in b/143814014: a directory that becomes a package,
+	// The shared test state sets up the following scenario to exercise
+	// what happens when a directory becomes a package,
 	// and then becomes a directory again. Specifically:
 	//  + at v1.2.3, github.com/golang/found/dir is a directory (containing dir/pkg)
 	//  + at v1.2.4, github.com/golang/found/dir is a package