diff --git a/metadata/apps.babycaretimer.yml b/metadata/apps.babycaretimer.yml
index b28a965fdd..076743c72c 100644
--- a/metadata/apps.babycaretimer.yml
+++ b/metadata/apps.babycaretimer.yml
@@ -10,9 +10,6 @@ Description: |-
     Baby Care Timer is a timer for parents to track feedings, diaper changes and
     other important items.
 
-RepoType: git-svn
-Repo: https://baby-care-timer.googlecode.com/svn/trunk
-
 Builds:
   - versionName: '1.4'
     versionCode: 5
@@ -27,3 +24,5 @@ MaintainerNotes: Set UCM to None because svn fetch hangs.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
+
+NoSourceSince: 1.5
diff --git a/metadata/com.anysoftkeyboard.languagepack.catalan.yml b/metadata/com.anysoftkeyboard.languagepack.catalan.yml
index 199d0e8f2e..2ddfeb731c 100644
--- a/metadata/com.anysoftkeyboard.languagepack.catalan.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.catalan.yml
@@ -2,8 +2,8 @@ Categories:
   - Writing
 License: Apache-2.0
 WebSite: http://s.evendanan.net/ask
-SourceCode: https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/tree/master/addons/languages/catalan
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://anysoftkeyboard.github.io/
 
 Name: 'AnySoftKeyboard: Catalan'
diff --git a/metadata/com.anysoftkeyboard.languagepack.esperanto.yml b/metadata/com.anysoftkeyboard.languagepack.esperanto.yml
index 935c020177..a6756ae1a9 100644
--- a/metadata/com.anysoftkeyboard.languagepack.esperanto.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.esperanto.yml
@@ -15,9 +15,6 @@ Description: |-
     Install [[com.menny.android.anysoftkeyboard]] first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
-RepoType: git-svn
-Repo: https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Esperanto
-
 Builds:
   - versionName: '20100613'
     versionCode: 2
@@ -41,3 +38,5 @@ AutoUpdateMode: None
 UpdateCheckMode: Static
 CurrentVersion: '20100613'
 CurrentVersionCode: 2
+
+NoSourceSince: '20100613'
diff --git a/metadata/com.anysoftkeyboard.languagepack.french_xlarge.yml b/metadata/com.anysoftkeyboard.languagepack.french_xlarge.yml
index 27346ba7d0..3d4d9f04b1 100644
--- a/metadata/com.anysoftkeyboard.languagepack.french_xlarge.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.french_xlarge.yml
@@ -18,9 +18,6 @@ Description: |-
     Install [[com.menny.android.anysoftkeyboard]] first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
-RepoType: git-svn
-Repo: https://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/FrenchXLarge
-
 Builds:
   - versionName: '20111029'
     versionCode: 1
@@ -42,3 +39,5 @@ AutoUpdateMode: None
 UpdateCheckMode: Static
 CurrentVersion: '20111029'
 CurrentVersionCode: 1
+
+NoSourceSince: '20111029'
diff --git a/metadata/com.anysoftkeyboard.theme.classic_pc.yml b/metadata/com.anysoftkeyboard.theme.classic_pc.yml
index 31b622190b..f32c4ef26e 100644
--- a/metadata/com.anysoftkeyboard.theme.classic_pc.yml
+++ b/metadata/com.anysoftkeyboard.theme.classic_pc.yml
@@ -13,9 +13,6 @@ Description: |-
     Install [[com.menny.android.anysoftkeyboard]] first, then select the desired
     layout from AnySoftKeyboard's Settings->Keyboard themes menu.
 
-RepoType: git-svn
-Repo: https://softkeyboard.googlecode.com/svn/trunk/Themes/ClassicPC
-
 Builds:
   - versionName: 1.0.1-201200304
     versionCode: 2
@@ -30,3 +27,5 @@ AutoUpdateMode: None
 UpdateCheckMode: Static
 CurrentVersion: 1.0.1-201200304
 CurrentVersionCode: 2
+
+NoSourceSince: 1.0.1-201200304
diff --git a/metadata/ro.ui.pttdroid.yml b/metadata/ro.ui.pttdroid.yml
index ccc3515e7e..62c4a228c1 100644
--- a/metadata/ro.ui.pttdroid.yml
+++ b/metadata/ro.ui.pttdroid.yml
@@ -1,7 +1,6 @@
 Categories:
   - Phone & SMS
 License: GPL-3.0-only
-WebSite: https://code.google.com/p/pttdroid
 SourceCode: https://code.google.com/p/pttdroid/source
 
 AutoName: pttdroid
@@ -12,9 +11,6 @@ Description: |-
     ([http://www.speex.org/]) for voice encoding which can be adapted to the
     bandwidth.
 
-RepoType: git-svn
-Repo: https://pttdroid.googlecode.com/svn;trunk=trunk/pttdroid;tags=tags
-
 Builds:
   - versionName: '1.1'
     versionCode: 2
@@ -55,7 +51,13 @@ Builds:
     buildjni:
       - yes
 
+MaintainerNotes: |-
+    not available at GoogleCode or SoftwareHeritage, but several forks can be
+    found at Github
+
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 1.5.3
 CurrentVersionCode: 6
+
+NoSourceSince: 1.5.3