diff --git a/metadata/com.example.root.analyticaltranslator.txt b/metadata/com.example.root.analyticaltranslator.txt
index 5016cbc451..e1fdb40da0 100644
--- a/metadata/com.example.root.analyticaltranslator.txt
+++ b/metadata/com.example.root.analyticaltranslator.txt
@@ -1,8 +1,8 @@
 Categories:Science & Education
 License:GPL-3.0-only
-Web Site:https://github.com/xpheres/AndroidAnalyticalTranslator/blob/HEAD/README.md
-Source Code:https://github.com/xpheres/AndroidAnalyticalTranslator
-Issue Tracker:https://github.com/xpheres/AndroidAnalyticalTranslator/issues
+Web Site:
+Source Code:
+Issue Tracker:
 Donate:http://lingoworld.eu/lingoworld/donations/donate.php
 Bitcoin:15WVb3LZWCsdZGjkNFBuELwt3U4zpnSgwa
 
@@ -20,9 +20,6 @@ Only translation from German to Spanish is already implemented (English is being
 implemented right now).
 .
 
-Repo Type:git
-Repo:https://github.com/xpheres/AndroidAnalyticalTranslator
-
 Build:0.01,1
     commit=9622285934dbf9fd4497618c43999d673f1ea4e7
     subdir=app
@@ -58,3 +55,5 @@ Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.06
 Current Version Code:6
+
+No Source Since:0.07
diff --git a/metadata/com.gcstar.scanner.txt b/metadata/com.gcstar.scanner.txt
index cee5595af1..996dcb2d18 100644
--- a/metadata/com.gcstar.scanner.txt
+++ b/metadata/com.gcstar.scanner.txt
@@ -1,7 +1,7 @@
 Categories:Multimedia
 License:GPL-2.0-or-later
 Web Site:http://www.gcstar.org/
-Source Code:http://svn.gna.org/viewcvs/gcstar/scanner
+Source Code:
 Issue Tracker:
 Donate:http://gcstar.org/contribute.en.php#donate
 
@@ -16,9 +16,6 @@ you can store additional data, such as the location or who you've lent it to.
 You may also search and filter your collection by many criteria.
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/svn/gcstar/scanner
-
 Build:1.0,1
     commit=2124
 
@@ -26,3 +23,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
+
+No Source Since:1.1
diff --git a/metadata/com.gcstar.viewer.txt b/metadata/com.gcstar.viewer.txt
index 0f0998e708..c1f83a64bf 100644
--- a/metadata/com.gcstar.viewer.txt
+++ b/metadata/com.gcstar.viewer.txt
@@ -1,7 +1,7 @@
 Categories:Writing
 License:GPL-2.0-or-later
 Web Site:http://wiki.gcstar.org/en/gcstar_viewer
-Source Code:http://svn.gna.org/viewcvs/gcstar/viewer
+Source Code:
 Issue Tracker:
 Donate:http://gcstar.org/contribute.en.php#donate
 
@@ -14,9 +14,6 @@ you can store additional data, such as the location or who you've lent it to.
 You may also search and filter your collection by many criteria.
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/svn/gcstar/viewer
-
 Build:2.8,10
     commit=2149
 
@@ -33,3 +30,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.12
 Current Version Code:14
+
+No Source Since:2.13
diff --git a/metadata/com.jorgecastillo.kanadrill.txt b/metadata/com.jorgecastillo.kanadrill.txt
index d039478169..3881c17729 100644
--- a/metadata/com.jorgecastillo.kanadrill.txt
+++ b/metadata/com.jorgecastillo.kanadrill.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:BSD-2-Clause-FreeBSD
 Web Site:
-Source Code:https://github.com/jorgecastillo/KanaDrill
-Issue Tracker:https://github.com/jorgecastillo/KanaDrill/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:KanaDrill
 Summary:Learn the Japanese kana
@@ -10,9 +10,6 @@ Description:
 Learn the Japanese kana through repetition
 .
 
-Repo Type:git
-Repo:https://github.com/jorgecastillo/KanaDrill
-
 Build:1.0.9,9
     commit=5c36e8c30644cfc2b0a8e7946506cb31cbbacbf4
     target=android-19
@@ -111,3 +108,5 @@ Auto Update Mode:None
 Update Check Mode:Static
 Current Version:1.3.3
 Current Version Code:33
+
+No Source Since:1.3.4
diff --git a/metadata/com.kn.paper_foss_theme.txt b/metadata/com.kn.paper_foss_theme.txt
index 5b44974d59..7a42d9d291 100644
--- a/metadata/com.kn.paper_foss_theme.txt
+++ b/metadata/com.kn.paper_foss_theme.txt
@@ -1,9 +1,8 @@
 Categories:Theming
 License:CC-BY-SA-4.0
 Web Site:
-Source Code:https://github.com/beli3ver/Paper-FOSS-Theme
-Issue Tracker:https://github.com/beli3ver/Paper-FOSS-Theme/issues
-Changelog:https://github.com/beli3ver/Paper-FOSS-Theme/blob/HEAD/CHANGELOG.md
+Source Code:
+Issue Tracker:
 Bitcoin:1CYiRF6AncdNkxcWTRFf5Mxi7UaFhC3jFG
 Litecoin:LY4Bq1K9gVWrMb4hkGQ39zGUcYJBx7dYcU
 
@@ -16,9 +15,6 @@ This icon theme based on the two GTK Icon Themes,
 aiming to provide a consistent and minimalistic look to your device.
 .
 
-Repo Type:git
-Repo:https://github.com/beli3ver/Paper-FOSS-Theme
-
 Build:0.2,2
     commit=04337f1af3c1cb34cef1ad6c8f856d5ec57a511a
     subdir=theme
@@ -119,3 +115,5 @@ Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.1.5.1
 Current Version Code:30
+
+No Source Since:1.1.5.2
diff --git a/metadata/com.styrkurapp.app.txt b/metadata/com.styrkurapp.app.txt
index 70864f2d83..e65965465c 100644
--- a/metadata/com.styrkurapp.app.txt
+++ b/metadata/com.styrkurapp.app.txt
@@ -22,9 +22,6 @@ progress.
 Track your measurements, weight and muscle gain with a simple and charts.
 .
 
-Repo Type:git
-Repo:https://github.com/Styrkur/styrkur-app/
-
 Build:1.1.5,101048
     commit=8f0155f6fa21a6a9d629db4dda2ba359ad419298
     subdir=mobile/platforms/android
@@ -39,3 +36,5 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:0
 Current Version Code:0
+
+No Source Since:1.1.6
diff --git a/metadata/de.freewarepoint.whohasmystuff.txt b/metadata/de.freewarepoint.whohasmystuff.txt
index 4e4ead027d..72962c6bc8 100644
--- a/metadata/de.freewarepoint.whohasmystuff.txt
+++ b/metadata/de.freewarepoint.whohasmystuff.txt
@@ -1,8 +1,8 @@
 Categories:Money
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/stovocor/whohasmystuff
-Issue Tracker:https://github.com/stovocor/whohasmystuff/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:Who Has My Stuff?
 Summary:Manager for lent items
@@ -13,9 +13,6 @@ of your lent things with this very simple application. It lets you define a
 description, date and contact person from your address book for each object.
 .
 
-Repo Type:git
-Repo:https://github.com/stovocor/whohasmystuff.git
-
 Build:1.0.7,8
     commit=1.0.7
     target=android-15
@@ -110,3 +107,5 @@ Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:1.0.33
 Current Version Code:34
+
+No Source Since:1.0.34
diff --git a/metadata/io.github.otakuchiyan.dnsman.txt b/metadata/io.github.otakuchiyan.dnsman.txt
index 19aa2e64d6..c67202d98d 100644
--- a/metadata/io.github.otakuchiyan.dnsman.txt
+++ b/metadata/io.github.otakuchiyan.dnsman.txt
@@ -1,8 +1,8 @@
 Categories:Connectivity,System
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/otakuchiyan/DNSman
-Issue Tracker:https://github.com/otakuchiyan/DNSman/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:DNS man
 Summary:Set DNS lookup server
@@ -10,9 +10,6 @@ Description:
 Change the used DNS server for specific wifi networks.
 .
 
-Repo Type:git
-Repo:https://github.com/otakuchiyan/DNSman
-
 Build:0.4,40
     commit=v0.4
     subdir=app
@@ -71,3 +68,5 @@ Auto Update Mode:None
 Update Check Mode:Tags ^v[0-9.]+$
 Current Version:0.10.1
 Current Version Code:101
+
+No Source Since:0.10.2
diff --git a/metadata/me.shrimadhavuk.numselapp.txt b/metadata/me.shrimadhavuk.numselapp.txt
index 069e4a8e8e..17e1605d2b 100644
--- a/metadata/me.shrimadhavuk.numselapp.txt
+++ b/metadata/me.shrimadhavuk.numselapp.txt
@@ -2,8 +2,8 @@ AntiFeatures:NonFreeDep
 Categories:Development
 License:MIT
 Web Site:https://shrimadhavuk.me/
-Source Code:https://github.com/SpEcHiDe/NoWhatOpen
-Issue Tracker:https://github.com/SpEcHiDe/NoWhatOpen/issues
+Source Code:
+Issue Tracker:
 Donate:https://www.instamojo.com/@spechide/
 Bitcoin:13csS5SByVR4e3tJ9c4gjC18Lua8dXDp9A
 
@@ -15,9 +15,6 @@ Application called WhatsApp, it is useless by itself. It makes clickable links
 to your WhatsApp chat work, without sharing the contact number with anybody.
 .
 
-Repo Type:git
-Repo:https://github.com/SpEcHiDe/NoWhatOpen
-
 Build:1.0,1
     commit=02e7c64b2e4626d04c0c9615cbde913dcf174eab
     subdir=app
@@ -27,3 +24,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
+
+No Source Since:1.1
diff --git a/metadata/net.alegen.android.netclip.txt b/metadata/net.alegen.android.netclip.txt
index f7993e5b4f..e2ba347f22 100644
--- a/metadata/net.alegen.android.netclip.txt
+++ b/metadata/net.alegen.android.netclip.txt
@@ -1,10 +1,8 @@
 Categories:System
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/alegen/netclip
-Issue Tracker:https://github.com/alegen/netclip/issues
-Changelog:https://raw.githubusercontent.com/alegen/netclip/HEAD/CHANGELOG.md
-Donate:https://alegen.net/wishlist/
+Source Code:
+Issue Tracker:
 Bitcoin:1862EpKxs4BGUM6Td2Gs83QCkVC889Eqja
 
 Auto Name:Netclip
@@ -15,9 +13,6 @@ device clipboard. It is useful for people who want to copy/paste text to their
 phones or tablets.
 .
 
-Repo Type:git
-Repo:https://github.com/alegen/netclip
-
 Build:1.0,1
     commit=affbe4876d2ddb4bc35245514c2cafc7091673af
     gradle=yes
@@ -38,3 +33,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.3
 Current Version Code:4
+
+No Source Since:1.4
diff --git a/metadata/net.zygotelabs.locker.txt b/metadata/net.zygotelabs.locker.txt
index 0d72485873..1fd744a434 100644
--- a/metadata/net.zygotelabs.locker.txt
+++ b/metadata/net.zygotelabs.locker.txt
@@ -25,9 +25,6 @@ presented with warning messages when the number of remaining attempts is 4 or
 less.
 .
 
-Repo Type:git
-Repo:https://github.com/Zyg0te/Locker
-
 Build:1.0.6,7
     disable=translation
     commit=9e3b4f5548b1e6c321f1ecb285bfaf89f71f055a
@@ -58,3 +55,5 @@ Auto Update Mode:None
 Update Check Mode:Static
 Current Version:1.1.0
 Current Version Code:11
+
+No Source Since:1.1.1
diff --git a/metadata/org.mariotaku.imageviewergl.txt b/metadata/org.mariotaku.imageviewergl.txt
index 58e383935f..eebc76fccf 100644
--- a/metadata/org.mariotaku.imageviewergl.txt
+++ b/metadata/org.mariotaku.imageviewergl.txt
@@ -1,8 +1,8 @@
 Categories:Multimedia
 License:Apache-2.0
 Web Site:
-Source Code:https://github.com/mariotaku/imageviewer-gl
-Issue Tracker:https://github.com/mariotaku/imageviewer-gl/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:GLImageViewer
 Summary:View local and remote images
@@ -12,9 +12,6 @@ remote/online images. It does not install an app launcher, but gets invoked from
 a browser or file explorer.
 .
 
-Repo Type:git
-Repo:https://github.com/mariotaku/imageviewer-gl
-
 Build:1.0,1
     commit=0aac87dfcdc45d4621c87dcc315f4f043d577a1e
     target=android-17
@@ -23,3 +20,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
+
+No Source Since:1.1
diff --git a/metadata/org.opengemara.shiurim.txt b/metadata/org.opengemara.shiurim.txt
index 48cf92de94..f0fcd973d0 100644
--- a/metadata/org.opengemara.shiurim.txt
+++ b/metadata/org.opengemara.shiurim.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/opengemara/shiurim
-Issue Tracker:https://github.com/opengemara/shiurim/issues
+Source Code:
+Issue Tracker:
 Bitcoin:19p5TXDfMksHjUstFEp2PUt383Cy7JdmLa
 
 Auto Name:Shiurim
@@ -15,9 +15,6 @@ Supports R' Avraham Chaim Na'eh and Chazon Ish shiurim. Currently, only length
 conversion is supported. Other dimensions are up-coming.
 .
 
-Repo Type:git
-Repo:https://github.com/opengemara/shiurim.git
-
 Build:0.1.1,2
     commit=684477d7e809500265e293f07cdebacdd4e87f73
     subdir=app
@@ -32,3 +29,5 @@ Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.1.3
 Current Version Code:4
+
+No Source Since:0.1.4
diff --git a/metadata/org.polaric.cyanogenmodchangelog.txt b/metadata/org.polaric.cyanogenmodchangelog.txt
index 83c0b6a53f..b421749019 100644
--- a/metadata/org.polaric.cyanogenmodchangelog.txt
+++ b/metadata/org.polaric.cyanogenmodchangelog.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPL-3.0-or-later
-Web Site:https://git.polaric.org/polaric/CMLog/blob/HEAD/README.md
-Source Code:https://git.polaric.org/polaric/CMLog/tree/master
-Issue Tracker:http://bugs.polaric.org/projects/cmlog
+Web Site:
+Source Code:
+Issue Tracker:
 
 Auto Name:Changelog
 Summary:View CM changelog
@@ -17,9 +17,6 @@ Features
 * No permissions or phoning home.
 .
 
-Repo Type:git
-Repo:https://git.polaric.org/polaric/CMLog.git
-
 Build:5.3,57
     commit=d545f76bc17f3b14a886e9bf01aeaaf9d1bda137
     subdir=app
@@ -59,3 +56,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:6.0
 Current Version Code:66
+
+No Source Since:6.1
diff --git a/metadata/pk.contender.earmouse.txt b/metadata/pk.contender.earmouse.txt
index f337076ec9..891b3571e0 100644
--- a/metadata/pk.contender.earmouse.txt
+++ b/metadata/pk.contender.earmouse.txt
@@ -1,8 +1,8 @@
 Categories:Multimedia
 License:Apache-2.0
 Web Site:
-Source Code:https://github.com/pklinken/Earmouse
-Issue Tracker:https://github.com/pklinken/Earmouse/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:Earmouse
 Summary:Improve your musical ear
@@ -11,9 +11,6 @@ Learn to tell apart different musical intervals and chords through one of the
 many available modules.
 .
 
-Repo Type:git
-Repo:https://github.com/pklinken/Earmouse
-
 Build:1.0,14
     commit=a366c83f2340f4d50cc3cbb7505630473d32c6b1
     subdir=Earmouse
@@ -53,3 +50,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.2.4
 Current Version Code:28
+
+No Source Since:1.2.4
diff --git a/metadata/raele.concurseiro.txt b/metadata/raele.concurseiro.txt
index 1c4e9e7a32..29632d3f7d 100644
--- a/metadata/raele.concurseiro.txt
+++ b/metadata/raele.concurseiro.txt
@@ -1,8 +1,8 @@
 Categories:Science & Education
 License:GPL-2.0-or-later
 Web Site:
-Source Code:https://github.com/leonardoraele/concurseiro
-Issue Tracker:https://github.com/leonardoraele/concurseiro/issues
+Source Code:
+Issue Tracker:
 
 Auto Name:Concurseiro
 Summary:Helps you studying
@@ -10,9 +10,6 @@ Description:
 Comapanion app for studying.
 .
 
-Repo Type:git
-Repo:https://github.com/leonardoraele/concurseiro
-
 Build:1.0,1
     commit=0fcf1986dc92f73fc45021cecabb04086a83cc38
     subdir=Concurseiro
@@ -26,3 +23,5 @@ Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
+
+No Source Since:1.1