diff --git a/app-shells/rrs/metadata.xml b/app-shells/rrs/metadata.xml
index 0f7a216781735..a3862b8ec2fc1 100644
--- a/app-shells/rrs/metadata.xml
+++ b/app-shells/rrs/metadata.xml
@@ -5,7 +5,4 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">rrs</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/cvs-fast-export/metadata.xml b/dev-vcs/cvs-fast-export/metadata.xml
index b82d1c9c6b9a6..10e4ea021b980 100644
--- a/dev-vcs/cvs-fast-export/metadata.xml
+++ b/dev-vcs/cvs-fast-export/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
-<upstream>
-  <remote-id type="freecode">cvs-fast-export</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/cvsps/metadata.xml b/dev-vcs/cvsps/metadata.xml
index 0ac4a88f8792a..115e9d64a6695 100644
--- a/dev-vcs/cvsps/metadata.xml
+++ b/dev-vcs/cvsps/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freecode">cvsps</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-action/luola/metadata.xml b/games-action/luola/metadata.xml
index b2c2edf3b20c8..7c730d47817a3 100644
--- a/games-action/luola/metadata.xml
+++ b/games-action/luola/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">luola</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
index ee427295410e4..7c730d47817a3 100644
--- a/games-puzzle/einstein/metadata.xml
+++ b/games-puzzle/einstein/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">einsteinpuzzle</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
index 652bdb753ecc7..bad30ff48c809 100644
--- a/games-puzzle/wmpuzzle/metadata.xml
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -9,7 +9,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">wmpuzzle</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/games-roguelike/wrogue/metadata.xml b/games-roguelike/wrogue/metadata.xml
index a97d8139b7dba..968ca19a0d398 100644
--- a/games-roguelike/wrogue/metadata.xml
+++ b/games-roguelike/wrogue/metadata.xml
@@ -9,7 +9,4 @@
 Warp Rogue is a gothic science fantasy roguelike game. It features RPG-like game
 mechanics, recruitable NPCs, and a consistent theme.
 </longdescription>
-	<upstream>
-		<remote-id type="freecode">wrogue</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index f0e845edde9b8..2ba2944b6f0d0 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -16,7 +16,6 @@
     </maintainer>
     <changelog>https://gitlab.gnome.org/GNOME/gnome-commander/-/blob/master/NEWS</changelog>
     <bugs-to>https://gitlab.gnome.org/GNOME/gnome-commander/issues</bugs-to>
-    <remote-id type="freecode">gnome-commander</remote-id>
   </upstream>
   <use>
     <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
diff --git a/media-gfx/monica/metadata.xml b/media-gfx/monica/metadata.xml
index 57fcefba36a5d..4f917230224b1 100644
--- a/media-gfx/monica/metadata.xml
+++ b/media-gfx/monica/metadata.xml
@@ -11,7 +11,4 @@
 		"brightness" of your screen jibes with what others see... (the Internet sRGB
 		standard gamma of 2.2) 
 	</longdescription>
-	<upstream>
-		<remote-id type="freecode">monica</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-libs/giblib/metadata.xml b/media-libs/giblib/metadata.xml
index 1f1adfb12201f..f70c8f227f005 100644
--- a/media-libs/giblib/metadata.xml
+++ b/media-libs/giblib/metadata.xml
@@ -10,7 +10,4 @@ fontstyles, which can be loaded from files, saved to files or defined
 dynamically through the API. It also, and more importantly, wraps 
 imlib2's context API changing.
 </longdescription>
-	<upstream>
-		<remote-id type="freecode">giblib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-libs/icclib/metadata.xml b/media-libs/icclib/metadata.xml
index cf41b28b40798..882504794e17d 100644
--- a/media-libs/icclib/metadata.xml
+++ b/media-libs/icclib/metadata.xml
@@ -5,7 +5,4 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freecode">icclib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 1a94d1573c477..0c67c1caf7f30 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -19,6 +19,5 @@
   </use>
   <upstream>
     <remote-id type="github">FFTW/fftw3</remote-id>
-    <remote-id type="freecode">fftw</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index f4b9723702052..115e9d64a6695 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freecode">gkrellm-countdown</remote-id>
-	</upstream>
 </pkgmetadata>