diff --git a/metadata/com.android.quake.txt b/metadata/com.android.quake.txt
index 2b3e06c9e7..8d844dc297 100644
--- a/metadata/com.android.quake.txt
+++ b/metadata/com.android.quake.txt
@@ -22,7 +22,6 @@ Build:1.0,1
     target=android-10
 
 Auto Update Mode:None
-# RM doesn't work
 Update Check Mode:None
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt b/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
index b61f1e0dc8..505f153246 100644
--- a/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
@@ -53,7 +53,6 @@ Build:2.1.4,5
     build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-# check com.anysoftkeyboard.languagepack.georgian_full
 Update Check Mode:None
 Current Version:2.1.4
 Current Version Code:5
diff --git a/metadata/com.anysoftkeyboard.languagepack.persian.txt b/metadata/com.anysoftkeyboard.languagepack.persian.txt
index 3e864a9152..f6c5de39b4 100644
--- a/metadata/com.anysoftkeyboard.languagepack.persian.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.persian.txt
@@ -24,7 +24,6 @@ which is free only for non-commercial use.
 Repo Type:git
 Repo:https://github.com/pi3ch/persian_anysoftkeyboard
 
-# Uses old format, therefore we won't use ASK-API
 Build:20120613-persian-numbers,4
     commit=5c341f2e73
     patch=xml.patch
diff --git a/metadata/com.appengine.paranoid_android.lost.txt b/metadata/com.appengine.paranoid_android.lost.txt
index 9b5e0e30a2..ce1dddedb6 100644
--- a/metadata/com.appengine.paranoid_android.lost.txt
+++ b/metadata/com.appengine.paranoid_android.lost.txt
@@ -24,7 +24,6 @@ Build:2.2,12
     target=android-4
 
 Auto Update Mode:None
-# No updates since 01/11
 Update Check Mode:Static
 Current Version:2.2
 Current Version Code:12
diff --git a/metadata/com.cepmuvakkit.times.txt b/metadata/com.cepmuvakkit.times.txt
index 5749610cc0..a29db9c4ae 100644
--- a/metadata/com.cepmuvakkit.times.txt
+++ b/metadata/com.cepmuvakkit.times.txt
@@ -20,7 +20,6 @@ Build:2.5,200
     target=android-16
 
 Auto Update Mode:None
-# Device-variable; RepoManifest gives the wrong version
 Update Check Mode:None
 Current Version:2.5
 Current Version Code:200
diff --git a/metadata/com.codebutler.farebot.txt b/metadata/com.codebutler.farebot.txt
index 4d678995fe..739e3be864 100644
--- a/metadata/com.codebutler.farebot.txt
+++ b/metadata/com.codebutler.farebot.txt
@@ -30,7 +30,6 @@ Build:2.5.0,20
     commit=unknown - see disabled
 
 Auto Update Mode:None
-# Uses gradle, but no tags
 Update Check Mode:RepoManifest
 Current Version:2.5.0
 Current Version Code:20
diff --git a/metadata/com.dwdesign.tweetings.txt b/metadata/com.dwdesign.tweetings.txt
index c65b2f74fe..0e07011508 100644
--- a/metadata/com.dwdesign.tweetings.txt
+++ b/metadata/com.dwdesign.tweetings.txt
@@ -1,5 +1,4 @@
 Categories:Internet
-# If you discount the Aviary SDK and missing oAuth credentials
 License:GPLv3
 Web Site:http://tweetings.net/android/source
 Source Code:https://github.com/keverets/tweetings
diff --git a/metadata/com.easytarget.micopi.txt b/metadata/com.easytarget.micopi.txt
index d7f47d6020..d15af08e66 100644
--- a/metadata/com.easytarget.micopi.txt
+++ b/metadata/com.easytarget.micopi.txt
@@ -1,7 +1,6 @@
 Categories:Graphics
 License:Apache2
 Web Site:https://easytargetmixel.github.io/micopi_android
-# Web Site:http://micopi.easy-target.org/ ## points to the playstore
 Source Code:https://github.com/easytargetmixel/micopi_android
 Issue Tracker:https://github.com/easytargetmixel/micopi_android/issues
 
diff --git a/metadata/com.elsdoerfer.android.autostarts.txt b/metadata/com.elsdoerfer.android.autostarts.txt
index 6bde6b2ef8..557fb834e9 100644
--- a/metadata/com.elsdoerfer.android.autostarts.txt
+++ b/metadata/com.elsdoerfer.android.autostarts.txt
@@ -22,7 +22,6 @@ Build:1.7.5,22
     disable=build fail
     commit=1.7.5
 
-# This version was only published by author on Vodafone without root but seems to be fine
 Build:1.7.7,24
     commit=1.7.7
     extlibs=android/android-support-v4.jar
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index d7d98ba341..b5e21e7b47 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -14,7 +14,6 @@ various system information.
 Repo Type:git-svn
 Repo:https://lcarswallpaper.googlecode.com/svn/trunk/lcarswallpaper
 
-# The manifest has no version code, so let's use the SVN revision number.
 Build:1.0.2,35
     commit=35
     prebuild=sed -i -r 's/(android:versionName)/android:versionCode="35" \1/' AndroidManifest.xml
diff --git a/metadata/com.example.anycut.txt b/metadata/com.example.anycut.txt
index 3ff2c7af10..b1c3806a63 100644
--- a/metadata/com.example.anycut.txt
+++ b/metadata/com.example.anycut.txt
@@ -25,7 +25,6 @@ Build:0.5,5
     target=android-4
 
 Auto Update Mode:None
-# Not updated since 2008
 Update Check Mode:Static
 Current Version:0.5
 Current Version Code:5
diff --git a/metadata/com.gimranov.zandy.app.txt b/metadata/com.gimranov.zandy.app.txt
index e19ae1ab4a..fa01baa9ab 100644
--- a/metadata/com.gimranov.zandy.app.txt
+++ b/metadata/com.gimranov.zandy.app.txt
@@ -20,7 +20,6 @@ installed.
 Repo Type:git
 Repo:https://github.com/ajlyon/zandy.git
 
-# The author must have forgot to bump manifest for the tag
 Build:1.3.6,20
     commit=1.3.6
     subdir=app
diff --git a/metadata/com.googlecode.gtalksms.txt b/metadata/com.googlecode.gtalksms.txt
index 3f41149502..07bc3556fe 100644
--- a/metadata/com.googlecode.gtalksms.txt
+++ b/metadata/com.googlecode.gtalksms.txt
@@ -24,7 +24,6 @@ proprietary software.
 Repo Type:git
 Repo:https://github.com/Yakoo63/GTalkSMS
 
-# Old Repo:https://code.google.com/p/gtalksms
 Build:4.2,64
     commit=4.2
     srclibs=MobAdMob@2d5736
diff --git a/metadata/com.googlecode.networklog.txt b/metadata/com.googlecode.networklog.txt
index f2d8a5ca2d..9a476ee726 100644
--- a/metadata/com.googlecode.networklog.txt
+++ b/metadata/com.googlecode.networklog.txt
@@ -96,7 +96,6 @@ Build:2.17.0,21700
     rm=libs/android-support-v4.jar
     update=.,ActionBarSherlock/library,ViewPagerIndicator/library
 
-# Using alternative iptables source still leads to fdroid errors for non-armeabi
 Build:2.17.1,21701
     disable=2.17.0
     commit=unknown - see disabled
diff --git a/metadata/com.googlecode.openwnn.legacy.txt b/metadata/com.googlecode.openwnn.legacy.txt
index 6e96d0881e..6581ea2ad8 100644
--- a/metadata/com.googlecode.openwnn.legacy.txt
+++ b/metadata/com.googlecode.openwnn.legacy.txt
@@ -23,7 +23,6 @@ Build:1.3.3,133
     buildjni=yes
 
 Auto Update Mode:None
-# Not in market
 Update Check Mode:None
 Current Version:1.3.3
 Current Version Code:133
diff --git a/metadata/com.hexad.bluezime.txt b/metadata/com.hexad.bluezime.txt
index 302510c83c..5e0e582f93 100644
--- a/metadata/com.hexad.bluezime.txt
+++ b/metadata/com.hexad.bluezime.txt
@@ -37,7 +37,6 @@ Build:1.16,17
     commit=87
 
 Auto Update Mode:None
-# Device Variable
 Update Check Mode:RepoManifest
 Current Version:1.16
 Current Version Code:17
diff --git a/metadata/com.menny.android.anysoftkeyboard.txt b/metadata/com.menny.android.anysoftkeyboard.txt
index 116b7c0e5c..b1f42423db 100644
--- a/metadata/com.menny.android.anysoftkeyboard.txt
+++ b/metadata/com.menny.android.anysoftkeyboard.txt
@@ -89,8 +89,6 @@ Build:20130807,107
     disable=not published
     commit=unknown - see disabled
 
-# Note that there is a 110 version for Android 1.5, but the F-Droid client no
-# longer supports that anyway, so there seems little point in building it
 Build:20130919,111
     commit=2a68963f
     srclibs=AnySoftKeyboard-API@30851236d7,AnySoftKeyboardTools@73e9a09496
diff --git a/metadata/com.mridang.cellinfo.txt b/metadata/com.mridang.cellinfo.txt
index 32cdd75f7a..24adcd0dd6 100644
--- a/metadata/com.mridang.cellinfo.txt
+++ b/metadata/com.mridang.cellinfo.txt
@@ -24,8 +24,6 @@ Build:1.0.3,4
     rm=libs/dashclock-api-1.1.jar
     prebuild=cp -r $$DashClock$$/api/src/com src/
 
-# Not updating - newer versions depend on Google Play for full
-# functionality - https://github.com/mridang/dashclock-cellinfo/commit/975a35cd9
 Auto Update Mode:None
 Update Check Mode:Static
 Current Version:1.0.3
diff --git a/metadata/com.mridang.wifiinfo.txt b/metadata/com.mridang.wifiinfo.txt
index e20cde5292..80a50cc08d 100644
--- a/metadata/com.mridang.wifiinfo.txt
+++ b/metadata/com.mridang.wifiinfo.txt
@@ -25,8 +25,6 @@ Build:1.0.2,3
     rm=libs/dashclock-api-1.1.jar
     prebuild=echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties
 
-# Not updating - newer versions depend on Google Play for full
-# functionality - https://github.com/mridang/dashclock-cellinfo/commit/975a35cd9
 Auto Update Mode:None
 Update Check Mode:Static
 Current Version:1.0.2
diff --git a/metadata/com.naholyr.android.horairessncf.txt b/metadata/com.naholyr.android.horairessncf.txt
index b3ccebd62d..db2c33810e 100644
--- a/metadata/com.naholyr.android.horairessncf.txt
+++ b/metadata/com.naholyr.android.horairessncf.txt
@@ -23,7 +23,6 @@ Build:3.0.4 (statistiques),304
     commit=unknown - see disabled
 
 Auto Update Mode:None
-# See downloads page for apks
 Update Check Mode:RepoManifest
 Current Version:3.0.4 (statistiques)
 Current Version Code:304
diff --git a/metadata/com.nephoapp.anarxiv.txt b/metadata/com.nephoapp.anarxiv.txt
index 0c48543974..57b9784e81 100644
--- a/metadata/com.nephoapp.anarxiv.txt
+++ b/metadata/com.nephoapp.anarxiv.txt
@@ -18,7 +18,6 @@ Build:1.0,1
     target=android-8
 
 Auto Update Mode:None
-# v1.0 not in master; not updated since 02/11
 Update Check Mode:Static
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.noshufou.android.su.txt b/metadata/com.noshufou.android.su.txt
index 11bf4399c2..d850d1d211 100644
--- a/metadata/com.noshufou.android.su.txt
+++ b/metadata/com.noshufou.android.su.txt
@@ -36,7 +36,6 @@ Build:3.1.3,46
     commit=unknown - see disabled
 
 Auto Update Mode:None
-# Device variable for some reason
 Update Check Mode:Static
 Current Version:3.1.3
 Current Version Code:46
diff --git a/metadata/com.opendoorstudios.ds4droid.txt b/metadata/com.opendoorstudios.ds4droid.txt
index 38c51a3b90..fdf5cff879 100644
--- a/metadata/com.opendoorstudios.ds4droid.txt
+++ b/metadata/com.opendoorstudios.ds4droid.txt
@@ -169,10 +169,13 @@ Build:46,463
     scandelete=jni/desmume
     buildjni=yes
 
-# +0: - (upstream)
-# +1: x86
-# +2: arm
-# +3: armv7 (CV)
+Maintainer Notes:
++0: - (upstream)
++1: x86
++2: arm
++3: armv7 (CV)
+.
+
 Archive Policy:6 versions
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.opentaxi.android.txt b/metadata/com.opentaxi.android.txt
index c9dc9b6a22..286786c31a 100644
--- a/metadata/com.opentaxi.android.txt
+++ b/metadata/com.opentaxi.android.txt
@@ -1,5 +1,4 @@
 AntiFeatures:NonFreeNet
-# Categories:Transportation
 Categories:Navigation
 License:Apache2
 Web Site:http://taxi-bulgaria.com
diff --git a/metadata/com.paranoid.ParanoidWallpapers.txt b/metadata/com.paranoid.ParanoidWallpapers.txt
index c00b5be20c..a864776106 100644
--- a/metadata/com.paranoid.ParanoidWallpapers.txt
+++ b/metadata/com.paranoid.ParanoidWallpapers.txt
@@ -19,8 +19,6 @@ screens. Both are designed for portait use.
 Repo Type:git
 Repo:https://github.com/ParanoidAndroid/android_packages_apps_ParanoidWallpapers
 
-# patch via https://github.com/ParanoidAndroid/android_packages_apps_ParanoidWallpapers/pull/2
-# or just use r11 support jar
 Build:1.0,1
     commit=487d16a795
     extlibs=android/android-support-v4.jar
@@ -40,7 +38,6 @@ Build:1.0-800px,2
     target=android-17
 
 Auto Update Mode:None
-# Probably always on 1.0
 Update Check Mode:None
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.retroarch.txt b/metadata/com.retroarch.txt
index fc0903eb03..06bfe47315 100644
--- a/metadata/com.retroarch.txt
+++ b/metadata/com.retroarch.txt
@@ -1,9 +1,5 @@
 Categories:Games
 License:GPLv3+
-# See also:
-# http://mednafen.sourceforge.net/documentation/psx.html
-# 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
@@ -29,7 +25,6 @@ Latest F-Droid build supports following systems:
 Repo Type:git
 Repo:https://github.com/libretro/RetroArch.git
 
-# removed Play Services, fixed build and tackled intro dialog
 Build:1.0.0.2,37
     disable=crash
     commit=9a66975589c5d2544bdfdae2e965b3a27e7149a5
diff --git a/metadata/com.roozen.SoundManagerv2.txt b/metadata/com.roozen.SoundManagerv2.txt
index e38e3173ba..53a7676163 100644
--- a/metadata/com.roozen.SoundManagerv2.txt
+++ b/metadata/com.roozen.SoundManagerv2.txt
@@ -20,7 +20,6 @@ Build:2.1.0,19
     target=android-8
 
 Auto Update Mode:None
-# Tags erratic
 Update Check Mode:RepoManifest
 Current Version:2.1.0
 Current Version Code:19
diff --git a/metadata/com.sandeel.bushidoblocks.txt b/metadata/com.sandeel.bushidoblocks.txt
index 107f4f9aa7..551dd54819 100644
--- a/metadata/com.sandeel.bushidoblocks.txt
+++ b/metadata/com.sandeel.bushidoblocks.txt
@@ -28,7 +28,6 @@ so, as always, any problems could be due to the f-droid build process.
 Repo Type:git
 Repo:https://github.com/sandeel/Bushido-Blocks
 
-# Can't tell the version of libgdx so just replace them
 Build:1.4,13
     commit=25c7009d3989
     subdir=bushido-blocks-android
@@ -42,14 +41,6 @@ Build:1.4,13
         unzip libgdx-0.9.7.zip armeabi-v7a/* armeabi/* gdx.jar gdx-backend-android.jar && \
         rm armeabi/libgdx-audio.so armeabi-v7a/libgdx-audio.so
 
-# 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
-# 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 && \
-# printf 'source.dir=src;../bushido-blocks/src' > ant.properties && \
-# unzip libgdx.zip && rm libgdx.zip
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.4
diff --git a/metadata/com.seb.SLWP.txt b/metadata/com.seb.SLWP.txt
index 65076d0c19..5d536faa6a 100644
--- a/metadata/com.seb.SLWP.txt
+++ b/metadata/com.seb.SLWP.txt
@@ -12,7 +12,6 @@ and other planets flying thru space.
 .
 
 Repo Type:git-svn
-# Note the starting space in a subdir name
 Repo:https://earth-live-wallpaper.googlecode.com/svn/trunk/%20earth-live-wallpaper/SLWP
 
 Build:1.4,60
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index 71559682e8..8b71e074a6 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -59,7 +59,6 @@ Build:0.24,24
         echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
     update=no
 
-# Use NoAnalytics@c8d7785075 without patch for next version
 Build:0.30,30
     commit=v0.30
     subdir=ShowMe/ShowMeHills
diff --git a/metadata/com.silverkeytech.android_rivers.txt b/metadata/com.silverkeytech.android_rivers.txt
index db2f70919b..330e7240c7 100644
--- a/metadata/com.silverkeytech.android_rivers.txt
+++ b/metadata/com.silverkeytech.android_rivers.txt
@@ -1,4 +1,3 @@
-# Categories:News,Internet
 Categories:Internet
 License:GPLv3+
 Web Site:http://rivers.silverkeytech.com
diff --git a/metadata/com.sputnik.wispr.txt b/metadata/com.sputnik.wispr.txt
index 777b85032f..ab8325dcef 100644
--- a/metadata/com.sputnik.wispr.txt
+++ b/metadata/com.sputnik.wispr.txt
@@ -23,7 +23,6 @@ Build:1.4.7,147
     commit=134
 
 Auto Update Mode:None
-# Tags can work too
 Update Check Mode:RepoManifest
 Current Version:1.4.7
 Current Version Code:147
diff --git a/metadata/com.teeworlds.txt b/metadata/com.teeworlds.txt
index e12e9069dc..0a5dbd0637 100644
--- a/metadata/com.teeworlds.txt
+++ b/metadata/com.teeworlds.txt
@@ -12,13 +12,9 @@ systems. Battle with up to 16 players in a variety of game modes, including Team
 Deathmatch and Capture The Flag. You can even design your own maps!
 .
 
-# Upstream isn't particulary happy about "custom clients", so it is likely to be forever
-# buried in depths of commandergenius repository..
 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:0.6.2.15,6215
     disable=build fails - submodules using ssh?
     commit=a7d9626282f
diff --git a/metadata/com.threedlite.livePolys.txt b/metadata/com.threedlite.livePolys.txt
index 63e30876ba..fc3e8a0f29 100644
--- a/metadata/com.threedlite.livePolys.txt
+++ b/metadata/com.threedlite.livePolys.txt
@@ -18,7 +18,6 @@ Build:1.0,1
     target=android-10
 
 Auto Update Mode:None
-# Tentatively
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.threedlite.urforms.txt b/metadata/com.threedlite.urforms.txt
index 7e38550a78..ba76603a7c 100644
--- a/metadata/com.threedlite.urforms.txt
+++ b/metadata/com.threedlite.urforms.txt
@@ -36,7 +36,6 @@ Build:1.14,14
     prebuild=rm -rf urforms1/
 
 Auto Update Mode:None
-# Tentatively - bizarre vcs use! Check carefully before updating.
 Update Check Mode:RepoManifest
 Current Version:1.14
 Current Version Code:14
diff --git a/metadata/com.tinfoil.sms.txt b/metadata/com.tinfoil.sms.txt
index 5ffe99e0a2..2cdc02951b 100644
--- a/metadata/com.tinfoil.sms.txt
+++ b/metadata/com.tinfoil.sms.txt
@@ -26,22 +26,6 @@ Build:1.3.1,16
     prebuild=cp $$Orwell$$/libs/bcprov-jdk15on-150.jar $$Orwell$$/../bin/orwell-1.1.jar libs/
     scanignore=resources
 
-# Build:1.4.0,20
-# commit=cfe99a6264af818521d1ed6c3f9c18b4089b5f8b
-# srclibs=1:NineOldAndroids@2.4.0,2:Orwell@v1.1,StrippedCastle@5c6236045cc8391d4223d462c56b1d9364a3beaf,JUnit@r4.12,JavaMail@JAVAMAIL-1_5_2
-# rm=libs/*
-# extlibs=android/android-support-v4.jar
-# prebuild=\
-# pushd $$JUnit$$ && $$MVN3$$ package && popd && \
-# pushd $$JavaMail$$ && $$MVN3$$ install -DskipTests && popd && \
-# cp $$JUnit$$/target/junit-4.12.jar $$JavaMail$$/mail/target/javax.mail.jar $$StrippedCastle$$/ && \
-# pushd $$StrippedCastle$$ && \
-# ./become-stripped.sh && \
-# sed -i -e '/src\/test/d' ant/jdk15+.xml && \
-# ant -f ant/jdk15+.xml -lib ./ build-provider && \
-# ant -f ant/jdk15+.xml -lib ./ build && \
-# ant -f ant/jdk15+.xml -lib ./ zip-src && \
-# popd && rm $$Orwell$$/../bin/*jar && rm $$Orwell$$/libs/*jar && cp $$StrippedCastle$$/build/artifacts/jdk1.5/jars/*.jar $$Orwell$$/libs/
 Build:1.4.0,20
     disable=builds, but uses jars
     commit=cfe99a6264af818521d1ed6c3f9c18b4089b5f8b
diff --git a/metadata/com.traffar.game_of_life.txt b/metadata/com.traffar.game_of_life.txt
index 05bc644afe..78a207c55b 100644
--- a/metadata/com.traffar.game_of_life.txt
+++ b/metadata/com.traffar.game_of_life.txt
@@ -1,4 +1,3 @@
-# Categories:Games,Mathematics
 Categories:Games,Science & Education
 License:GPLv3
 Web Site:https://bitbucket.org/przemekr/game_of_life_agg
diff --git a/metadata/com.ubergeek42.WeechatAndroid.txt b/metadata/com.ubergeek42.WeechatAndroid.txt
index fdb7dbb345..f28096d07a 100644
--- a/metadata/com.ubergeek42.WeechatAndroid.txt
+++ b/metadata/com.ubergeek42.WeechatAndroid.txt
@@ -15,7 +15,6 @@ bugs or features that are not fully implemented. This is '''NOT''' a fully
 featured IRC client. It requires weechat running on a server to connect to.
 .
 
-# pom is messy and assumes signing
 Repo Type:git
 Repo:https://github.com/ubergeek42/weechat-android.git
 
diff --git a/metadata/com.valleytg.oasvn.android.txt b/metadata/com.valleytg.oasvn.android.txt
index 53aff8c18f..2e2e2328a6 100644
--- a/metadata/com.valleytg.oasvn.android.txt
+++ b/metadata/com.valleytg.oasvn.android.txt
@@ -23,8 +23,6 @@ The most recent version adds svn export so you can make a local copy of your
 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.
 Build:1.0.9,10
     commit=84
     target=android-15
diff --git a/metadata/com.vonglasow.michael.satstat.txt b/metadata/com.vonglasow.michael.satstat.txt
index e0565019b4..35dbd3fb3f 100644
--- a/metadata/com.vonglasow.michael.satstat.txt
+++ b/metadata/com.vonglasow.michael.satstat.txt
@@ -1,4 +1,3 @@
-# # See http://f-droid.org/manual for details
 Categories:Navigation
 License:GPLv3+
 Web Site:http://mvglasow.github.io/satstat/index.html
diff --git a/metadata/com.watabou.pixeldungeon.txt b/metadata/com.watabou.pixeldungeon.txt
index 8c81681207..275d6c1462 100644
--- a/metadata/com.watabou.pixeldungeon.txt
+++ b/metadata/com.watabou.pixeldungeon.txt
@@ -15,7 +15,6 @@ Traditional roguelike game with pixel-art graphics and simple interface.
 Repo Type:git
 Repo:https://github.com/watabou/pixel-dungeon
 
-# force close on emulator, but works on bare metal
 Build:1.7.1c,59
     commit=33c27cdb587878f771e999103ba186f190f9446c
     patch=types-171c.patch
diff --git a/metadata/com.write.Quill.txt b/metadata/com.write.Quill.txt
index 0fc5cea938..6279030407 100644
--- a/metadata/com.write.Quill.txt
+++ b/metadata/com.write.Quill.txt
@@ -27,9 +27,6 @@ Description:
 Repo Type:hg
 Repo:https://code.google.com/p/android-quill
 
-# Doesn't build - *.cpp files missing
-# Doesn't build - *.cpp files missing
-# Doesn't build with android-11
 Build:10.2,36
     commit=c5c7af7f5f43
     srclibs=Color-Picker@5d697049fb,File-Picker@496178901f2b
diff --git a/metadata/com.zachrattner.pockettalk.txt b/metadata/com.zachrattner.pockettalk.txt
index d74d4f93b5..783ca5903f 100644
--- a/metadata/com.zachrattner.pockettalk.txt
+++ b/metadata/com.zachrattner.pockettalk.txt
@@ -18,8 +18,6 @@ reads texts out loud.
 Repo Type:git
 Repo:https://github.com/zachrattner/pockettalk
 
-# Build:2.5,7
-# commit=5
 Build:2.5,7
     commit=2225b67c0f97aa42e12b17dbab7bb63278f78917
 
diff --git a/metadata/com.zapta.apps.maniana.txt b/metadata/com.zapta.apps.maniana.txt
index de67f99456..bcfec82e56 100644
--- a/metadata/com.zapta.apps.maniana.txt
+++ b/metadata/com.zapta.apps.maniana.txt
@@ -22,9 +22,6 @@ Build:1.01.18,18
     subdir=Maniana
     prebuild=mv lib libs
 
-# 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:1.01.20,20
     commit=96f57cd56be8
     subdir=Maniana
diff --git a/metadata/csh.cryptonite.txt b/metadata/csh.cryptonite.txt
index d7b3d6e023..ffbaafd8b4 100644
--- a/metadata/csh.cryptonite.txt
+++ b/metadata/csh.cryptonite.txt
@@ -16,7 +16,6 @@ mount EncFS and volumes.
 Repo Type:git
 Repo:https://code.google.com/p/cryptonite.git
 
-# need a better way of supplying path to TOOLCHAIN
 Build:0.7.6,75
     disable=WIP at 0.7.6
     commit=0.7.6
diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt
index c6136d1a49..96337b4ebc 100644
--- a/metadata/cx.hell.android.pdfview.txt
+++ b/metadata/cx.hell.android.pdfview.txt
@@ -81,7 +81,6 @@ Build:0.4.0.2,40020
     subdir=pdfview
 
 Auto Update Mode:None
-# See Downloads page (until Google stop new downloads of course)
 Update Check Mode:RepoManifest
 Current Version:0.4.0.2
 Current Version Code:40020
diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt
index 265ae62f61..e6b97f3239 100644
--- a/metadata/cx.hell.android.pdfviewpro.txt
+++ b/metadata/cx.hell.android.pdfviewpro.txt
@@ -29,7 +29,6 @@ mark the arm version as current so take care updating if you use the x86 one.
 Repo Type:hg
 Repo:https://code.google.com/p/apv
 
-# Version code last digit: 0 for all arm; 1 for armeabi; 2 for armeabi-v7a; 3 for x86
 Build:0.3.4-arm,34000
     disable=jni probs 4f6cb715dbef
     commit=unknown - see disabled
@@ -59,17 +58,6 @@ Build:0.3.4-x86,34003
     buildjni=yes
 
 Auto Update Mode:None
-# After the first build, the scanner complains about binaries in libs/.
-# Other than that, it seems to work just fine.
-# 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
-# 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 && \
-# sed -i '/proguard/d' project.properties,forceversion=yes,forcevercode=yes
-# Device-variable; we are happy enough with non-pro version
 Update Check Mode:Static
 Current Version:0.4.0-arm
 Current Version Code:40000
diff --git a/metadata/cz.yetanotherview.webcamviewer.app.txt b/metadata/cz.yetanotherview.webcamviewer.app.txt
index 4d8ab7350e..417edc090b 100644
--- a/metadata/cz.yetanotherview.webcamviewer.app.txt
+++ b/metadata/cz.yetanotherview.webcamviewer.app.txt
@@ -185,8 +185,6 @@ gradle calls. Uses play-services now.
 
 Archive Policy:0 versions
 Auto Update Mode:None
-# wait for libvlc inclusion
-# Vercode Operation:%c + 200000
 Update Check Mode:None
 Current Version:4.0
 Current Version Code:200090
diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt
index 7db14c327b..c012be472d 100644
--- a/metadata/de.blau.android.txt
+++ b/metadata/de.blau.android.txt
@@ -112,7 +112,6 @@ Build:0.9.4r828,32
     extlibs=android/android-support-v4.jar
     prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
-# start using new github repo
 Build:0.9.5.1.965,44
     commit=0.9.5.1.965
     gradle=yes
@@ -125,7 +124,6 @@ Build:0.9.6.1.990,48
     rm=libs/acra*.jar,libs/xmpcore*.jar,libs/signpost*.jar
     prebuild=sed -i -e '/support-v4/acompile "ch.acra:acra:4.5.0"\ncompile "com.adobe.xmp:xmpcore:5.1.2"\ncompile "oauth.signpost:signpost-core:1.2.1.2"\ncompile "oauth.signpost:signpost-commonshttp4:1.2.1.2"' -e '/versionCode/d' -e '/versionName/d' build.gradle
 
-# upstream messed up versioning. unclear if this is 0.9.6... or 0.9.7-beta
 Build:0.9.6.1.1026-fdroid,55
     commit=4d6b561602fbe765c50b04668eeece077c856fa4
     gradle=yes
diff --git a/metadata/de.jkliemann.parkendd.txt b/metadata/de.jkliemann.parkendd.txt
index d94e2100a3..98b8e9b861 100644
--- a/metadata/de.jkliemann.parkendd.txt
+++ b/metadata/de.jkliemann.parkendd.txt
@@ -3,7 +3,6 @@ License:GPLv3
 Web Site:http://jkliemann.de/parkendd
 Source Code:https://github.com/jklmnn/ParkenDD
 Issue Tracker:https://github.com/jklmnn/ParkenDD/issues
-# FlattrID:https://flattr.com/thing/752f3c69bfdeca06686f730348e93fdd
 FlattrID:752f3c69bfdeca06686f730348e93fdd
 Bitcoin:1HBFDdz7dJeBE2c3zQmWnzeWCbHoZQ64dd
 
diff --git a/metadata/de.jurihock.voicesmith.txt b/metadata/de.jurihock.voicesmith.txt
index d38889c0dc..7160ef768c 100644
--- a/metadata/de.jurihock.voicesmith.txt
+++ b/metadata/de.jurihock.voicesmith.txt
@@ -18,8 +18,6 @@ Feedback (FAF).
 Repo Type:git
 Repo:https://github.com/jurihock/voicesmith.git
 
-# Supported build version 2.1
-# (but custom commit number, not the tagged one)
 Build:2.1,7
     commit=21e96e1cd
     subdir=voicesmith
@@ -28,7 +26,6 @@ Build:2.1,7
     target=android-8
     buildjni=yes
 
-# Build versions >= 2.2 are compatible with tags mode
 Build:2.2,8
     commit=v2.2_r8
     subdir=voicesmith
diff --git a/metadata/de.kromonos.android.rpcoiner.txt b/metadata/de.kromonos.android.rpcoiner.txt
index 097b062139..8eac491e1b 100644
--- a/metadata/de.kromonos.android.rpcoiner.txt
+++ b/metadata/de.kromonos.android.rpcoiner.txt
@@ -19,7 +19,6 @@ Build:0.1 Alpha,1
     subdir=RPCoiner
 
 Auto Update Mode:None
-# version in strings.xml
 Update Check Mode:Static
 Current Version:0.1 Alpha
 Current Version Code:1
diff --git a/metadata/de.kugihan.dictionaryformids.hmi_android.txt b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
index 761f1fe730..1e902f3154 100644
--- a/metadata/de.kugihan.dictionaryformids.hmi_android.txt
+++ b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
@@ -23,7 +23,6 @@ the section dictionaries for download of the website.
 .
 
 Repo Type:git-svn
-# trunk+tags take ages to clone
 Repo:https://svn.code.sf.net/p/dictionarymid/code/trunk
 
 Build:0.91.1,98
diff --git a/metadata/de.marmaro.krt.ffupdater.txt b/metadata/de.marmaro.krt.ffupdater.txt
index bc3c764624..67bdd1bad1 100644
--- a/metadata/de.marmaro.krt.ffupdater.txt
+++ b/metadata/de.marmaro.krt.ffupdater.txt
@@ -67,7 +67,6 @@ Build:43.0,10
     subdir=ffupdater
     gradle=yes
 
-# test new upstream download uri
 Build:43.0,11
     commit=4329cd723dd0c7ff5d25570e6d5ecd8c66abdc8f
     subdir=ffupdater
diff --git a/metadata/de.nico.ha_manager.txt b/metadata/de.nico.ha_manager.txt
index 8ee2f5aa5a..633cf701e3 100644
--- a/metadata/de.nico.ha_manager.txt
+++ b/metadata/de.nico.ha_manager.txt
@@ -61,7 +61,6 @@ Build:0.91,20
     commit=0.91
     subdir=app
 
-# repo changed, start of new gradle world order
 Build:0.92,21
     commit=0.92
     subdir=app
diff --git a/metadata/de.schaeuffelhut.android.openvpn.txt b/metadata/de.schaeuffelhut.android.openvpn.txt
index e1641e830a..c6a0486a66 100644
--- a/metadata/de.schaeuffelhut.android.openvpn.txt
+++ b/metadata/de.schaeuffelhut.android.openvpn.txt
@@ -25,7 +25,6 @@ Requires Root:yes
 Repo Type:hg
 Repo:https://code.google.com/p/android-openvpn-settings
 
-# don't recognise (old) support jar checksum so replace it
 Build:0.4.14,39
     commit=b78a64143ef8
     extlibs=android/android-support-v4.jar
diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 19f8732605..193ed00972 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -31,14 +31,9 @@ There's a separate version of this application that uses a test version of the
 Bitcoin network: [[de.schildbach.wallet_test]].
 .
 
-# BitcoinJWallet (author's fork) is rebased each version so old commits wont work
-# patches post 3.0 will also need re-doing
 Repo Type:git
 Repo:https://github.com/schildbach/bitcoin-wallet.git
 
-# Note: there used to be build data for 1.48.2/66 but the source code for this
-# seems to have gone (it was in a maintenance branch) when the project went
-# from svn to git.
 Build:2.01,74
     commit=a55ef6822c9e
     subdir=wallet
@@ -79,8 +74,6 @@ Build:3.04,124
     prebuild=cp -r $$BitcoinJWallet-schildbach$$/ . && \
         rm -rf market/
 
-# source plugin causes an error after building:
-# W/asset   (16561) Asset path target/library-4.1.0.apk is neither a directory nor file (type=1).
 Build:3.14,134
     commit=5ede628245a8
     maven=yes
@@ -90,7 +83,6 @@ Build:3.14,134
         rm -rf market/
     build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
 
-# important bugfix so uses the original BitcoinJ
 Build:3.15,136
     commit=dd70948b66aa
     maven=yes
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index a4be1de797..b5c5c0efc8 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -17,14 +17,9 @@ This is a test version of [[de.schildbach.wallet]] that uses the test Bitcoin
 network, not the real one.
 .
 
-# BitcoinJWallet (author's fork) is rebased each version so old commits wont work
-# Patch may need re-doing also
 Repo Type:git
 Repo:https://github.com/schildbach/bitcoin-wallet.git
 
-# Note: there used to be build data for 1.48.2/66 but the source code for this
-# seems to have gone (it was in a maintenance branch) when the project went
-# from svn to git.
 Build:2.01_test,74
     commit=a55ef6822c9e
     subdir=wallet
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index b7b6f7aa42..08d71d242c 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -16,8 +16,6 @@ problems via the address in the about screen.
 Repo Type:git
 Repo:https://code.google.com/p/sparserss
 
-# someone is inclined to do so - the revids are in the new git repo's comments
-# in standard git-svn style.
 Build:1.4,77
     commit=2a78a4fd5f9e
     target=android-10
diff --git a/metadata/de.steinpfeffer.rdt.txt b/metadata/de.steinpfeffer.rdt.txt
index 99cd97833d..6cd6d081da 100644
--- a/metadata/de.steinpfeffer.rdt.txt
+++ b/metadata/de.steinpfeffer.rdt.txt
@@ -1,5 +1,4 @@
 Categories:Science & Education,Science & Education
-# Categories:Mathematics
 License:Apache2
 Web Site:
 Source Code:https://github.com/jufickel/rdt
diff --git a/metadata/de.tui.itlogger.txt b/metadata/de.tui.itlogger.txt
index c137742ead..7e11e8ceec 100644
--- a/metadata/de.tui.itlogger.txt
+++ b/metadata/de.tui.itlogger.txt
@@ -16,7 +16,6 @@ evaluate the quality of forest roads.
 .
 
 Repo Type:git-svn
-# Sourceforge got it wrong
 Repo:https://svn.code.sf.net/p/itlogger/code
 
 Build:1.0.0,2
@@ -27,7 +26,6 @@ Build:1.0.0,2
         sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Auto Update Mode:None
-# No reviews on market; haphazard version code bumps
 Update Check Mode:RepoManifest
 Current Version:1.0.0
 Current Version Code:2
diff --git a/metadata/de.ub0r.android.websms.txt b/metadata/de.ub0r.android.websms.txt
index 978c386a5c..20218af79e 100644
--- a/metadata/de.ub0r.android.websms.txt
+++ b/metadata/de.ub0r.android.websms.txt
@@ -37,7 +37,6 @@ Build:4.5.1,7451000
         echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
         echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
 
-# There's an extra WebSMS- here, thus the weird tag and the forceversion
 Build:4.5.4,7454000
     commit=WebSMS-WebSMS-4.5.4
     srclibs=ActionBarSherlock@4.2.0,WebSMSAPI@d85a800e,ub0rlib@144a5da04c,MobAdMob@2d5736
diff --git a/metadata/de.uni_potsdam.hpi.openmensa.txt b/metadata/de.uni_potsdam.hpi.openmensa.txt
index 4f254da7db..c56a71539e 100644
--- a/metadata/de.uni_potsdam.hpi.openmensa.txt
+++ b/metadata/de.uni_potsdam.hpi.openmensa.txt
@@ -35,7 +35,6 @@ Build:0.6,6
     extlibs=android/android-support-v4.jar,osmdroid/osmdroid-android-3.0.8.jar,sl4j/slf4j-android-1.6.1-RC1.jar
     prebuild=echo "source.dir=src;$$Google-Gson$$/src" >> project.properties
 
-# This ref only adds gradle and removes unnecessary stuff
 Build:0.7,7
     commit=1ac1e4660556b782549c34e775a1304a495291e1
     gradle=yes
diff --git a/metadata/de.wikilab.android.friendica01.txt b/metadata/de.wikilab.android.friendica01.txt
index da2d625ecf..aa2250bad7 100644
--- a/metadata/de.wikilab.android.friendica01.txt
+++ b/metadata/de.wikilab.android.friendica01.txt
@@ -35,7 +35,6 @@ Build:9.0,9
     update=.,../libpulltorefresh
 
 Auto Update Mode:None
-# Not in market
 Update Check Mode:RepoManifest
 Current Version:9.0
 Current Version Code:9
diff --git a/metadata/dentex.youtube.downloader.txt b/metadata/dentex.youtube.downloader.txt
index 04c6b96351..c6f956c0c2 100644
--- a/metadata/dentex.youtube.downloader.txt
+++ b/metadata/dentex.youtube.downloader.txt
@@ -25,7 +25,6 @@ repos have been removed by upstream.
 Repo Type:git
 Repo:https://github.com/dentex/ytdownloader.git
 
-# Fork (inactive?): https://github.com/joaormatos/ytdownloader
 Build:1.3,30
     commit=cb6a336b63
     subdir=dentex.youtube.downloader
diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt
index 90038f8d22..234c04e687 100644
--- a/metadata/dk.andsen.asqlitemanager.txt
+++ b/metadata/dk.andsen.asqlitemanager.txt
@@ -57,7 +57,6 @@ Build:3.6,17
     commit=263
 
 Auto Update Mode:None
-# Martin let's us know via the forum
 Update Check Mode:Static
 Current Version:3.6
 Current Version Code:17
diff --git a/metadata/dudeofx.eval.txt b/metadata/dudeofx.eval.txt
index baafc6e1a6..8dfe02da85 100644
--- a/metadata/dudeofx.eval.txt
+++ b/metadata/dudeofx.eval.txt
@@ -4,7 +4,6 @@ Web Site:https://sourceforge.net/projects/mathexpressionevaluator
 Source Code:https://sourceforge.net/p/mathexpressionevaluator/code
 Issue Tracker:https://sourceforge.net/p/mathexpressionevaluator/discussion
 
-# Name:Eval
 Auto Name:Expression Evaluator
 Summary:Expression Evaluator (calculator)
 Description:
diff --git a/metadata/ee.smkv.calc.loan.txt b/metadata/ee.smkv.calc.loan.txt
index a6cfe58e05..f8a7116da5 100644
--- a/metadata/ee.smkv.calc.loan.txt
+++ b/metadata/ee.smkv.calc.loan.txt
@@ -26,7 +26,6 @@ Build:4.0.2,52
     target=android-17
 
 Auto Update Mode:None
-# On downloads page (for now)
 Update Check Mode:RepoManifest
 Current Version:4.0.2
 Current Version Code:52
diff --git a/metadata/eu.domob.anacam.txt b/metadata/eu.domob.anacam.txt
index 2f65bcb02f..bfcfbabd09 100644
--- a/metadata/eu.domob.anacam.txt
+++ b/metadata/eu.domob.anacam.txt
@@ -32,7 +32,6 @@ Build:1.2,10200
     prebuild=sed -i 's@ndk-build@${ndk.dir}/ndk-build@' custom_rules.xml
 
 Auto Update Mode:None
-# Author will let us know
 Update Check Mode:Static
 Current Version:1.2
 Current Version Code:10200
diff --git a/metadata/eu.domob.bjtrainer.txt b/metadata/eu.domob.bjtrainer.txt
index 5d0641ac4b..8aa5f42ef3 100644
--- a/metadata/eu.domob.bjtrainer.txt
+++ b/metadata/eu.domob.bjtrainer.txt
@@ -22,7 +22,6 @@ Build:0.1,100
     init=rm -f build.xml
 
 Auto Update Mode:None
-# Author will let us know
 Update Check Mode:Static
 Current Version:0.1
 Current Version Code:100
diff --git a/metadata/eu.flatworld.android.slider.txt b/metadata/eu.flatworld.android.slider.txt
index 485bb44a7a..0a5253b9ae 100644
--- a/metadata/eu.flatworld.android.slider.txt
+++ b/metadata/eu.flatworld.android.slider.txt
@@ -32,7 +32,6 @@ Build:1.0.2,3
     target=android-8
 
 Auto Update Mode:None
-# No reviews
 Update Check Mode:RepoManifest
 Current Version:1.0.2
 Current Version Code:3
diff --git a/metadata/eu.hydrologis.geopaparazzi.txt b/metadata/eu.hydrologis.geopaparazzi.txt
index ae6f51d2d4..bb6abe26c8 100644
--- a/metadata/eu.hydrologis.geopaparazzi.txt
+++ b/metadata/eu.hydrologis.geopaparazzi.txt
@@ -22,14 +22,11 @@ It uses OSM maps by default and the current location can be opened in
 Repo Type:git
 Repo:https://github.com/geopaparazzi/geopaparazzi
 
-# old Repo:https://code.google.com/p/geopaparazzi
 Build:3.1.1,30
     commit=version_3.1.1
     subdir=geopaparazzi.app
     update=.,../geopaparazzilibrary
 
-# New libraries in libs/
-# Can't find tag for this even though update check mode got it
 Build:3.2.0,31
     commit=6d0834dffbf5
     subdir=geopaparazzi.app
@@ -65,7 +62,6 @@ Build:3.6.2,45
     commit=version_3.6.2
     subdir=geopaparazzi.app
 
-# starting with new repo here
 Build:4.1.0,63
     disable=jars,binaries etc
     commit=version_4.1.0
diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 3a8e71c806..261c877588 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -421,17 +421,6 @@ Build:1.2.0-beta,54
         popd && \
         sed -i -e '/mavenCentral/amavenLocal()\n' -e '/maven {/d' -e '/jitsi.github.com/,+1d' -e '/applicationVariants/i/*' -e '/lintOptions {/i*/' build.gradle
 
-# uncomment this build once vc56+ is added via auto-update
-# Build:1.2.0,56
-# commit=1.2.0
-# gradle=yes
-# srclibs=Otr4j-jitsi@8bc49a960b995ab79583df592abe7a5066599491
-# prebuild=pushd $$Otr4j-jitsi$$ && \
-# $$MVN3$$ clean && \
-# $$MVN3$$ install && \
-# popd && \
-# sed -i -e '/mavenCentral/amavenLocal()\n' -e '/maven {/d' -e '/jitsi.github.com/,+1d' -e '/applicationVariants/i/*' -e '/lintOptions {/i*/' build.gradle
-# remove this build once vc56+ is added via auto-update
 Build:1.2.0,56
     commit=1.2.0
     gradle=yes
diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt
index 6574993997..0365929227 100644
--- a/metadata/eu.vranckaert.worktime.txt
+++ b/metadata/eu.vranckaert.worktime.txt
@@ -43,7 +43,6 @@ Upstream went proprietary: https://code.google.com/p/worktime/issues/detail?id=2
 .
 
 Auto Update Mode:None
-# releases have their own branch
 Update Check Mode:None
 Current Version:1.1.15
 Current Version Code:270
diff --git a/metadata/faenza.adw.theme.txt b/metadata/faenza.adw.theme.txt
index a9755172ff..fe961a5640 100644
--- a/metadata/faenza.adw.theme.txt
+++ b/metadata/faenza.adw.theme.txt
@@ -17,7 +17,6 @@ Build:1.0,1
     commit=1
 
 Auto Update Mode:None
-# Not in market; no revisions since initial import in 03/11
 Update Check Mode:Static
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/fr.neamar.kiss.txt b/metadata/fr.neamar.kiss.txt
index b6c8b9d69a..85e29a583f 100644
--- a/metadata/fr.neamar.kiss.txt
+++ b/metadata/fr.neamar.kiss.txt
@@ -103,7 +103,6 @@ Build:2.17.0,73
     gradle=yes
 
 Auto Update Mode:Version v%v
-# Beta releases will be tagged as v%v-beta and should not be build by F-Droid
 Update Check Mode:Tags ^v[0-9\.]+$
 Current Version:2.17.0
 Current Version Code:73
diff --git a/metadata/fr.ornidroid.txt b/metadata/fr.ornidroid.txt
index b63c724f3a..957976d0b9 100644
--- a/metadata/fr.ornidroid.txt
+++ b/metadata/fr.ornidroid.txt
@@ -13,7 +13,6 @@ or download them from the web as mentioned on the website
 .
 
 Repo Type:git
-# Be warned! Repo is large
 Repo:https://github.com/giletvin/ornidroid.git
 
 Build:1.0.1,2
diff --git a/metadata/fr.strasweb.browserquest.txt b/metadata/fr.strasweb.browserquest.txt
index 973f393efe..c1f9846a9a 100644
--- a/metadata/fr.strasweb.browserquest.txt
+++ b/metadata/fr.strasweb.browserquest.txt
@@ -19,10 +19,6 @@ keyboard to speak to others. Content is licensed as CC-BY-SA.
 Repo Type:git-svn
 Repo:https://svn.strasweb.fr/rudloff/browserquest
 
-# Build problems
-# 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/
 Build:1.0.1,3
     commit=143
     extlibs=Java-WebSocket.build.xml
diff --git a/metadata/fr.ybo.transportsrennes.txt b/metadata/fr.ybo.transportsrennes.txt
index 8acf0e598d..45a131a074 100644
--- a/metadata/fr.ybo.transportsrennes.txt
+++ b/metadata/fr.ybo.transportsrennes.txt
@@ -1,6 +1,5 @@
 AntiFeatures:UpstreamNonFree
 Categories:Navigation
-# See COPYING.txt
 License:GPLv3
 Web Site:
 Source Code:https://github.com/ybonnel/TransportsRennes/tree/noGoogleMap
diff --git a/metadata/i4nc4mp.myLock.txt b/metadata/i4nc4mp.myLock.txt
index 0fb1e8c95b..5fe9a35877 100644
--- a/metadata/i4nc4mp.myLock.txt
+++ b/metadata/i4nc4mp.myLock.txt
@@ -21,7 +21,6 @@ Features:
 Repo Type:git-svn
 Repo:https://mylockforandroid.googlecode.com/svn/trunk/ML_utility
 
-# Don't have android-9
 Build:42,28
     commit=341
     target=android-8
diff --git a/metadata/in.ac.dtu.subtlenews.txt b/metadata/in.ac.dtu.subtlenews.txt
index 8ee79e0be2..d6c9548a0e 100644
--- a/metadata/in.ac.dtu.subtlenews.txt
+++ b/metadata/in.ac.dtu.subtlenews.txt
@@ -1,7 +1,6 @@
 Categories:Reading
 License:GPLv3
 Web Site:
-# Web Site:http://android.championswimmer.in
 Source Code:https://github.com/teamOSC/SubtleNews_Android_App
 Issue Tracker:https://github.com/teamOSC/SubtleNews_Android_App/issues
 
diff --git a/metadata/info.guardianproject.orfox.txt b/metadata/info.guardianproject.orfox.txt
index edcdd66307..77191d6871 100644
--- a/metadata/info.guardianproject.orfox.txt
+++ b/metadata/info.guardianproject.orfox.txt
@@ -21,7 +21,6 @@ Repo Type:git
 Repo:https://github.com/guardianproject/Orfox
 Binaries:https://guardianproject.info/fdroid/repo/info.guardianproject.orfox_%c.apk
 
-# https://guardianproject.info/fdroid/repo/fennec-38.0.en-US.android-arm.apk
 Build:Fennec-38.1.0esr/TorBrowser-5.0/Orfox-1.0beta1,1
     disable=test
     commit=c3fd3f811a345e7708a8c26c8105d0991e9f3c69
diff --git a/metadata/info.guardianproject.otr.app.im.txt b/metadata/info.guardianproject.otr.app.im.txt
index 79295746fd..1deab97dda 100644
--- a/metadata/info.guardianproject.otr.app.im.txt
+++ b/metadata/info.guardianproject.otr.app.im.txt
@@ -51,8 +51,6 @@ Build:0.0.10-RC6,41
     forcevercode=yes
     prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
-# Can't use build.bash (fdroid is dash only) script so add the output as a
-# patch and build the jar manually
 Build:0.0.11-RC5,57
     commit=92db4fe01571
     submodules=yes
diff --git a/metadata/info.kesavan.malartoon.txt b/metadata/info.kesavan.malartoon.txt
index b9eb25dc6f..71a74d69fd 100644
--- a/metadata/info.kesavan.malartoon.txt
+++ b/metadata/info.kesavan.malartoon.txt
@@ -1,4 +1,3 @@
-# Categories:News,Multimedia
 Categories:Multimedia
 License:GPLv3+
 Web Site:
@@ -26,7 +25,6 @@ Build:1.2,2
     gradle=yes
 
 Auto Update Mode:None
-# UCM: See if tags are used correctly in the next version and set UCM and AUM
 Update Check Mode:RepoManifest
 Current Version:1.2
 Current Version Code:2
diff --git a/metadata/io.github.phora.aeondroid.txt b/metadata/io.github.phora.aeondroid.txt
index bc9d79d6f3..cf24afb3de 100644
--- a/metadata/io.github.phora.aeondroid.txt
+++ b/metadata/io.github.phora.aeondroid.txt
@@ -36,6 +36,5 @@ Build:1.0.3,4
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[0-9\.]+$
-# Beta releases will be tagged as %v-beta and should not be build by F-Droid
 Current Version:1.0.3
 Current Version Code:4
diff --git a/metadata/io.github.phora.androptpb.txt b/metadata/io.github.phora.androptpb.txt
index 427a5ba18e..a290c41adf 100644
--- a/metadata/io.github.phora.androptpb.txt
+++ b/metadata/io.github.phora.androptpb.txt
@@ -28,6 +28,5 @@ Build:1.1,2
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[0-9\.]+$
-# Beta releases will be tagged as v%v-beta and should not be build by F-Droid
 Current Version:1.1
 Current Version Code:2
diff --git a/metadata/it.gtd.abreakout.GameActivity.txt b/metadata/it.gtd.abreakout.GameActivity.txt
index bb1dde00c5..a534468f75 100644
--- a/metadata/it.gtd.abreakout.GameActivity.txt
+++ b/metadata/it.gtd.abreakout.GameActivity.txt
@@ -17,7 +17,6 @@ This app requires the Necessitas SDK to build
 .
 
 Auto Update Mode:None
-# Would need necessitas SDK
 Update Check Mode:Static
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/it.sasabz.android.sasabus.txt b/metadata/it.sasabz.android.sasabus.txt
index 1c75c82809..2fe09c3252 100644
--- a/metadata/it.sasabz.android.sasabus.txt
+++ b/metadata/it.sasabz.android.sasabus.txt
@@ -19,7 +19,6 @@ Licence and copyrighted by OpenStreetMap-Mitwirkende.
 .
 
 Repo Type:git
-# Previous repo. Got disabled over missing source code for libraries
 Repo:https://github.com/SASAbus/SASAbus.git
 
 Build:0.2.6,17
diff --git a/metadata/it.sineo.android.noFrillsCPUClassic.txt b/metadata/it.sineo.android.noFrillsCPUClassic.txt
index 5372a84df4..262dc7b33f 100644
--- a/metadata/it.sineo.android.noFrillsCPUClassic.txt
+++ b/metadata/it.sineo.android.noFrillsCPUClassic.txt
@@ -22,7 +22,6 @@ Requires Root:yes
 Repo Type:git
 Repo:https://github.com/hrk/no-frills-cpu-classic.git
 
-# Temporary patch; Changelog lib doesn't change too often
 Build:1.27,55
     commit=1.27
     init=git clone https://github.com/hrk/androidChangelogLib
diff --git a/metadata/jp.co.kayo.android.localplayer.txt b/metadata/jp.co.kayo.android.localplayer.txt
index e47bfd1a38..e127fe0422 100644
--- a/metadata/jp.co.kayo.android.localplayer.txt
+++ b/metadata/jp.co.kayo.android.localplayer.txt
@@ -27,7 +27,6 @@ server and stream it to Just Player.
 Google Admob was removed before building.
 .
 
-# two branches
 Repo Type:git
 Repo:https://bitbucket.org/yokmama/just-player.git
 
@@ -121,7 +120,6 @@ Build:3.37,2111600304
     update=.,../LibAndroTranslation-1.0.1
 
 Auto Update Mode:None
-# device variable; RM checks HEAD branch
 Update Check Mode:None
 Current Version:3.37
 Current Version Code:2111600304
diff --git a/metadata/jp.yhonda.txt b/metadata/jp.yhonda.txt
index b87cd03115..edb0684afd 100644
--- a/metadata/jp.yhonda.txt
+++ b/metadata/jp.yhonda.txt
@@ -1,4 +1,3 @@
-# Categories:Mathematics
 Categories:Science & Education
 License:GPLv2+
 Web Site:https://sites.google.com/site/maximaonandroid
diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 322e536d8e..1e99313d48 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -51,7 +51,6 @@ Build:2.4.1,141
         sed -i '184,190d' AndroidManifest.xml
 
 Auto Update Mode:None
-# Not updating - proprietary dependencies
 Update Check Mode:Static
 Current Version:2.4.1
 Current Version Code:141
diff --git a/metadata/mancioboxblog.altervista.it.volumecontrol.txt b/metadata/mancioboxblog.altervista.it.volumecontrol.txt
index 33ff1f0285..edbee072d1 100644
--- a/metadata/mancioboxblog.altervista.it.volumecontrol.txt
+++ b/metadata/mancioboxblog.altervista.it.volumecontrol.txt
@@ -20,7 +20,6 @@ Build:1.0,1
     subdir=Volume Control
 
 Auto Update Mode:None
-# No version code on market, but commit info is not mush good so far
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/me.echeung.cdflabs.txt b/metadata/me.echeung.cdflabs.txt
index 0de7bfeb1f..5f358dcfe8 100644
--- a/metadata/me.echeung.cdflabs.txt
+++ b/metadata/me.echeung.cdflabs.txt
@@ -71,7 +71,6 @@ Build:2.3.0,22
     subdir=app
     gradle=yes
 
-# Starting with 3.0.0 the app is MIT licensed, prior to 3.0.0 GPLv3
 Build:3.0.0,23
     commit=d7b547a9f5052d6e73cb827e6a451b716e62db8f
     subdir=app