diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt
index 96337b4ebc..5d61b4ac38 100644
--- a/metadata/cx.hell.android.pdfview.txt
+++ b/metadata/cx.hell.android.pdfview.txt
@@ -8,8 +8,6 @@ Bitcoin:1MLdh6uAPymWVJ4bmRde684uTcLJWwumkK
 
 Auto Name:APV PDF Viewer
 Summary:PDF viewer
-# An enhanced version for this is available in [[cx.hell.android.pdfviewpro]]; you
-# should probably install that as this one will probably be removed at some point.
 Description:
 Native PDF viewer based on the MuPDF library
 
diff --git a/metadata/mohammad.adib.roundr.txt b/metadata/mohammad.adib.roundr.txt
index a0b5ff60ec..d0e6815749 100644
--- a/metadata/mohammad.adib.roundr.txt
+++ b/metadata/mohammad.adib.roundr.txt
@@ -57,7 +57,6 @@ Build:3.0.1,24
     prebuild=rm -rf RoundR/gen/ StandOutRoundR/gen/
 
 Auto Update Mode:None
-# Can cross-reference with Website, Market or apk in repo
 Update Check Mode:RepoManifest
 Current Version:3.0.2
 Current Version Code:24
diff --git a/metadata/net.asceai.meritous.txt b/metadata/net.asceai.meritous.txt
index 5c9897b5a4..a649d4ff06 100644
--- a/metadata/net.asceai.meritous.txt
+++ b/metadata/net.asceai.meritous.txt
@@ -43,7 +43,6 @@ Build:0.0.2,2
         ./build.sh release || true
     update=no
 
-# repochange
 Build:0.0.2,3
     disable=same as 0.0.2
     commit=b716c4d43ab901821a0e2c1f25e6c050d5e37346
@@ -57,7 +56,6 @@ Build:0.0.2,3
     update=no
 
 Auto Update Mode:None
-# Author will contact us
 Update Check Mode:Static
 Current Version:0.0.2
 Current Version Code:2
diff --git a/metadata/net.avs234.txt b/metadata/net.avs234.txt
index bb5c8276db..f6694dec07 100644
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@@ -15,7 +15,6 @@ supported and files are chosen via directories.
 Repo Type:git-svn
 Repo:https://andless.googlecode.com/svn/trunk
 
-# system libraries in jni/Android/lib
 Build:1.3.5,16
     commit=96
     target=android-17
diff --git a/metadata/net.bytten.xkcdviewer.txt b/metadata/net.bytten.xkcdviewer.txt
index 2c2b4cc501..2ad30b32ed 100644
--- a/metadata/net.bytten.xkcdviewer.txt
+++ b/metadata/net.bytten.xkcdviewer.txt
@@ -24,7 +24,6 @@ Build:3.0.2,21
     commit=v3.0.2
     target=android-10
 
-# Can't actually tell if it has been released
 Build:3.9.0,30
     commit=1989cf99
     srclibs=ComicViewer@18f7270c3
diff --git a/metadata/net.everythingandroid.smspopup.txt b/metadata/net.everythingandroid.smspopup.txt
index 909dfde51a..d97ee98fd4 100644
--- a/metadata/net.everythingandroid.smspopup.txt
+++ b/metadata/net.everythingandroid.smspopup.txt
@@ -50,7 +50,6 @@ Build:1.3.0,130
         popd
 
 Auto Update Mode:None
-# Tags are one version behind Play Store
 Update Check Mode:RepoManifest
 Current Version:1.3.0
 Current Version Code:130
diff --git a/metadata/net.fred.feedex.txt b/metadata/net.fred.feedex.txt
index fd0efee404..f60acf0296 100644
--- a/metadata/net.fred.feedex.txt
+++ b/metadata/net.fred.feedex.txt
@@ -1,5 +1,4 @@
 Categories:Reading
-# see LICENSE
 License:GPLv3
 Web Site:
 Source Code:https://github.com/FredJul/Flym
diff --git a/metadata/net.kervala.comicsreader.txt b/metadata/net.kervala.comicsreader.txt
index 280866e2cd..4bef9329a1 100644
--- a/metadata/net.kervala.comicsreader.txt
+++ b/metadata/net.kervala.comicsreader.txt
@@ -32,7 +32,6 @@ Build:1.0.554,11
     disable=No source code published
     commit=unknown - see disabled
 
-# Strings.xml not updated; get version from downloads section
 Build:1.0.566,12
     disable=6fc1154e7964
     commit=unknown - see disabled
diff --git a/metadata/net.nightwhistler.pageturner.txt b/metadata/net.nightwhistler.pageturner.txt
index f88345620d..25b5d32429 100644
--- a/metadata/net.nightwhistler.pageturner.txt
+++ b/metadata/net.nightwhistler.pageturner.txt
@@ -58,7 +58,6 @@ Build:1.3.4,14
     prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties
     target=android-15
 
-# Can use maven (uses author's repo) but apk can't be found
 Build:2.0.7,24
     commit=2.0.7
     srclibs=ActionBarSherlock@4.2.0
diff --git a/metadata/net.oschina.app.txt b/metadata/net.oschina.app.txt
index 668956174c..257ea84693 100644
--- a/metadata/net.oschina.app.txt
+++ b/metadata/net.oschina.app.txt
@@ -21,7 +21,6 @@ Build:1.7.4,18
     commit=v1.7.4
 
 Auto Update Mode:None
-# They use tags for betas
 Update Check Mode:Tags
 Current Version:1.7.4
 Current Version Code:18
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index cfc8da3426..ca68e76a5c 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -26,77 +26,6 @@ license.
 Repo Type:git
 Repo:https://github.com/mvdan/OsmAnd-submodules
 
-# Build:0.6.5,34
-# commit=v0.6.5
-# subdir=OsmAnd
-# encoding=utf-8
-# prebuild=mkdir assets && \
-# mkdir raw
-# 
-# Build:0.6.6,36
-# commit=v0.6.6_2
-# subdir=OsmAnd
-# encoding=utf-8
-# prebuild=mkdir raw
-# 
-# Build:0.6.7,37
-# commit=v0.6.7
-# subdir=OsmAnd
-# encoding=utf-8
-# patch=code37.patch
-# prebuild=mkdir raw
-# 
-# Build:0.6.8,39
-# commit=v0.6.8
-# subdir=OsmAnd
-# encoding=utf-8
-# prebuild=mkdir raw
-# 
-# Build:0.6.8',41
-# disable=No corresponding source for whatever this is
-# commit=unknown - see disabled
-# 
-# Build:0.6.9,42
-# commit=v0.6.9
-# subdir=OsmAnd
-# encoding=utf-8
-# prebuild=mkdir raw
-# 
-# Build:0.6.9',43
-# disable=No corresponding source for whatever this is
-# commit=unknown - see disabled
-# 
-# Build:0.8.1,65
-# commit=d62472532d8
-# subdir=OsmAnd
-# target=android-8
-# init=rm -f build.xml
-# encoding=utf-8
-# forceversion=yes
-# prebuild=cd ../DataExtractionOSM && \
-# ant compile build && \
-# cd ../OsmAnd/ && \
-# cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
-# zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
-# cp -r ../DataExtractionOSM/build/lib/ libs/
-# 
-# Build:0.8.2,71
-# commit=50a4733475cd
-# subdir=OsmAnd
-# submodules=yes
-# target=android-8
-# init=rm -f build.xml
-# encoding=utf-8
-# forceversion=yes
-# forcevercode=yes
-# prebuild=cd ../DataExtractionOSM && \
-# ant compile build && \
-# cd ../OsmAnd/ && \
-# sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate.xml && \
-# cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
-# zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
-# cp -r ../DataExtractionOSM/build/lib/ libs/
-# buildjni=yes
 Build:1.8.2,182
     commit=76ada6c8a08afe69acb755503373ac36328ef665
     subdir=android/OsmAnd
diff --git a/metadata/net.pmarks.chromadoze.txt b/metadata/net.pmarks.chromadoze.txt
index f78209b2a4..8a6a18eb08 100644
--- a/metadata/net.pmarks.chromadoze.txt
+++ b/metadata/net.pmarks.chromadoze.txt
@@ -67,7 +67,6 @@ Build:3.5,16
         $$SDK$$/tools/android update lib-project --path ./appcompat/
     target=android-21
 
-# new repo
 Build:3.5.1,17
     commit=v3.5.1
     subdir=app
diff --git a/metadata/net.sf.andhsli.hotspotlogin.txt b/metadata/net.sf.andhsli.hotspotlogin.txt
index 32369332c4..eab9183e1f 100644
--- a/metadata/net.sf.andhsli.hotspotlogin.txt
+++ b/metadata/net.sf.andhsli.hotspotlogin.txt
@@ -26,7 +26,6 @@ Build:0.2.0,20
     commit=64
 
 Auto Update Mode:None
-# No reviews
 Update Check Mode:RepoManifest
 Current Version:0.2.0
 Current Version Code:20
diff --git a/metadata/net.sourceforge.andsys.txt b/metadata/net.sourceforge.andsys.txt
index b5dccdae1e..1fc92af3ee 100644
--- a/metadata/net.sourceforge.andsys.txt
+++ b/metadata/net.sourceforge.andsys.txt
@@ -16,11 +16,8 @@ Status: BETA
 .
 
 Repo Type:git
-# Old repos
 Repo:git://git.code.sf.net/p/andsys/git
 
-# Older recipes are not available in the new repo
-# prebuild=rm -rf bin/,target=android-10
 Build:0.2.a.12,12
     commit=065b79
 
diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt
index 92ff358209..974cd2f624 100644
--- a/metadata/net.sylvek.sharemyposition.txt
+++ b/metadata/net.sylvek.sharemyposition.txt
@@ -21,9 +21,6 @@ Services, so there will not be any further updates in our repos.
 .
 
 Repo Type:git-svn
-# Note - deliberately pulling from trunk, not trunk/ShareMyPosition-android,
-# even though that would be more efficient, in order to preserve the
-# corresponding source for the web service in our source tarball.
 Repo:https://sharemyposition.googlecode.com/svn/trunk/ShareMyPosition-android
 
 Build:1.0.11,16
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index a504f3bee2..656c94b1f8 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -12,10 +12,6 @@ Description:
 A music player. Cubed is also known as ³.
 .
 
-# Repo no longer eixts...
-# 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: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.adaway.txt b/metadata/org.adaway.txt
index 9110555b5c..bcaf41dde6 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -138,7 +138,6 @@ Build:1.37,38
         rm -rf libs/armeabi/* && \
         android update project -p ../org_donations
 
-# RootCommands srclib needs changing on fdroidserver
 Build:2.1,40
     commit=v2.1
     subdir=AdAway
@@ -155,7 +154,6 @@ Build:2.1,40
     update=.,android-libs/Donations,android-libs/ActionBarSherlock,android-libs/HtmlSpanner/htmlspanner
     buildjni=yes
 
-# RootCommands srclib needs changing on fdroidserver
 Build:2.3,42
     commit=v2.3
     subdir=AdAway
diff --git a/metadata/org.adblockplus.android.txt b/metadata/org.adblockplus.android.txt
index 97debe0b76..7c35586ecc 100644
--- a/metadata/org.adblockplus.android.txt
+++ b/metadata/org.adblockplus.android.txt
@@ -3,7 +3,6 @@ License:GPLv3
 Web Site:http://adblockplus.org/en/android
 Source Code:https://hg.adblockplus.org/adblockplusandroid
 Issue Tracker:https://adblockplus.org/forum/viewforum.php?f=11
-# Links to Paypal currently
 Donate:http://adblockplus.org/en/contribute#donate
 FlattrID:454073
 
diff --git a/metadata/org.ale.openwatch.txt b/metadata/org.ale.openwatch.txt
index 921249cd06..83722eef3d 100644
--- a/metadata/org.ale.openwatch.txt
+++ b/metadata/org.ale.openwatch.txt
@@ -18,7 +18,6 @@ suppressed if stated in the accompanying upload note.
 Repo Type:git
 Repo:https://github.com/OpenWatch/OpenWatch-Android
 
-# Old repo
 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 24b2105420..18f34d83a5 100644
--- a/metadata/org.androhid.txt
+++ b/metadata/org.androhid.txt
@@ -16,14 +16,10 @@ provided by most modern operating systems you don't have to install any further
 software on the host.
 .
 
-# Why?
 Requires Root:yes
 
 Repo Type:git-svn
 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
-# ,patch=jni.patch
 Update Check Mode:Static
diff --git a/metadata/org.androidsoft.app.permission.txt b/metadata/org.androidsoft.app.permission.txt
index d57088b53e..299872fa44 100644
--- a/metadata/org.androidsoft.app.permission.txt
+++ b/metadata/org.androidsoft.app.permission.txt
@@ -25,7 +25,6 @@ Build:1.4.2,13
     prebuild=rm -rf releases
     target=android-15
 
-# new repo
 Build:2.1.0,18
     commit=b8c9aa2f920575101168449185f5b3a68ea4e383
     gradle=yes
diff --git a/metadata/org.androidsoft.coloring.txt b/metadata/org.androidsoft.coloring.txt
index 14035861c2..8749e8429a 100644
--- a/metadata/org.androidsoft.coloring.txt
+++ b/metadata/org.androidsoft.coloring.txt
@@ -21,7 +21,6 @@ Build:1.0.0,1
     prebuild=rm -rf releases
     target=android-15
 
-# new repo
 Build:1.0.1,2
     commit=d33431c18f059e30bff50052458b7b10885433ea
     gradle=yes
diff --git a/metadata/org.androidsoft.games.memory.kids.txt b/metadata/org.androidsoft.games.memory.kids.txt
index e68c9d7eb7..497c71843f 100644
--- a/metadata/org.androidsoft.games.memory.kids.txt
+++ b/metadata/org.androidsoft.games.memory.kids.txt
@@ -34,7 +34,6 @@ Build:1.9.2,16
         rm libs/androidsoft-credits-1.0.0.jar
     target=android-11
 
-# new repo
 Build:2.0.2,19
     commit=f3dd39e000474df03dfc2efc65a2e98af1e24028
     gradle=yes
diff --git a/metadata/org.androidsoft.games.slowit.txt b/metadata/org.androidsoft.games.slowit.txt
index 2a94ac5192..3207b8369c 100644
--- a/metadata/org.androidsoft.games.slowit.txt
+++ b/metadata/org.androidsoft.games.slowit.txt
@@ -24,7 +24,6 @@ Build:2.0,10
         cd ../ && \
         echo "source.dir=$PWD/SlowIt/src;$PWD/libs/Credits/src;$PWD/libs/Utils/src" > SlowIt/ant.properties
 
-# new repo
 Build:2.0.1,11
     commit=15f14775b9bd18ee0cede450b22e37a8c1bfcc41
     gradle=yes
diff --git a/metadata/org.brandroid.openmanager.txt b/metadata/org.brandroid.openmanager.txt
index 5e35d107cb..520174e816 100644
--- a/metadata/org.brandroid.openmanager.txt
+++ b/metadata/org.brandroid.openmanager.txt
@@ -1,7 +1,6 @@
 Categories:System
 License:GPLv3
 Web Site:http://brandroid.org/open
-# Don't link to fdroid branch as GitHub clients don't like it
 Source Code:https://github.com/BrandroidTools/OpenExplorer
 Issue Tracker:https://github.com/BrandroidTools/OpenExplorer/issues
 Donate:http://brandroid.org/donate.php
@@ -27,7 +26,6 @@ The source code for our build is in a branch called fdroid.
 Repo Type:git
 Repo:https://github.com/BrandroidTools/OpenExplorer.git
 
-# N.B use fdroid branch
 Build:0.189,189
     commit=8e18bb5ee7
     submodules=yes
@@ -52,7 +50,6 @@ Build:0.194,194
     prebuild=rm -rf releases/
     update=.,ActionBarSherlock/library
 
-# Submodules not working
 Build:0.208,208
     commit=bec59bad08
     init=rm -rf ActionBarSherlock && \
diff --git a/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
index 3878e6be10..f8b3edb169 100644
--- a/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
+++ b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
@@ -27,7 +27,6 @@ Build:1.2.6,126
     target=android-7
 
 Auto Update Mode:None
-# Not in market, and can't use RepoManifest because the version name isn't in there
 Update Check Mode:None
 Current Version:1.2.6
 Current Version Code:126
diff --git a/metadata/org.chromium.browser.txt b/metadata/org.chromium.browser.txt
index beb6d3d409..b5844a89bb 100644
--- a/metadata/org.chromium.browser.txt
+++ b/metadata/org.chromium.browser.txt
@@ -39,7 +39,6 @@ sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils
 #'gyp_managed_install%': 0,
 #'fastbuild%': 1,
 
-# branding=Chrome
 branding=Chromium
 buildtype=Official
 
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index 4a1fe6eabe..9988dce17e 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -19,7 +19,6 @@ Settings.
 Repo Type:git
 Repo:git://git.code.sf.net/p/crengine/crengine
 
-# Has a conflicting (and invalid) target in build.properties - remove it
 Build:3.0.39-35,60
     commit=68ad007ac1272ef322fd61cb6591618723422380
     subdir=android
@@ -50,8 +49,6 @@ Build:3.0.41-9,81
     rm=android/build.properties
     buildjni=yes
 
-# Note: 3.0.42-3 is untagged in the repo, and the source does not compile at what would
-# appear to be the corresponding commit.
 Build:3.0.42-6,86
     commit=cr3.0.42-6
     subdir=android
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 304dd9e452..687964d6e1 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -13,8 +13,6 @@ Automatically accepts the Terms Of Service when logging into a Starbucks WLAN.
 Repo Type:hg
 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:2.0,10
     commit=ed49e06e5e75
     extlibs=junit/junit-4.10.jar
diff --git a/metadata/org.diygenomics.pg.txt b/metadata/org.diygenomics.pg.txt
index e5ca9a6502..5cdb6ce035 100644
--- a/metadata/org.diygenomics.pg.txt
+++ b/metadata/org.diygenomics.pg.txt
@@ -14,7 +14,6 @@ Side-by-side comparison of consumer genomic services (deCODEme, Navigenics, and
 Repo Type:git
 Repo:https://github.com/lablogga/DIYgenomics_Android.git
 
-# Generated by import.py - check this is the right version, and find the right commit!
 Build:1.0,6
     commit=30e284b
     subdir=PG
diff --git a/metadata/org.fosdem.txt b/metadata/org.fosdem.txt
index 14afaaade8..8ce5abffc5 100644
--- a/metadata/org.fosdem.txt
+++ b/metadata/org.fosdem.txt
@@ -19,7 +19,6 @@ semi-official forks on github.com.
 * Share a session with your social network
 .
 
-# Updated recently but no version bump in time for conference
 Repo Type:git
 Repo:https://github.com/orrc/fosdem-android
 
diff --git a/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt b/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
index befac54019..a648b907bd 100644
--- a/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
+++ b/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
@@ -16,7 +16,6 @@ Bonjour). FBReader already allows you to add remote OPDS shares e.g.
 Repo Type:git
 Repo:https://github.com/geometer/FBReaderJ-plugin-local-opds-scanner.git
 
-# Not an official release, but has bugfixes and no official release for 1-year+
 Build:1.1-fd,101001
     commit=9a239a014a272d3b1d642
     forceversion=yes
diff --git a/metadata/org.geometerplus.fbreader.plugin.tts.txt b/metadata/org.geometerplus.fbreader.plugin.tts.txt
index 996eff1a94..461b7d9e69 100644
--- a/metadata/org.geometerplus.fbreader.plugin.tts.txt
+++ b/metadata/org.geometerplus.fbreader.plugin.tts.txt
@@ -20,7 +20,6 @@ Repo:https://github.com/geometer/FBReaderJ-plugin-tts.git
 Build:1.1,10100
     commit=1.1
 
-# Honeycomb+ build
 Build:1.2,102001
     commit=f600d05420da34d
 
diff --git a/metadata/org.gitorious.jamesjrh.isokeys.txt b/metadata/org.gitorious.jamesjrh.isokeys.txt
index 24f71aa8e1..c779c3b33f 100644
--- a/metadata/org.gitorious.jamesjrh.isokeys.txt
+++ b/metadata/org.gitorious.jamesjrh.isokeys.txt
@@ -38,7 +38,6 @@ Build:0.82.1 ALPHA,14
     target=android-10
 
 Auto Update Mode:None
-# Generic package id in manifest
 Update Check Mode:Static
 Current Version:0.82.1
 Current Version Code:14
diff --git a/metadata/org.gmote.client.android.txt b/metadata/org.gmote.client.android.txt
index 0cf34b778c..a199df4cb8 100644
--- a/metadata/org.gmote.client.android.txt
+++ b/metadata/org.gmote.client.android.txt
@@ -33,7 +33,6 @@ Build:2.0.2,5
     target=android-7
 
 Auto Update Mode:None
-# No update to client since 2009
 Update Check Mode:None
 Current Version:2.0.2
 Current Version Code:5
diff --git a/metadata/org.gnucash.android.txt b/metadata/org.gnucash.android.txt
index e496c68aa8..9a7d10678e 100644
--- a/metadata/org.gnucash.android.txt
+++ b/metadata/org.gnucash.android.txt
@@ -26,7 +26,6 @@ Build:1.0,1
     subdir=GnucashMobile
     update=.,../com_actionbarsherlock
 
-# Can also use maven
 Build:1.0.1,2
     commit=v1.0.1
     subdir=GnucashMobile
diff --git a/metadata/org.hanenoshino.onscripter.txt b/metadata/org.hanenoshino.onscripter.txt
index 35653d52f0..8023bab519 100644
--- a/metadata/org.hanenoshino.onscripter.txt
+++ b/metadata/org.hanenoshino.onscripter.txt
@@ -1,41 +1,7 @@
 Categories:Games
 License:GPLv2+
-# 
-# Following Android ports can be found on Internet:
-# 1 Older version of Natdon's, already unbuildable; original focus of most non-JP efforts.
-# 
-# Hosted on:
-# http://sourceforge.net/p/onscripter/code-0/ (earliest upload?)
-# https://code.google.com/p/onscripter
-# 
-# Package: cn.natdon.onscripter
-# 
-# 2 Newer maintained version of CN fork, recently merged with MiNE3. Relies on closed-source vitamio.jar
-# for video playback (see also https://bbs.vitamio.org/topics/83?locale=en).
-# 
-# Hosted on:
-# https://github.com/natdon/ONScripter-CN
-# 
-# Package: cn.natdon.onscripterv2
-# 
-# 3 Our package; was based on #1, but later backported stuff from various sources
-# 
-# 4 http://onscripter.sourceforge.jp/android/android.html - upstream Japanese attempt. Also happens to
-# be upstream for engine core. Use tarballs for publishing, but developer of #3 tracks them on Github.
-# 
-# Hosted on:
-# http://onscripter.sourceforge.jp/onscripter.html#package-source (core tarballs)
-# https://github.com/shinohane/onscripter-versiontrack
-# http://onscripter.sourceforge.jp/android/android.html#sdk (android tarballs)
-# https://github.com/shinohane/onscripter_android-versiontrack
-# 
-# package: jp.ogapee.onscripter
-# 
 Web Site:http://onscripter.sourceforge.jp/android/android.html
-# See also http://onscripter.sourceforge.jp/android/android.html#sdk
-# (hardcore Japanese developers don't use VCS!)
 Source Code:https://github.com/shinohane/onscripter
-# All other trackers are empty..
 Issue Tracker:http://onscripter.sourceforge.jp/cgi-bin/kagemai/guest.cgi?project=onscripter&action=top
 
 Name:ONScripter
@@ -63,8 +29,6 @@ Build:20120310,20120310
     buildjni=yes
 
 Auto Update Mode:None
-# Not that it has good chances to be updated anyway..
-# (see https://github.com/shinohane/ONScripter-SAO for blob-filled replacement..)
 Update Check Mode:Static
 Current Version:20120310
 Current Version Code:20120310
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index f6b93db599..d70b08cd0a 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -19,8 +19,6 @@ website.
 Repo Type:git
 Repo:git://git.code.sf.net/p/xmp/xmp-android
 
-# This is one of those projects that put the changelog in the version
-# number, so fix that with forceversion.
 Build:2.1.0,15
     commit=639549fda2111cb800fabe468b4a64bf4ae27003
     subdir=src/android/project
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index 9d4fc6c872..0acc7c0d45 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -17,7 +17,6 @@ Repo Type:hg
 Repo:https://bitbucket.org/dalb8/scrambled
 
 Auto Update Mode:None
-# Uses srclibs from the same repo a la Tricorder
 Update Check Mode:Static
 Current Version:5.0.2
 Current Version Code:28
diff --git a/metadata/org.jsharkey.sky.txt b/metadata/org.jsharkey.sky.txt
index f0fca9880f..71b8b89899 100644
--- a/metadata/org.jsharkey.sky.txt
+++ b/metadata/org.jsharkey.sky.txt
@@ -19,7 +19,6 @@ Build:1.0,1
     prebuild=rm -rf Sky/
 
 Auto Update Mode:None
-# No revisions since 06/2009
 Update Check Mode:Static
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/org.kore.kolabnotes.android.txt b/metadata/org.kore.kolabnotes.android.txt
index 5f45c56887..598f2274d6 100644
--- a/metadata/org.kore.kolabnotes.android.txt
+++ b/metadata/org.kore.kolabnotes.android.txt
@@ -308,7 +308,6 @@ Build:0.5.0,30
         echo -e "\ninclude ':libs:colorpicker:library'" >> ../settings.gradle && \
         sed -i -e 's/propBuildToolsVersion/"22.0.1"/g' -e 's/propCompileSdkVersion/22/g' -e 's/propMinSdkVersion/16/g' -e 's/propTargetSdkVersion/22/g' -e 's/propVersionCode/2/g' -e 's/propVersionName/"2.0"/g' ../libs/colorpicker/library/build.gradle
 
-# enable jitpack
 Build:0.6.0,31
     commit=0.6.0
     subdir=app
diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt
index ee5eed9724..eb3a9ca605 100644
--- a/metadata/org.kost.externalip.txt
+++ b/metadata/org.kost.externalip.txt
@@ -21,31 +21,7 @@ Build:2.3,7
     commit=ddc4018d9e
     target=android-8
 
-# 
-# Build:1.2,3
-# commit=431da48bfb10
-# target=android-8
-# 
-# Build:1.2-change_server,4
-# commit=431da48bfb10
-# patch=change_server.patch
-# forceversion=yes
-# forcevercode=yes
-# target=android-8
-# 
-# Build:1.2-change_server-2,5
-# commit=431da48bfb10
-# patch=change_server-2.patch
-# forceversion=yes
-# forcevercode=yes
-# prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g' AndroidManifest.xml
-# target=android-8
-# 
-# Build:2.2,6
-# commit=13ebec22f40c
-# target=android-8
 Auto Update Mode:None
-# No revisions in a long time
 Update Check Mode:Static
 Current Version:2.3
 Current Version Code:7
diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt
index da75ddd9bf..f7baa97afa 100644
--- a/metadata/org.liberty.android.fantastischmemo.txt
+++ b/metadata/org.liberty.android.fantastischmemo.txt
@@ -1,5 +1,4 @@
 Categories:Science & Education
-# GPLv2 not compatible with jars
 License:GPL
 Web Site:http://anymemo.org
 Source Code:https://github.com/helloworld1/AnyMemo
@@ -50,7 +49,6 @@ Build:10.0.1,176
     prebuild=rm -rf jni/
     target=android-16
 
-# Works with a recent shift to openjdk7
 Build:10.2,182
     commit=2e9e1b06f9
     init=rm -rf bin/ gen/ jni/ obsolete/
@@ -108,7 +106,6 @@ Maintainer Notes:
 .
 
 Auto Update Mode:None
-# See Issue tracker for apks
 Update Check Mode:Tags
 Current Version:10.8
 Current Version Code:216
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index 31d06ebd58..1635fc4134 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -33,7 +33,6 @@ Build:2.0.3-fdroid,2003
         sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml
     build=make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 BUILD_FOR_X86=1 prepare-sources
 
-# note the custom_rules ; didn't use a tag because of zrtp security fix
 Build:2.1.2-fdroid,2120
     disable=do not build anymore due to change in x264 history
     commit=846a2a3a58
diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
index b24ffc9d8f..dd9b7d616c 100644
--- a/metadata/org.mariotaku.twidere.txt
+++ b/metadata/org.mariotaku.twidere.txt
@@ -118,7 +118,6 @@ Build:0.2.9.12,94
         cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/
     target=android-19
 
-# new repo
 Build:0.3.0-dev-fdroid,98
     commit=49742e744692a213668a7855f75148b5f00877a0
     subdir=twidere
@@ -443,7 +442,6 @@ Build:0.3.0-dev-117,117
         sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-$$VERCODE$$"' build.gradle && \
         sed -i -e '/versionNameSuffix String/d' build.gradle
 
-# We know trust jitpack
 Build:0.3.0-dev-125,125
     commit=0.3.0-dev150920
     subdir=twidere
@@ -459,7 +457,6 @@ Build:0.3.0-dev-125,125
         sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-$$VERCODE$$"' build.gradle && \
         sed -i -e '/versionNameSuffix String/d' build.gradle
 
-# We know trust jitpack
 Build:0.3.0-dev-126,126
     commit=0.3.0-dev150922
     subdir=twidere
diff --git a/metadata/org.me.tvhguide.txt b/metadata/org.me.tvhguide.txt
index 2344d5416d..9ba0cb4b52 100644
--- a/metadata/org.me.tvhguide.txt
+++ b/metadata/org.me.tvhguide.txt
@@ -18,7 +18,6 @@ Note: upstream developer has changed package id, new package is at
 Repo Type:git
 Repo:https://github.com/john-tornblom/TVHGuide.git
 
-# Had to use a recent commit
 Build:1.0,1
     commit=d7cd92ebd68c784a615285ed3db9961f66d5272a
 
diff --git a/metadata/org.mixare.txt b/metadata/org.mixare.txt
index b44d9e9e7f..e6a1c0a693 100644
--- a/metadata/org.mixare.txt
+++ b/metadata/org.mixare.txt
@@ -1,4 +1,3 @@
-# NonFreeDep can be removed with the Manifest patch below, but the OSM still may not work
 AntiFeatures:NonFreeDep
 Categories:Navigation
 License:GPLv3
@@ -23,7 +22,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/danielegobbetti/mixare.git
 
 Build:0.6.6,14
@@ -42,9 +40,6 @@ Build:0.9.2,26
         $$SDK$$/tools/android update project -p plugins/mixare-library/
 
 Auto Update Mode:None
-# Openstreetmap feature depends on choosing from dropdown menu in a Google Maps view!
-# 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
 Current Version:0.9.2
 Current Version Code:26
diff --git a/metadata/org.mozilla.mozstumbler.txt b/metadata/org.mozilla.mozstumbler.txt
index a9f313265b..d0079e6e46 100644
--- a/metadata/org.mozilla.mozstumbler.txt
+++ b/metadata/org.mozilla.mozstumbler.txt
@@ -1,4 +1,3 @@
-# AntiFeatures:NonFreeNet
 Categories:Navigation
 License:MPL2
 Web Site:https://location.services.mozilla.com
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 5265cd76ef..ee7d9e8ba7 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -36,7 +36,6 @@ Build:.9.7+,45
     forceversion=yes
     target=android-8
 
-# forgot to bump version ... again
 Build:.9.7++,46
     commit=108
     forceversion=yes
diff --git a/metadata/org.mumod.android.txt b/metadata/org.mumod.android.txt
index 0773ba1cf1..8d0c3bdec9 100644
--- a/metadata/org.mumod.android.txt
+++ b/metadata/org.mumod.android.txt
@@ -25,7 +25,6 @@ Status: Abandoned
 Repo Type:git
 Repo:https://github.com/kromonos/Mustard-Mod.git
 
-# Patch out Twitter button
 Build:0.4.0.17,168
     commit=05b41e1f17
     prebuild=sed -i '53,60d' res/layout/account_create.xml && \
@@ -36,7 +35,6 @@ Build:0.4.0.19,174
     commit=unknown - see disabled
 
 Auto Update Mode:None
-# See website for CV; also on Play
 Update Check Mode:RepoManifest
 Current Version:0.4.0.19
 Current Version Code:174
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 13633cc48c..cb8b9cd938 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -20,9 +20,6 @@ Navit currently speaks 27 languages. You can help translating via the web-based
 [http://translations.launchpad.net/navit/trunk/+pots/navit translation page].
 .
 
-# git counterparts (the commit hashes given by git-svn) since the build would
-# internally break.
-# http://wiki.navit-project.org/index.php/Android_development
 Repo Type:git
 Repo:https://github.com/navit-gps/navit
 
diff --git a/metadata/org.odk.collect.android.txt b/metadata/org.odk.collect.android.txt
index 33f230af5d..d4ed664759 100644
--- a/metadata/org.odk.collect.android.txt
+++ b/metadata/org.odk.collect.android.txt
@@ -31,7 +31,6 @@ are unlikely to appear here.
 Repo Type:hg
 Repo:https://code.google.com/p/opendatakit.collect
 
-# No API-8 on the build server
 Build:1.2.1,1015
     commit=6b017ddf90f2
     prebuild=mkdir -p libs && \
diff --git a/metadata/org.opengpx.txt b/metadata/org.opengpx.txt
index 47a699197f..a4c227e7a3 100644
--- a/metadata/org.opengpx.txt
+++ b/metadata/org.opengpx.txt
@@ -38,7 +38,6 @@ Build:1.2.0,250
     commit=191
 
 Auto Update Mode:None
-# Device Variable
 Update Check Mode:RepoManifest
 Current Version:1.2.0
 Current Version Code:250
diff --git a/metadata/org.openintents.filemanager.txt b/metadata/org.openintents.filemanager.txt
index dbbfc20a6d..5e13991f64 100644
--- a/metadata/org.openintents.filemanager.txt
+++ b/metadata/org.openintents.filemanager.txt
@@ -36,7 +36,6 @@ Build:1.2,20
     target=android-11
     buildjni=yes
 
-# new repo
 Build:1.3,21
     commit=4358c17a
     subdir=FileManager
diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt
index 73ce80bd5c..5acb698986 100644
--- a/metadata/org.openmsx.android.openmsx.txt
+++ b/metadata/org.openmsx.android.openmsx.txt
@@ -26,13 +26,9 @@ configurations, such as so called
 contains handful of drivers and have good (virtual) hardware capabilities.
 .
 
-# Note: OpenMSX version code and name are generated from it's VCS history by launch_anddev_build.sh
 Repo Type:srclib
 Repo:libsdl-android
 
-# this looks so ugly because:
-# 1) setup_anddev.sh downloads TCL sources, unpacks and builds them in one go
-# 2) AndroidManifest.xml is only generated after TCL compilation
 Build:0.9.1-584,11527
     disable=fails - libsdl needs a local.properties file preferably via android update project
     commit=openttd-1.2.3.25
@@ -56,7 +52,6 @@ Build:0.9.1-584,11527
         ./launch_anddev_build.sh
 
 Auto Update Mode:None
-# Tags and AndroidManifest are unusable. See http://openmsx.fixato.net/builds/android
 Update Check Mode:None
 Current Version:0.9.1-584
 Current Version Code:11527
diff --git a/metadata/org.openttd.sdl.txt b/metadata/org.openttd.sdl.txt
index 92b5f11020..b0d8907830 100644
--- a/metadata/org.openttd.sdl.txt
+++ b/metadata/org.openttd.sdl.txt
@@ -15,8 +15,6 @@ as closely as possible while extending it with new features.
 Repo Type:srclib
 Repo:libsdl-android
 
-# some libraries, such as libandroid.so can't be rebuilt from included sources;
-# others, such as python.so may be recompiled (probably, better from srclibs)
 Build:1.3.2.25,13225
     disable=Fails to clone source - Svndiff compressed data is invalid: Compression of svndiff data failed at /usr/share/perl5/Git/SVN/Ra.pm line 282
     commit=openttd-1.3.2.25
diff --git a/metadata/org.osmdroid.txt b/metadata/org.osmdroid.txt
index e7f908dd89..78ed1ff490 100644
--- a/metadata/org.osmdroid.txt
+++ b/metadata/org.osmdroid.txt
@@ -14,7 +14,6 @@ Map viewer using OpenStreetMap tiles.
 Repo Type:git
 Repo:https://github.com/osmdroid/osmdroid
 
-# see https://code.google.com/p/osmdroid/wiki/HowToMaven
 Build:3.0.10,11
     disable=local jar not being recognized (at osmdroid-parent-3.0.10)
     commit=osmdroid-parent-3.0.10
diff --git a/metadata/org.ppsspp.ppsspp.txt b/metadata/org.ppsspp.ppsspp.txt
index bbc2b10c71..fe85b804f1 100644
--- a/metadata/org.ppsspp.ppsspp.txt
+++ b/metadata/org.ppsspp.ppsspp.txt
@@ -84,7 +84,6 @@ Build:0.9.0,90
     update=.,../native/android
     build=./ab.sh
 
-# dev forgot to bump AM.xml
 Build:0.9.1,91
     commit=v0.9.1
     subdir=android
@@ -353,10 +352,6 @@ Build:1.1.1.0,11103
         cd ../android && \
         ./ab.sh
 
-# +0: - (upstream)
-# +1: x86
-# +2: arm
-# +3: armv7 (CV)
 Archive Policy:4 versions
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.retroarch.txt b/metadata/org.retroarch.txt
index 8deb1d5771..5b7c89306d 100644
--- a/metadata/org.retroarch.txt
+++ b/metadata/org.retroarch.txt
@@ -1,8 +1,5 @@
 Categories:Games
 License:GPLv3+
-# See also:
-# http://notaz.gp2x.de/pcsx_rearmed.php
-# http://byuu.org/higan
 Web Site:http://www.libretro.com
 Source Code:https://github.com/libretro/RetroArch
 Issue Tracker:https://github.com/libretro/RetroArch/issues
@@ -30,12 +27,6 @@ proprietary parts.
 .
 
 Repo Type:git
-# There may be newer versions, including ones with support for other CPU architectures, but I
-# have no clue, which commits to build. Tags currently make sense for desktop version only
-# See also:
-# https://github.com/libretro/RetroArch/wiki/Compilation-guide-(android-from-windows)
-# https://github.com/libretro/libretro-super/blob/HEAD/libretro-fetch.sh
-# https://github.com/libretro/libretro-super/blob/HEAD/libretro-build-android-mk.sh
 Repo:https://github.com/libretro/RetroArch.git
 
 Build:0.9.9.6,22
@@ -52,14 +43,7 @@ Build:0.9.9.6,22
         mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro-noneon.so libs/armeabi-v7a/libretro_pcsx_rearmed.so
 
 Archive Policy:0 versions
-# TODO: Enable bSNES core, when server receives NDK r9 (it requires C11 features, which -
-# according to my testing - aren't present in GCC 4.6 - according to my testing - and explicitely
-# demands GCC 4.8 in Application.mk)
-# 
-# $$NDK$$/ndk-build -C $$bSNES$$/target-libretro/ APP_ABI="armeabi-v7a x86" && \
-# mv $$bSNES$$/target-libretro/libs/ .
 Auto Update Mode:None
-# See http://forum.xda-developers.com/showthread.php?t=2116468 for exact release dates
 Update Check Mode:None
 Current Version:0.9.9.6
 Current Version Code:22
diff --git a/metadata/org.servalproject.txt b/metadata/org.servalproject.txt
index b11e8247ae..2072cc9647 100644
--- a/metadata/org.servalproject.txt
+++ b/metadata/org.servalproject.txt
@@ -37,7 +37,6 @@ The Java/XML part is distributable under the GNU GPLv3 while the serval-dna
 Repo Type:git
 Repo:https://github.com/servalproject/batphone.git
 
-# data/bin/ifconfig data/bin/iwconfig native/lib/adhoc jni-prebuilts not built from source
 Build:0.90,1929
     commit=0.90
     submodules=yes
@@ -71,7 +70,6 @@ Build:0.92,2301
         sed -i 's;</enforce-version-regex>;</enforce-version-regex-->;' build.xml
     scandelete=jni/opus/celt/tests/
 
-# Releases are in master branch, beta in development; run ant version to get version info
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:0.92
diff --git a/metadata/org.sickstache.txt b/metadata/org.sickstache.txt
index 5e2e6c5ed1..ded6275f68 100644
--- a/metadata/org.sickstache.txt
+++ b/metadata/org.sickstache.txt
@@ -39,7 +39,6 @@ Build:2.2.3,44
     commit=unknown - see disabled
 
 Auto Update Mode:None
-# Source code publishing not too timely
 Update Check Mode:RepoManifest
 Current Version:2.2.3
 Current Version Code:44
diff --git a/metadata/org.sshtunnel.txt b/metadata/org.sshtunnel.txt
index f441c026b1..aa87f27749 100644
--- a/metadata/org.sshtunnel.txt
+++ b/metadata/org.sshtunnel.txt
@@ -18,10 +18,8 @@ Requires root: No, but the advanced features will require root.
 Requires Root:yes
 
 Repo Type:hg
-# possibly https://github.com/madeye/sshtunnel-beta
 Repo:https://code.google.com/p/sshtunnel
 
-# see https://github.com/darkk/redsocks/pull/20.patch for compiling redsocks
 Build:1.5.5,73
     disable=WIP ceffc98a19b1
     commit=unknown - see disabled
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
index cc4996dc77..21d242d7f6 100644
--- a/metadata/org.swiftp.txt
+++ b/metadata/org.swiftp.txt
@@ -22,5 +22,3 @@ Auto Update Mode:None
 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
-# Can't build this version - res/values/strings.xml:117: error: Apostrophe not preceded by \
diff --git a/metadata/org.tbrk.mnemododo.txt b/metadata/org.tbrk.mnemododo.txt
index ddca464461..9bb3a47000 100644
--- a/metadata/org.tbrk.mnemododo.txt
+++ b/metadata/org.tbrk.mnemododo.txt
@@ -28,7 +28,6 @@ Build:2.0.0,23
     srclibs=mnemogogo@1
     prebuild=printf 'source.dir=src;$$mnemogogo$$/mobile/hexcsv' > ant.properties
 
-# Check for new versions of library: see srclib README
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:2.0.0
diff --git a/metadata/org.tof.txt b/metadata/org.tof.txt
index 5ce9bfbe80..c64eced34a 100644
--- a/metadata/org.tof.txt
+++ b/metadata/org.tof.txt
@@ -22,7 +22,6 @@ Build:1.0.5 (Droid),17
         sed -i 's/\(app_name\">Taps Of Fire\)[^<]*/\1/' res/values/strings.xml
 
 Auto Update Mode:None
-# Last revision in 06/2010
 Update Check Mode:Static
 Current Version:1.0.5 (Droid)
 Current Version Code:17
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 9305c2cbd5..08e3cc5669 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -559,17 +559,6 @@ Maintainer Notes:
 * Bump CV/CVC when all builds have finished and we have tested whats possible...
 .
 
-# +0: vanilla
-# +1: arm (noPIE)
-# +2: x86 (noPIE)
-# +3: mips (noPIE)
-# +11: arm (PIE)
-# +12: x86 (PIE)
-# +13: mips (PIE)
-# +14: arm64-v8a
-# +15: x86_64
-# +16: mips64
-# Archive Policy:6 versions
 Archive Policy:19 versions
 Auto Update Mode:None
 Update Check Mode:Tags ^[^-]*$
diff --git a/metadata/org.transdroid.search.txt b/metadata/org.transdroid.search.txt
index 4f9e3a967b..6d03fa68d6 100644
--- a/metadata/org.transdroid.search.txt
+++ b/metadata/org.transdroid.search.txt
@@ -19,7 +19,6 @@ See also [[org.transdroid.full]].
 Repo Type:git
 Repo:https://github.com/erickok/transdroid-search.git
 
-# Don't have android-13
 Build:1.7,9
     commit=22
     target=android-14
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index 8c92804ee8..682a88fd6e 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -25,7 +25,6 @@ For newer versions, see [[org.transdroid.full]] and [[org.transdroid.search]].
 Repo Type:hg
 Repo:https://code.google.com/p/transdroid
 
-# Not sure if the search plugin should be included in this build; the plugin probably covers it
 Build:1.1.7,148
     commit=80558abb1047
     subdir=android
diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 5fc641cb20..94cfe33d40 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -329,7 +329,6 @@ Build:0.9.10,10004
     build=cd ../ && \
         ANDROID_ABI=armeabi-v7a ./compile.sh release
 
-# 0.9.10 vercodes were off
 Build:1.0.0,10006
     disable=doesn't build
     commit=1.0.0
@@ -341,7 +340,6 @@ Build:1.0.0,10006
     build=cd ../ && \
         ANDROID_ABI=x86 ./compile.sh release
 
-# 0.9.10 vercodes were off
 Build:1.0.0,10007
     disable=doesn't build
     commit=1.0.0
@@ -353,7 +351,6 @@ Build:1.0.0,10007
     build=cd ../ && \
         ANDROID_ABI=armeabi ./compile.sh release
 
-# 0.9.10 vercodes were off
 Build:1.0.0,10008
     disable=doesn't build
     commit=1.0.0
@@ -1051,27 +1048,8 @@ releases.
 .
 
 Archive Policy:10 versions
-# NEW BUILDS
-# +0: vanilla
-# +1: armv5
-# +2: armv6nofpu
-# +3: armv6fpu
-# +4: armv7
-# +5: x86
-# +6: mips
-# +7: armv8
-# +8: x86_64
-# +9: mips64
-# OLD BUILD SYSTEM
-# +0: - (upstream)
-# +1: mips
-# +2: x86
-# +3: arm
-# +4: armv7 (CV)
-# Archive Policy:9 versions
 Auto Update Mode:None
 Update Check Mode:Tags
-# Only use higher vercode ops, if we do build those arches
 Vercode Operation:%c + 5
 Current Version:1.7.5
 Current Version Code:1070505
diff --git a/metadata/org.vono.narau.txt b/metadata/org.vono.narau.txt
index a952499079..bec60adc4b 100644
--- a/metadata/org.vono.narau.txt
+++ b/metadata/org.vono.narau.txt
@@ -35,7 +35,6 @@ Build:0.8.1,6
     subdir=Narau
 
 Auto Update Mode:None
-# Tags
 Update Check Mode:RepoManifest
 Current Version:0.8.1
 Current Version Code:6
diff --git a/metadata/org.wikilovesmonuments.txt b/metadata/org.wikilovesmonuments.txt
index 95d1f6ba5f..3cd542265c 100644
--- a/metadata/org.wikilovesmonuments.txt
+++ b/metadata/org.wikilovesmonuments.txt
@@ -14,7 +14,6 @@ Take pictures of monuments and enhance Wikipedia!
 Repo Type:git
 Repo:https://github.com/wikimedia/WLMMobile.git
 
-# Previous app id builds
 Build:1.3,13
     commit=47ad047d2f6f1
 
diff --git a/metadata/org.woltage.irssiconnectbot.txt b/metadata/org.woltage.irssiconnectbot.txt
index 495fae283d..0802b53b87 100644
--- a/metadata/org.woltage.irssiconnectbot.txt
+++ b/metadata/org.woltage.irssiconnectbot.txt
@@ -22,7 +22,6 @@ and the Android PC-keyboard-layout in Android 4.1 are well suited to terminal
 work.
 .
 
-# possible move to https://github.com/irssiconnectbot/irssiconnectbot2
 Repo Type:git
 Repo:https://github.com/irssiconnectbot/irssiconnectbot.git
 
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index 3990ea64c6..23e39a4d16 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -1,6 +1,5 @@
 AntiFeatures:UpstreamNonFree
 Categories:Internet
-# much Apache libs; assets/license.html says GPLv2: no headers or COPYING
 License:GPLv2
 Web Site:http://android.wordpress.org
 Source Code:https://github.com/wordpress-mobile/WordPress-Android
@@ -20,7 +19,6 @@ uses, for example, OAuth, will not work in this build.
 Repo Type:git
 Repo:https://github.com/wordpress-mobile/WordPress-Android.git
 
-# Old svn build, untagged in git
 Build:1.4.1,33
     commit=1.4.1
     encoding=utf-8
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index 8d1d3868e9..e14a790882 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -15,7 +15,6 @@ Yaaic (Yet Another Android IRC Client) is an Internet Relay Chat (IRC) client.
 Repo Type:git
 Repo:https://github.com/pocmo/Yaaic.git
 
-# Last binary version...
 Build:0.7,9
     commit=v0.7
     subdir=application
diff --git a/metadata/org.yabause.android.txt b/metadata/org.yabause.android.txt
index 6541f4daa1..b915b866ac 100644
--- a/metadata/org.yabause.android.txt
+++ b/metadata/org.yabause.android.txt
@@ -19,7 +19,6 @@ Status: ALPHA
 Repo Type:git-svn
 Repo:https://svn.code.sf.net/p/yabause/code/trunk
 
-# r3136 is the last, known to work for sure
 Build:0.9.11,1
     commit=3136
     subdir=yabause/src/android
diff --git a/metadata/org.yaxim.androidclient.txt b/metadata/org.yaxim.androidclient.txt
index af61631916..ac5016147b 100644
--- a/metadata/org.yaxim.androidclient.txt
+++ b/metadata/org.yaxim.androidclient.txt
@@ -16,7 +16,6 @@ connected, chat with your contacts, change your roster, persistent Message
 History and notifications it self-signed certificates need to be accepted.
 .
 
-# Need to obtain and build asmack from source
 Repo Type:git
 Repo:https://github.com/ge0rg/yaxim.git
 
@@ -70,7 +69,6 @@ Build:0.8.4,13
     prebuild=sed -i "s/-optimi.*/-dontoptimize/" proguard.cfg
     target=android-10
 
-# Shouldn't need to update ABS like this normally
 Build:0.8.6,15
     commit=0.8.6
     submodules=yes