diff --git a/conf.py b/conf.py
index 342166db6b..9079278428 100644
--- a/conf.py
+++ b/conf.py
@@ -95,13 +95,6 @@
 
 intersphinx_mapping = {
     'python':        ('https://docs.python.org/3', None),
-    'catkin_pkg':    ('http://docs.ros.org/en/independent/api/catkin_pkg/html', None),
-    'jenkins_tools': ('http://docs.ros.org/en/independent/api/jenkins_tools/html', None),
-    'rosdep':        ('http://docs.ros.org/en/independent/api/rosdep/html', None),
-    'rosdistro':     ('http://docs.ros.org/en/independent/api/rosdistro/html', None),
-    'rosinstall':    ('http://docs.ros.org/en/independent/api/rosinstall/html', None),
-    'rospkg':        ('http://docs.ros.org/en/independent/api/rospkg/html', None),
-    'vcstools':      ('http://docs.ros.org/en/independent/api/vcstools/html', None)
 }
 
 # sphinx-copybutton config
diff --git a/source/Releases/Release-Dashing-Diademata.rst b/source/Releases/Release-Dashing-Diademata.rst
index 22f8e88edb..cca5fb9695 100644
--- a/source/Releases/Release-Dashing-Diademata.rst
+++ b/source/Releases/Release-Dashing-Diademata.rst
@@ -934,4 +934,4 @@ A few milestones leading up to the release:
 
     Wed. May 29th
         Freeze rosdistro.
-        No PRs for Dashing on the `rosdistro` repo will be merged (reopens after the release announcement).
+        No PRs for Dashing on the rosdistro repo will be merged (reopens after the release announcement).
diff --git a/source/Releases/Release-Eloquent-Elusor.rst b/source/Releases/Release-Eloquent-Elusor.rst
index c22101e869..6add541787 100644
--- a/source/Releases/Release-Eloquent-Elusor.rst
+++ b/source/Releases/Release-Eloquent-Elusor.rst
@@ -387,4 +387,4 @@ A few milestones leading up to the release:
 
     Tue. Nov 19th
         Freeze rosdistro.
-        No PRs for Eloquent on the `rosdistro` repo will be merged (reopens after the release announcement).
+        No PRs for Eloquent on the rosdistro repo will be merged (reopens after the release announcement).
diff --git a/source/Releases/Release-Foxy-Fitzroy.rst b/source/Releases/Release-Foxy-Fitzroy.rst
index 941b3f6da8..8a8402a180 100644
--- a/source/Releases/Release-Foxy-Fitzroy.rst
+++ b/source/Releases/Release-Foxy-Fitzroy.rst
@@ -601,7 +601,7 @@ A few milestones leading up to the release:
 
     Wed. June 3rd, 2020
         Freeze rosdistro.
-        No PRs for Foxy on the `rosdistro` repo will be merged (reopens after the release announcement).
+        No PRs for Foxy on the rosdistro repo will be merged (reopens after the release announcement).
 
 .. [1] The ``ros_core`` variant described in the `variants <https://github.com/ros2/variants>`_ repository.
 .. [2] The ``desktop`` variant described in the `variants <https://github.com/ros2/variants>`_ repository.