diff --git a/metadata/com.example.CosyDVR.txt b/metadata/com.example.CosyDVR.txt
index eff18d3018..bb69aa04a8 100644
--- a/metadata/com.example.CosyDVR.txt
+++ b/metadata/com.example.CosyDVR.txt
@@ -7,7 +7,6 @@ Changelog:https://github.com/sergstetsuk/CosyDVR/blob/HEAD/CHANGELOG.md
 
 Name:CosyDVR (old)
 Auto Name:CosyDVR
-# Donate:serg_stetsuk@ukr.net
 Summary:Video recording (DVR) software for in-car use
 Description:
 This package as been deprecated in favor of [[es.esy.CosyDVR]].
diff --git a/metadata/com.ghostsq.commander.txt b/metadata/com.ghostsq.commander.txt
index 36647ea1e7..2728369886 100644
--- a/metadata/com.ghostsq.commander.txt
+++ b/metadata/com.ghostsq.commander.txt
@@ -26,7 +26,6 @@ with system files.
 Repo Type:srclib
 Repo:GhostCommander
 
-# All commit messages are empty, so I'm just guessing the revision.
 Build:1.35,94
     commit=131
 
@@ -45,7 +44,6 @@ Build:1.40.1,163
 Build:1.40.2,164
     commit=314
 
-# DexClassLoader seems to be used for the samba/sftp plugins
 Build:1.43.3b1,210
     commit=407
     scanignore=src/com/ghostsq/commander/adapters/CA.java
@@ -206,6 +204,5 @@ The scanignore is for the dex class loading which is used for loading plugins.
 Archive Policy:4 versions
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-# Update Check Ignore:b
 Current Version:1.53.4b3
 Current Version Code:296
diff --git a/metadata/com.google.android.apps.authenticator2.txt b/metadata/com.google.android.apps.authenticator2.txt
index 2e5822e1b1..8c270d1072 100644
--- a/metadata/com.google.android.apps.authenticator2.txt
+++ b/metadata/com.google.android.apps.authenticator2.txt
@@ -28,7 +28,6 @@ specified in RFC 6238.
 .
 
 Repo Type:git
-# Repo:https://code.google.com/p/google-authenticator.android
 Repo:https://github.com/google/google-authenticator-android
 
 Build:2.21,21
diff --git a/metadata/com.google.android.gms.txt b/metadata/com.google.android.gms.txt
index c135b4ee02..0153ab3d64 100644
--- a/metadata/com.google.android.gms.txt
+++ b/metadata/com.google.android.gms.txt
@@ -67,7 +67,6 @@ Build:1.3.1,10301
     submodules=yes
     gradle=NetworkLocation
 
-# needs testing
 Build:1.4.0,10400
     commit=v1.4.0
     subdir=unifiednlp-app
diff --git a/metadata/com.google.android.location.txt b/metadata/com.google.android.location.txt
index 7dccdfe275..7e761c0c9f 100644
--- a/metadata/com.google.android.location.txt
+++ b/metadata/com.google.android.location.txt
@@ -41,7 +41,6 @@ Build:1.3.1,10301
     submodules=yes
     gradle=LegacyNetworkLocation
 
-# needs testing
 Build:1.4.0,10400
     commit=v1.4.0
     subdir=unifiednlp-app
diff --git a/metadata/com.mitzuli.txt b/metadata/com.mitzuli.txt
index 85a9cf8b8c..837d4258ec 100644
--- a/metadata/com.mitzuli.txt
+++ b/metadata/com.mitzuli.txt
@@ -69,7 +69,8 @@ splitting and packaging is done afterwards. They are disabled in favor of a
 universal apk for now. Once we turned splits on, there is no going back due
 to splits having much higher vercodes. Sample recipe:
 
-#other gradle-splits: armeabi-v7a mips x86
+other gradle-splits: armeabi-v7a mips x86
+
 Build:1.0.3,1010003
     disable=split
     commit=ee3ef8f6588b721ffca31b2ac17201d184ac9cb7
diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
index d2a94125d7..0e0e3468d1 100644
--- a/metadata/com.nononsenseapps.notepad.txt
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -2,7 +2,6 @@ Categories:Writing
 License:GPLv3+
 Web Site:http://www.nononsenseapps.com
 Source Code:https://github.com/spacecowboy/NotePad
-# Source Code:https://github.com/spacecowboy/NotePad/blob/HEAD/README.md
 Issue Tracker:https://github.com/spacecowboy/NotePad/issues
 Bitcoin:16DUL1X4yARfM88GN7TV6Y3wQwqrstJs7A
 
diff --git a/metadata/com.nooskewl.bobby.txt b/metadata/com.nooskewl.bobby.txt
index aadefb5a6c..4d45b1fa59 100644
--- a/metadata/com.nooskewl.bobby.txt
+++ b/metadata/com.nooskewl.bobby.txt
@@ -1,5 +1,4 @@
 Categories:Games
-# Allegro is zlib; Bobby is "choose your licence"
 License:Zlib
 Web Site:http://www.nooskewl.com/content/bobby
 Source Code:http://www.nooskewl.com/content/more-open-source
@@ -15,8 +14,6 @@ mission to defeat the green balls!
 Repo Type:git
 Repo:git://nooskewl.com/bobby.git
 
-# allegro seems to be installed for armeabi-v7a not for armeabi
-# problems configuring freetype and getting paths right for cmake
 Build:1.4.1,2
     disable=WIP c544e260f
     commit=unknown - see disabled
diff --git a/metadata/com.pikselbit.wrongpinshutdown.txt b/metadata/com.pikselbit.wrongpinshutdown.txt
index 194d4f81af..f9f8d39f2a 100644
--- a/metadata/com.pikselbit.wrongpinshutdown.txt
+++ b/metadata/com.pikselbit.wrongpinshutdown.txt
@@ -5,7 +5,6 @@ Web Site:https://github.com/squarrel/WrongPinShutdown/blob/HEAD/README.md
 Source Code:https://github.com/squarrel/WrongPinShutdown
 Issue Tracker:https://github.com/squarrel/WrongPinShutdown/issues
 
-# Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=admin%40snslocation%2ecom&lc=US&item_name=Wrong%20Pin%20Shutdown&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
 Auto Name:Wrong Pin Shutdown
 Summary:Shutdown after 10 unsuccessful logins
 Description:
diff --git a/metadata/com.ringdroid.txt b/metadata/com.ringdroid.txt
index 0e730960cf..92dce86065 100644
--- a/metadata/com.ringdroid.txt
+++ b/metadata/com.ringdroid.txt
@@ -11,17 +11,13 @@ An application for editing and creating your own ringtones, alarms, and
 notification sounds.
 .
 
-# Repo Type:git-svn
-# Repo:https://ringdroid.googlecode.com/svn;trunk=trunk;tags=tags
 Repo Type:git
 Repo:https://github.com/google/ringdroid
 
-# old repo
 Build:2.5,20500
     commit=64
     target=android-8
 
-# old repo
 Build:2.6,20600
     commit=69
     target=android-16
diff --git a/metadata/com.sandeel.bushidoblocks.txt b/metadata/com.sandeel.bushidoblocks.txt
index c064ba9c91..107f4f9aa7 100644
--- a/metadata/com.sandeel.bushidoblocks.txt
+++ b/metadata/com.sandeel.bushidoblocks.txt
@@ -45,7 +45,6 @@ Build:1.4,13
 # N.B ELFs must be zipped because fdroid deletes them before prebuild
 # Can use this if libgdx libraries can be confirmed
 # Putting unzip in build= doesn't seem to work nor does this
-# Build Version:1.4,14,25c7009d3989,patch=swarm.patch,\
 # init=rm libs/Google*.jar && zip -r libgdx.zip libs/arm*,srclibs=MobAdMob@2d5736,\
 # subdir=bushido-blocks-android,prebuild=\
 # sed -i 's@\(reference.1=\).*@\1$$MobAdMob$$@;/merger/d' project.properties && \
diff --git a/metadata/com.valleytg.oasvn.android.txt b/metadata/com.valleytg.oasvn.android.txt
index 505e483b8f..53aff8c18f 100644
--- a/metadata/com.valleytg.oasvn.android.txt
+++ b/metadata/com.valleytg.oasvn.android.txt
@@ -25,8 +25,6 @@ repository on your Android device without making a working svn copy.
 
 # Repo server appears to be dead. Additionally, git-svn auth is no longer
 # supported.
-# Repo Type:git-svn
-# Repo:guest:guest@http://www.valleytg.com/svn/open/oasvn/trunk
 Build:1.0.9,10
     commit=84
     target=android-15
diff --git a/metadata/com.write.Quill.txt b/metadata/com.write.Quill.txt
index aefc76e842..0fc5cea938 100644
--- a/metadata/com.write.Quill.txt
+++ b/metadata/com.write.Quill.txt
@@ -28,9 +28,7 @@ Repo Type:hg
 Repo:https://code.google.com/p/android-quill
 
 # Doesn't build - *.cpp files missing
-# Build Version:8.4,21,4277f3a7b7fb,buildjni=yes
 # Doesn't build - *.cpp files missing
-# Build Version:8.5,22,bb9446b920e2,buildjni=yes
 # Doesn't build with android-11
 Build:10.2,36
     commit=c5c7af7f5f43
diff --git a/metadata/com.zachrattner.pockettalk.txt b/metadata/com.zachrattner.pockettalk.txt
index 8226e5790e..d74d4f93b5 100644
--- a/metadata/com.zachrattner.pockettalk.txt
+++ b/metadata/com.zachrattner.pockettalk.txt
@@ -15,13 +15,9 @@ Morse Code? Be sure to turn vibration on though, as the default setting just
 reads texts out loud.
 .
 
-# old repo
-# Repo Type:git-svn
-# Repo:http://pockettalk.zachrattner.com/svn
 Repo Type:git
 Repo:https://github.com/zachrattner/pockettalk
 
-# old repo
 # Build:2.5,7
 # commit=5
 Build:2.5,7
diff --git a/metadata/com.zapta.apps.maniana.txt b/metadata/com.zapta.apps.maniana.txt
index 37f342f6a4..de67f99456 100644
--- a/metadata/com.zapta.apps.maniana.txt
+++ b/metadata/com.zapta.apps.maniana.txt
@@ -25,7 +25,6 @@ Build:1.01.18,18
 # The following out of sequence version code should never have been added to the
 # repo - it is going to mess up auto-update detection for people who have installed
 # it
-# Build Version:1.01.19.D01-next,90019,0a568c16e4a3,subdir=Maniana,prebuild=mv lib libs,forceversion=yes,forcevercode=yes
 Build:1.01.20,20
     commit=96f57cd56be8
     subdir=Maniana
diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt
index 1c8ac893d9..265ae62f61 100644
--- a/metadata/cx.hell.android.pdfviewpro.txt
+++ b/metadata/cx.hell.android.pdfviewpro.txt
@@ -61,12 +61,10 @@ Build:0.3.4-x86,34003
 Auto Update Mode:None
 # After the first build, the scanner complains about binaries in libs/.
 # Other than that, it seems to work just fine.
-# Build Version:0.4.0-arm,40000,69670732537b,subdir=pdfview,target=android-17,buildjni=yes,\
 # extlibs=android/android-support-v4.jar,prebuild=python2.7 ./scripts/pjpp.py --configuration pro && \
 # sed -i '/ndk-build/d' scripts/build-native.sh && ./scripts/build-native.sh && \
 # sed -i 's/armeabi-v7a armeabi x86/armeabi-v7a armeabi/g' jni/Application.mk && \
 # sed -i '/proguard/d' project.properties,forceversion=yes,forcevercode=yes
-# Build Version:0.4.0-x86,40003,69670732537b,subdir=pdfview,target=android-17,buildjni=yes,\
 # extlibs=android/android-support-v4.jar,prebuild=python2.7 ./scripts/pjpp.py --configuration pro && \
 # sed -i '/ndk-build/d' scripts/build-native.sh && ./scripts/build-native.sh && \
 # sed -i 's/armeabi-v7a armeabi x86/x86/g' jni/Application.mk && \
diff --git a/metadata/cxa.lineswallpaper.txt b/metadata/cxa.lineswallpaper.txt
index eb2712966d..a12d961ed9 100644
--- a/metadata/cxa.lineswallpaper.txt
+++ b/metadata/cxa.lineswallpaper.txt
@@ -15,7 +15,6 @@ This is small live wallpaper inspired by 1K demo [http://www.tylerdurden.net.ru
 Repo Type:git
 Repo:https://github.com/ghisguth/sunlight.git
 
-# old repo
 Build:1.1-2,9
     commit=4310949
 
diff --git a/metadata/cz.romario.opensudoku.txt b/metadata/cz.romario.opensudoku.txt
index 43bb126ddc..ecb88d66b5 100644
--- a/metadata/cz.romario.opensudoku.txt
+++ b/metadata/cz.romario.opensudoku.txt
@@ -12,7 +12,6 @@ finger and keyboard. It's preloaded with 90 puzzles in 3 difficulty levels. More
 puzzles can be downloaded from the web and it also allows you to enter your own.
 .
 
-# Repo:https://opensudoku-android.googlecode.com/svn/trunk/OpenSudoku
 Repo Type:git
 Repo:https://github.com/romario333/opensudoku
 
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index 3af10347d8..b7b6f7aa42 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -16,19 +16,8 @@ problems via the address in the about screen.
 Repo Type:git
 Repo:https://code.google.com/p/sparserss
 
-# The following have svn revids from the old repo, and could be converted if
 # someone is inclined to do so - the revids are in the new git repo's comments
 # in standard git-svn style.
-# Build Version:0.8.4,47,105,target=android-8
-# Build Version:0.8.5,50,109,target=android-8
-# Build Version:0.9.2,57,136,target=android-8
-# Build Version:1.1.1,65,177,target=android-8
-# Build Version:1.2.2,68,183,target=android-8
-# Build Version:1.3,69,197,target=android-8
-# Build Version:1.3.1,70,210,target=android-10
-# Build Version:1.3.2,71,217,target=android-10
-# Build Version:1.3.3_4,75,!No corresponding source in repo
-# Build Version:1.3.4,76,251,target=android-10
 Build:1.4,77
     commit=2a78a4fd5f9e
     target=android-10
diff --git a/metadata/es.esy.CosyDVR.txt b/metadata/es.esy.CosyDVR.txt
index d620b9bcc6..62b03d54cc 100644
--- a/metadata/es.esy.CosyDVR.txt
+++ b/metadata/es.esy.CosyDVR.txt
@@ -6,7 +6,6 @@ Issue Tracker:https://github.com/sergstetsuk/CosyDVR/issues
 Changelog:https://github.com/sergstetsuk/CosyDVR/blob/HEAD/CHANGELOG.md
 
 Auto Name:CosyDVR
-# Donate:serg_stetsuk@ukr.net
 Summary:Video recording (DVR) software for in-car use
 Description:
 DVR software kit designed for in-car use:
diff --git a/metadata/fr.strasweb.browserquest.txt b/metadata/fr.strasweb.browserquest.txt
index 5c74396c31..973f393efe 100644
--- a/metadata/fr.strasweb.browserquest.txt
+++ b/metadata/fr.strasweb.browserquest.txt
@@ -20,7 +20,6 @@ Repo Type:git-svn
 Repo:https://svn.strasweb.fr/rudloff/browserquest
 
 # Build problems
-# Build Version:1.0.1,3,143,prebuild=\
 # git clone https://github.com/claudemamo/Java-WebSocket && \
 # mvn package -f Java-WebSocket/pom.xml && \
 # mv Java-WebSocket/target/websocket-cordova-plugin-1.0-SNAPSHOT.jar libs/
diff --git a/metadata/fr.ybo.transportsrennes.txt b/metadata/fr.ybo.transportsrennes.txt
index 56903655f7..8acf0e598d 100644
--- a/metadata/fr.ybo.transportsrennes.txt
+++ b/metadata/fr.ybo.transportsrennes.txt
@@ -7,7 +7,6 @@ Source Code:https://github.com/ybonnel/TransportsRennes/tree/noGoogleMap
 Issue Tracker:https://github.com/ybonnel/TransportsRennes/issues
 
 Auto Name:Transports Rennes
-# Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ybonnel%40gmail.com&item_name=Transports%20Rennes%20application%20donation&currency_code=EUR
 Summary:Transport info for France
 Description:
 Transports Rennes provides quick access to information about public
diff --git a/metadata/im.tox.antox.txt b/metadata/im.tox.antox.txt
index 16daa18b46..c28ddd9c47 100644
--- a/metadata/im.tox.antox.txt
+++ b/metadata/im.tox.antox.txt
@@ -24,7 +24,6 @@ general use. It might brake or not get updated.
 Repo Type:git
 Repo:https://github.com/subliun/Antox.git
 
-# old repo: https://github.com/subliun/Antox
 Build:0.12.0,28
     disable=builds but needs testing and cleaning
     commit=9e33d57974ae564e263703dd0b4a84e0d3b6b9d5
diff --git a/metadata/it.sasabz.android.sasabus.txt b/metadata/it.sasabz.android.sasabus.txt
index de486e948d..1c75c82809 100644
--- a/metadata/it.sasabz.android.sasabus.txt
+++ b/metadata/it.sasabz.android.sasabus.txt
@@ -20,8 +20,6 @@ Licence and copyrighted by OpenStreetMap-Mitwirkende.
 
 Repo Type:git
 # Previous repo. Got disabled over missing source code for libraries
-# Repo:https://github.com/paolodongilli/SASAbus.git
-# Repo:https://github.com/markuswindegger/SASAbus.git
 Repo:https://github.com/SASAbus/SASAbus.git
 
 Build:0.2.6,17
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
index a4441d6a57..23a6a6aa8f 100644
--- a/metadata/net.androgames.level.txt
+++ b/metadata/net.androgames.level.txt
@@ -21,10 +21,6 @@ plumb, or lay it down on a flat surface for a 360° level.
 Repo Type:git
 Repo:https://github.com/avianey/Level.git
 
-# Build Version:1.8.0,27,75,init=rm -f build.xml
-# Build Version:1.9.0,29,79,init=rm -f build.xml,target=android-11
-# Build Version:1.9.2,31,81,target=android-11
-# Build Version:1.9.3,32,84,target=android-11
 Build:1.9.4,33
     commit=a5e4dd671e
     subdir=Level
diff --git a/metadata/net.jjc1138.android.scrobbler.txt b/metadata/net.jjc1138.android.scrobbler.txt
index 47efc04328..ff68a8d0ec 100644
--- a/metadata/net.jjc1138.android.scrobbler.txt
+++ b/metadata/net.jjc1138.android.scrobbler.txt
@@ -13,8 +13,6 @@ compatible audio player to work e.g. the basic Android music player. The
 documentation is on the website.
 .
 
-# Repo Type:git-svn
-# Repo:https://scrobbledroid.googlecode.com/svn/trunk
 Repo Type:git
 Repo:https://github.com/JJC1138/scrobbledroid
 
diff --git a/metadata/net.logomancy.diedroid.txt b/metadata/net.logomancy.diedroid.txt
index 179b704546..3c0255249d 100644
--- a/metadata/net.logomancy.diedroid.txt
+++ b/metadata/net.logomancy.diedroid.txt
@@ -16,7 +16,6 @@ roller to roll stats for characters.
 Repo Type:git
 Repo:https://github.com/logomancer/diedroid
 
-# Build Version:1.3.0,8,297ea5b61,target=android-10
 Build:1.4.0,9
     commit=1.4.0
     srclibs=ActionBarSherlock@4.2.0
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index fe6273375f..cfc8da3426 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -26,8 +26,6 @@ license.
 Repo Type:git
 Repo:https://github.com/mvdan/OsmAnd-submodules
 
-# Repo:https://github.com/osmandapp/Osmand
-# Old builds with the old repo
 # Build:0.6.5,34
 # commit=v0.6.5
 # subdir=OsmAnd
diff --git a/metadata/net.pmarks.chromadoze.txt b/metadata/net.pmarks.chromadoze.txt
index 13696b87ce..f78209b2a4 100644
--- a/metadata/net.pmarks.chromadoze.txt
+++ b/metadata/net.pmarks.chromadoze.txt
@@ -16,8 +16,6 @@ Transform, generating a few megabytes of distinct audio blocks. The steady-state
 behavior selects blocks at random, and smoothly crossfades between them
 .
 
-# Repo Type:git-svn
-# Repo:https://chromadoze.googlecode.com/svn/trunk
 Repo Type:git
 Repo:https://github.com/pmarks-net/chromadoze
 
diff --git a/metadata/net.sourceforge.andsys.txt b/metadata/net.sourceforge.andsys.txt
index e46209acab..b5dccdae1e 100644
--- a/metadata/net.sourceforge.andsys.txt
+++ b/metadata/net.sourceforge.andsys.txt
@@ -17,14 +17,10 @@ Status: BETA
 
 Repo Type:git
 # Old repos
-# Repo:git://git.code.sf.net/p/andsys/code
-# Repo:https://github.com/orru/andsys
 Repo:git://git.code.sf.net/p/andsys/git
 
 # Older recipes are not available in the new repo
-# Build Version:0.1.i.8,8,5acdcaf53985812a91ef03ae3d3ee97d1f466168,\
 # prebuild=rm -rf bin/,target=android-10
-# Build Version:0.1.l.11,11,124e49077a
 Build:0.2.a.12,12
     commit=065b79
 
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 38555a8d48..0a0904867e 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -23,7 +23,6 @@ share the link to Servestream.
 * Supports x86 and MIPS for ffmpeg playback
 .
 
-# Repo:https://svn.code.sf.net/p/servestream/code/trunk; old url prior to r1160
 Repo Type:git-svn
 Repo:https://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
 
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index 1cba9197f9..a504f3bee2 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -13,12 +13,9 @@ A music player. Cubed is also known as ³.
 .
 
 # Repo no longer eixts...
-# Repo Type:git
-# Repo:https://github.com/fabrantes/rockonnggl.git
 # Note: the prebuild command here prevents it from using Google NAnalytics,
 # but need to check that's still the case in upgrades. It would be better
 # to remove the library and associated code entirely.
-# Build Version:1.0.79,80,2a567bd9632032c1f58c,prebuild=sed -i "s@config_isMarketVersion\">true</bool>@config_isMarketVersion\">false</bool>@" res/values/config.xml
 Build:1.0.93,94
     disable=No source for anything after 1.0.79 - see https://github.com/fabrantes/rockonnggl/issues/issue/125
     commit=unknown - see disabled
diff --git a/metadata/org.ale.openwatch.txt b/metadata/org.ale.openwatch.txt
index 108e63a1b2..921249cd06 100644
--- a/metadata/org.ale.openwatch.txt
+++ b/metadata/org.ale.openwatch.txt
@@ -19,7 +19,6 @@ Repo Type:git
 Repo:https://github.com/OpenWatch/OpenWatch-Android
 
 # Old repo
-# Build Version:1.4,5,fe7e9e1,prebuild=sed -i '/market/d' project.properties
 Build:2.4.3,19
     disable=google play services plus many jars
     commit=v2.4.3
diff --git a/metadata/org.androhid.txt b/metadata/org.androhid.txt
index ab139537c6..24b2105420 100644
--- a/metadata/org.androhid.txt
+++ b/metadata/org.androhid.txt
@@ -25,6 +25,5 @@ Repo:https://androhid.googlecode.com/svn/trunk
 Auto Update Mode:None
 # needs a libbluetooth.so (e.g from CM zip) and headers from a device, then find a way for
 # the ndk to find them without them actually being inside the ndk
-# Build Version:0.6,6,34,buildjni=yes
 # ,patch=jni.patch
 Update Check Mode:Static
diff --git a/metadata/org.androidsoft.app.permission.txt b/metadata/org.androidsoft.app.permission.txt
index b43410963d..d57088b53e 100644
--- a/metadata/org.androidsoft.app.permission.txt
+++ b/metadata/org.androidsoft.app.permission.txt
@@ -10,8 +10,6 @@ Description:
 Gives a rating to each app, based on how much influence they can have.
 .
 
-# Repo Type:srclib
-# Repo:AndroidSoft
 Repo Type:git
 Repo:https://github.com/androidsoft-org/androidsoft-permission
 
diff --git a/metadata/org.androidsoft.coloring.txt b/metadata/org.androidsoft.coloring.txt
index dadd15d510..14035861c2 100644
--- a/metadata/org.androidsoft.coloring.txt
+++ b/metadata/org.androidsoft.coloring.txt
@@ -12,12 +12,9 @@ template, pickup colors on the palette and draw with a little tap. The drawings
 can be saved on the device and shared by mail or using social networks.
 .
 
-# Repo Type:srclib
-# Repo:AndroidSoft
 Repo Type:git
 Repo:https://github.com/androidsoft-org/androidsoft-coloring
 
-# old repo
 Build:1.0.0,1
     commit=50
     subdir=coloring
diff --git a/metadata/org.androidsoft.games.memory.kids.txt b/metadata/org.androidsoft.games.memory.kids.txt
index d5b4bd5adf..e68c9d7eb7 100644
--- a/metadata/org.androidsoft.games.memory.kids.txt
+++ b/metadata/org.androidsoft.games.memory.kids.txt
@@ -10,8 +10,6 @@ Description:
 A memory game for kids.
 .
 
-# Repo Type:srclib
-# Repo:AndroidSoft
 Repo Type:git
 Repo:https://github.com/androidsoft-org/androidsoft-memory
 
diff --git a/metadata/org.androidsoft.games.slowit.txt b/metadata/org.androidsoft.games.slowit.txt
index 07b956259a..2a94ac5192 100644
--- a/metadata/org.androidsoft.games.slowit.txt
+++ b/metadata/org.androidsoft.games.slowit.txt
@@ -11,12 +11,9 @@ Keep the balls in the target area by guiding them with your finger. Designed for
 children.
 .
 
-# Repo Type:srclib
-# Repo:AndroidSoft
 Repo Type:git
 Repo:https://github.com/androidsoft-org/androidsoft-slowit
 
-# old repo
 Build:2.0,10
     commit=75
     subdir=SlowIt
diff --git a/metadata/org.bombusmod.txt b/metadata/org.bombusmod.txt
index 5b57eb25f5..30192e9ebf 100644
--- a/metadata/org.bombusmod.txt
+++ b/metadata/org.bombusmod.txt
@@ -11,8 +11,6 @@ Full-featured XMPP client based on a J2ME app. Website and source code docs are
 in Russian.
 .
 
-# Repo Type:git-svn
-# Repo:https://bm2.googlecode.com/svn/trunk
 Repo Type:git
 Repo:https://github.com/BombusMod/BombusMod
 
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 54e970ac88..304dd9e452 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -15,7 +15,6 @@ Repo:https://code.google.com/p/sbautologin
 
 # Temporarily disabled - won't build on the build server due to lack of
 # org.junit (but it's installed!)
-# Build Version:1.6,7,62
 Build:2.0,10
     commit=ed49e06e5e75
     extlibs=junit/junit-4.10.jar
diff --git a/metadata/org.cry.otp.txt b/metadata/org.cry.otp.txt
index 9bdaa8d813..37aad5d2b9 100644
--- a/metadata/org.cry.otp.txt
+++ b/metadata/org.cry.otp.txt
@@ -11,8 +11,6 @@ Generating otp's without the need for a special hardware token. Using motp, hotp
 or totp algorithms, wih multiple profiles and time-zone support
 .
 
-# Repo Type:git-svn
-# Repo:https://motp.googlecode.com/svn/trunk
 Repo Type:git
 Repo:https://github.com/chrismiceli/motp
 
diff --git a/metadata/org.fosdem.txt b/metadata/org.fosdem.txt
index b990283d0d..14afaaade8 100644
--- a/metadata/org.fosdem.txt
+++ b/metadata/org.fosdem.txt
@@ -20,8 +20,6 @@ semi-official forks on github.com.
 .
 
 # Updated recently but no version bump in time for conference
-# Repo Type:svn
-# Repo:http://svn.code.sf.net/p/fosdem-android/code
 Repo Type:git
 Repo:https://github.com/orrc/fosdem-android
 
@@ -29,7 +27,6 @@ Build:1.0.2,4
     disable=broken now 117
     commit=unknown - see disabled
 
-# Build Version:1.0.3,5,!Source for this market version not in repo
 Build:2.0.0,50
     disable=until next year 5791487b72
     commit=unknown - see disabled
diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt
index 5595dc925a..1b9ecab273 100644
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@@ -27,7 +27,6 @@ choose it via the Dictionary section of the settings.
 Repo Type:git
 Repo:https://github.com/geometer/FBReaderJ.git
 
-# Build Version:0.99.3,9903,79cf4985a1faa4c80064,antcommands=package
 Build:0.99.11,9911
     commit=0.99.11
     antcommands=package
diff --git a/metadata/org.kiwix.kiwixmobile.txt b/metadata/org.kiwix.kiwixmobile.txt
index 52075524e9..9b63f05ae5 100644
--- a/metadata/org.kiwix.kiwixmobile.txt
+++ b/metadata/org.kiwix.kiwixmobile.txt
@@ -13,7 +13,6 @@ webpages for quick and easy reading.
 .
 
 Repo Type:git
-# Repo:git://git.code.sf.net/p/kiwix/kiwix
 Repo:https://github.com/kiwix/kiwix_mirror.git
 
 Build:1.96,26
diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt
index e01c676ae6..ee5eed9724 100644
--- a/metadata/org.kost.externalip.txt
+++ b/metadata/org.kost.externalip.txt
@@ -21,9 +21,6 @@ Build:2.3,7
     commit=ddc4018d9e
     target=android-8
 
-# Backup of old repo on code.google.com
-# Repo Type:hg
-# Repo:https://code.google.com/p/external-ip
 # 
 # Build:1.2,3
 # commit=431da48bfb10
diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
index 9387243fd5..b24ffc9d8f 100644
--- a/metadata/org.mariotaku.twidere.txt
+++ b/metadata/org.mariotaku.twidere.txt
@@ -39,7 +39,6 @@ donations.
 Repo Type:git
 Repo:https://github.com/TwidereProject/Twidere-Android
 
-# Repo:https://github.com/mariotaku/twidere.git
 Build:0.2.9.5,81
     disable=repo changed
     commit=0.2.9.5
@@ -105,7 +104,6 @@ Build:0.2.9.10,92
         cp $$HoloAccent$$/libs/android-support-v4.jar $$AndroidStaggeredGrid$$/libs/
     target=android-19
 
-# old repo
 Build:0.2.9.12,94
     commit=503153f4ec
     patch=HomeActivity.patch
diff --git a/metadata/org.microg.nlp.txt b/metadata/org.microg.nlp.txt
index d6ae381b53..1d8a8984ae 100644
--- a/metadata/org.microg.nlp.txt
+++ b/metadata/org.microg.nlp.txt
@@ -47,7 +47,6 @@ Build:1.3.1,10301
     submodules=yes
     gradle=UnifiedNlp
 
-# needs testing
 Build:1.4.0,10400
     commit=v1.4.0
     subdir=unifiednlp-app
diff --git a/metadata/org.mixare.txt b/metadata/org.mixare.txt
index bee658bfc4..b44d9e9e7f 100644
--- a/metadata/org.mixare.txt
+++ b/metadata/org.mixare.txt
@@ -24,7 +24,6 @@ installable. We should be able to remove this dependency soon.
 
 Repo Type:git
 # Old repo used prior to v0.9
-# Repo:https://github.com/mixare/mixare.git
 Repo:https://github.com/danielegobbetti/mixare.git
 
 Build:0.6.6,14
@@ -44,7 +43,6 @@ Build:0.9.2,26
 
 Auto Update Mode:None
 # Openstreetmap feature depends on choosing from dropdown menu in a Google Maps view!
-# Build Version:0.9.2,26,6450ce9af6,init=rm plugins/mixare-library/build.xml,\
 # update=.;plugins/mixare-library,prebuild=\
 # sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
 Update Check Mode:RepoManifest
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index e76bf5a9aa..13633cc48c 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -20,11 +20,8 @@ Navit currently speaks 27 languages. You can help translating via the web-based
 [http://translations.launchpad.net/navit/trunk/+pots/navit translation page].
 .
 
-# All builds prior to 6255 require the old svn repo. We can't just use their
 # git counterparts (the commit hashes given by git-svn) since the build would
 # internally break.
-# Repo Type:git-svn
-# Repo:https://svn.code.sf.net/p/navit/code/trunk
 # http://wiki.navit-project.org/index.php/Android_development
 Repo Type:git
 Repo:https://github.com/navit-gps/navit
diff --git a/metadata/org.openintents.filemanager.txt b/metadata/org.openintents.filemanager.txt
index 400cd4c504..dbbfc20a6d 100644
--- a/metadata/org.openintents.filemanager.txt
+++ b/metadata/org.openintents.filemanager.txt
@@ -17,8 +17,6 @@ application, so you will not be able to upgrade it without first manually
 removing (as root) the existing version.
 .
 
-# Repo Type:srclib
-# Repo:OI:filemanager
 Repo Type:git
 Repo:https://github.com/openintents/filemanager.git
 
diff --git a/metadata/org.pyload.android.client.txt b/metadata/org.pyload.android.client.txt
index 9631654d49..5fc48cd855 100644
--- a/metadata/org.pyload.android.client.txt
+++ b/metadata/org.pyload.android.client.txt
@@ -27,7 +27,6 @@ and the port forwarded if necessary.
 Repo Type:git
 Repo:https://github.com/pyload/pyload-android
 
-# Build Version:0.2.5,12,74ce7f5c81b0,prebuild=mv lib/* libs/ && rm -r lib/
 Build:0.3.2,15
     commit=e3c7c812e669a5225cf0a0a7183d827bde2a2eb9
 
diff --git a/metadata/org.sagemath.droid.txt b/metadata/org.sagemath.droid.txt
index bbf42fea0b..afc7392d10 100644
--- a/metadata/org.sagemath.droid.txt
+++ b/metadata/org.sagemath.droid.txt
@@ -18,8 +18,6 @@ Status: Beta.
 Repo Type:git
 Repo:https://github.com/sagemath/android
 
-# old repo
-# Build Version:0.3,4,5679cf93decd,subdir=app-v2
 Build:0.9.1,5
     commit=0d6c7f0df7120
 
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
index 43804c2f9a..cc4996dc77 100644
--- a/metadata/org.swiftp.txt
+++ b/metadata/org.swiftp.txt
@@ -23,6 +23,4 @@ Update Check Mode:Static
 Current Version:1.24
 Current Version Code:17
 # Can't build this version - see https://code.google.com/p/swiftp/issues/detail?id=128
-# Build Version:1.24,17,69,target=android-3
 # Can't build this version - res/values/strings.xml:117: error: Apostrophe not preceded by \
-# Build Version:1.23,15,66,target=android-3
diff --git a/metadata/org.tomdroid.txt b/metadata/org.tomdroid.txt
index 1df06576da..a555be1d22 100644
--- a/metadata/org.tomdroid.txt
+++ b/metadata/org.tomdroid.txt
@@ -26,8 +26,6 @@ Build:0.4.1,6
 Build:0.5.0,7
     commit=248
 
-# Build Version:0.7.1,10,400
-# Build Version:0.7.2,11,469,extlibs=android/android-support-v4.jar
 Build:0.6.1,9
     commit=0.6.1
 
diff --git a/metadata/org.wheelmap.android.online.txt b/metadata/org.wheelmap.android.online.txt
index 46d84d1d09..1a2ed50bbf 100644
--- a/metadata/org.wheelmap.android.online.txt
+++ b/metadata/org.wheelmap.android.online.txt
@@ -31,7 +31,6 @@ Build:0.8.3,16
         echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
 
 # See Readme for using switch to disable Google Analytics, to be run in root directory
-# Build Version:0.9.2-SNAPSHOT,16,!error at 1195dc90b6,subdir=wheelmap,maven=yes,\
 # srclibs=HoloEverywhere@holoeverywhere-1.2.2;PullToRefresh@v1.4.0;ActionBarSherlock@4.1.0
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.wikilovesmonuments.txt b/metadata/org.wikilovesmonuments.txt
index 8d8383fae2..95d1f6ba5f 100644
--- a/metadata/org.wikilovesmonuments.txt
+++ b/metadata/org.wikilovesmonuments.txt
@@ -15,12 +15,6 @@ Repo Type:git
 Repo:https://github.com/wikimedia/WLMMobile.git
 
 # Previous app id builds
-# Build Version:1.2.1,7,560d13bf9c7828aed777700309a7870dec31eb63,forceversion=yes
-# Build Version:1.2.2,8,v1.2.2,forceversion=yes
-# Build Version:1.2.3,10,v1.2.3
-# Build Version:1.2.3-1,11,v1.2.3-1
-# Build Version:1.2.4,12,v1.2.4
-# Build Version:1.2.5,13,v1.2.5
 Build:1.3,13
     commit=47ad047d2f6f1
 
diff --git a/metadata/org.wikimedia.commons.txt b/metadata/org.wikimedia.commons.txt
index 6f9c9fb1a1..9615047dcb 100644
--- a/metadata/org.wikimedia.commons.txt
+++ b/metadata/org.wikimedia.commons.txt
@@ -16,7 +16,6 @@ Status: BETA
 .
 
 Repo Type:git
-# Repo:https://github.com/wikimedia/android-commons
 Repo:https://github.com/wikimedia/apps-android-commons
 
 Build:1.0beta7,8
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index 8353144b88..3990ea64c6 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -21,7 +21,6 @@ Repo Type:git
 Repo:https://github.com/wordpress-mobile/WordPress-Android.git
 
 # Old svn build, untagged in git
-# Build Version:1.3.9,31,202,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8
 Build:1.4.1,33
     commit=1.4.1
     encoding=utf-8
diff --git a/metadata/org.xbmc.android.remote.txt b/metadata/org.xbmc.android.remote.txt
index 21e02d3b2f..2eb38a4c61 100644
--- a/metadata/org.xbmc.android.remote.txt
+++ b/metadata/org.xbmc.android.remote.txt
@@ -2,7 +2,6 @@ Categories:Multimedia
 License:GPL
 Web Site:
 Source Code:https://github.com/freezy/android-xbmcremote
-# Issue Tracker:https://code.google.com/p/android-xbmcremote/issues
 Issue Tracker:https://github.com/freezy/android-xbmcremote/issues
 
 Auto Name:XBMC Remote
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index 01d3b93219..8d1d3868e9 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -16,7 +16,6 @@ Repo Type:git
 Repo:https://github.com/pocmo/Yaaic.git
 
 # Last binary version...
-# Build Version:0.6.1,8,4d04ca810df9f859d8e5,subdir=application,init=rm -f build.properties
 Build:0.7,9
     commit=v0.7
     subdir=application
diff --git a/metadata/org.zeitgeist.movement.txt b/metadata/org.zeitgeist.movement.txt
index 88be6eb239..572c855ce6 100644
--- a/metadata/org.zeitgeist.movement.txt
+++ b/metadata/org.zeitgeist.movement.txt
@@ -37,7 +37,6 @@ Build:1.2.4,25
 
 # Template for the next version: remember to remove anti-feature
 # and fix the description!
-# Build Version:1.2.4,25,316,\
 # prebuild=sed -i '/maps/d' AndroidManifest.xml
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/siir.es.adbWireless.txt b/metadata/siir.es.adbWireless.txt
index 018c3f00d4..1a5eefdbfe 100644
--- a/metadata/siir.es.adbWireless.txt
+++ b/metadata/siir.es.adbWireless.txt
@@ -23,14 +23,8 @@ Status: Original source code repo vanished
 Requires Root:yes
 
 Repo Type:git
-# Original repo went missing
-# Repo:https://github.com/MrSiir/adbWireless.git
 Repo:https://github.com/slightlywobbly/adbwireless
 
-# Original build
-# Build Version:1.5.4,12,15d8011431564f6d06f569be9edbb56eacd174df,\
-# init=rm -rf libs/android-support-v4.jar release .settings zwork server,\
-# extlibs=android/android-support-v4.jar
 Build:1.5.4,12
     commit=3f2d7c7cf73ebfe71299a84
     init=rm -rf libs/android-support-v4.jar release .settings zwork server
diff --git a/metadata/vu.de.urpool.quickdroid.txt b/metadata/vu.de.urpool.quickdroid.txt
index 3371c3897a..626a43fb6e 100644
--- a/metadata/vu.de.urpool.quickdroid.txt
+++ b/metadata/vu.de.urpool.quickdroid.txt
@@ -13,8 +13,6 @@ search categories. Similar to Quicksilver, Launchy and GNOME Do for other
 systems.
 .
 
-# Repo Type:git-svn
-# Repo:https://quickdroid.googlecode.com/svn/trunk
 Repo Type:git
 Repo:https://github.com/himmele/quickdroid