diff --git a/metadata/com.anysoftkeyboard.languagepack.pali.txt b/metadata/com.anysoftkeyboard.languagepack.pali.txt
index c59a59be69..c94d9ca05d 100644
--- a/metadata/com.anysoftkeyboard.languagepack.pali.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.pali.txt
@@ -41,7 +41,6 @@ Build:0.2,2
         sed -i '/key/d' project.properties
 
 Auto Update Mode:None
-# Update Check Mode:Market
 Update Check Mode:None
 Current Version:0.2
 Current Version Code:2
diff --git a/metadata/com.claha.showtimeremote.txt b/metadata/com.claha.showtimeremote.txt
index f900747693..59f0b1be75 100644
--- a/metadata/com.claha.showtimeremote.txt
+++ b/metadata/com.claha.showtimeremote.txt
@@ -33,8 +33,6 @@ Build:1.1.0,2
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Update Check Mode:RepoManifest
 Current Version:1.1.0
 Current Version Code:2
diff --git a/metadata/com.github.jtjj222.sudburytransit.txt b/metadata/com.github.jtjj222.sudburytransit.txt
index c6498d8996..d7d6e36cfa 100644
--- a/metadata/com.github.jtjj222.sudburytransit.txt
+++ b/metadata/com.github.jtjj222.sudburytransit.txt
@@ -19,7 +19,6 @@ Build:1.0,1
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.github.premnirmal.tickerwidget.txt b/metadata/com.github.premnirmal.tickerwidget.txt
index 7343054d82..ae744da611 100644
--- a/metadata/com.github.premnirmal.tickerwidget.txt
+++ b/metadata/com.github.premnirmal.tickerwidget.txt
@@ -153,7 +153,5 @@ information from a different file.
 
 Auto Update Mode:None
 Update Check Mode:None
-# Auto Update Mode:Version %v
-# Update Check Mode:Tags
 Current Version:1.10.53
 Current Version Code:67
diff --git a/metadata/com.google.android.marvin.talkback.txt b/metadata/com.google.android.marvin.talkback.txt
index 593a2ce114..4e8454fd0b 100644
--- a/metadata/com.google.android.marvin.talkback.txt
+++ b/metadata/com.google.android.marvin.talkback.txt
@@ -55,10 +55,8 @@ Build:3.2.1,83
     novcheck=yes
 
 Auto Update Mode:None
-# Device-variable; apks on download page; RM doesn't work for srclibs
 Update Check Mode:None
 Current Version:3.2.1
 Current Version Code:83
 
-# guess
 No Source Since:3.4.0
diff --git a/metadata/com.maskyn.fileeditorpro.txt b/metadata/com.maskyn.fileeditorpro.txt
index 139b786b7d..c219df592c 100644
--- a/metadata/com.maskyn.fileeditorpro.txt
+++ b/metadata/com.maskyn.fileeditorpro.txt
@@ -78,8 +78,6 @@ Maintainer Notes:
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:RepoManifest
-# Update Check Mode:Tags
 Current Version:1.19
 Current Version Code:47
diff --git a/metadata/com.miz.mizuu.txt b/metadata/com.miz.mizuu.txt
index 27fdcc37cb..70f0f75750 100644
--- a/metadata/com.miz.mizuu.txt
+++ b/metadata/com.miz.mizuu.txt
@@ -45,8 +45,6 @@ See https://f-droid.org/forums/topic/mizuu/ .
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Update Check Mode:Static
 Current Version:3.0.1-black
 Current Version Code:1032
diff --git a/metadata/com.nilhcem.hostseditor.txt b/metadata/com.nilhcem.hostseditor.txt
index f1cdac1bf0..74ad1407f7 100644
--- a/metadata/com.nilhcem.hostseditor.txt
+++ b/metadata/com.nilhcem.hostseditor.txt
@@ -43,7 +43,6 @@ Maintainer Notes:
 Update AUM once RooTools jar has been replaced.
 .
 
-# Auto Update Mode:Version v%v
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.4
diff --git a/metadata/com.plusonelabs.calendar.txt b/metadata/com.plusonelabs.calendar.txt
index 22afe1d2c7..582a8783b0 100644
--- a/metadata/com.plusonelabs.calendar.txt
+++ b/metadata/com.plusonelabs.calendar.txt
@@ -89,8 +89,6 @@ see https://github.com/plusonelabs/calendar-widget/issues/210.
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Update Check Mode:None
 Current Version:1.9.3
 Current Version Code:347
diff --git a/metadata/com.tkjelectronics.balanduino.txt b/metadata/com.tkjelectronics.balanduino.txt
index 2ca5537400..dc328e3b2f 100644
--- a/metadata/com.tkjelectronics.balanduino.txt
+++ b/metadata/com.tkjelectronics.balanduino.txt
@@ -59,7 +59,6 @@ Can't use UCM since vercodes are dynamic.
 .
 
 Auto Update Mode:None
-# Update Check Mode:Tags
 Update Check Mode:None
 Current Version:0.6.3
 Current Version Code:1200063
diff --git a/metadata/com.tobykurien.webapps.txt b/metadata/com.tobykurien.webapps.txt
index 3687b451fd..905aa5f28e 100644
--- a/metadata/com.tobykurien.webapps.txt
+++ b/metadata/com.tobykurien.webapps.txt
@@ -53,7 +53,6 @@ Build:v2.2,7
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:v2.2
 Current Version Code:7
diff --git a/metadata/cx.mccormick.pddroidparty.txt b/metadata/cx.mccormick.pddroidparty.txt
index 88eb97e77c..057fccd16d 100644
--- a/metadata/cx.mccormick.pddroidparty.txt
+++ b/metadata/cx.mccormick.pddroidparty.txt
@@ -52,8 +52,6 @@ TODO:libpd has jar files
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Update Check Mode:RepoManifest
 Current Version:0.3.0
 Current Version Code:2
diff --git a/metadata/cz.yetanotherview.webcamviewer.app.txt b/metadata/cz.yetanotherview.webcamviewer.app.txt
index 7f0a000a91..4d8ab7350e 100644
--- a/metadata/cz.yetanotherview.webcamviewer.app.txt
+++ b/metadata/cz.yetanotherview.webcamviewer.app.txt
@@ -186,9 +186,6 @@ gradle calls. Uses play-services now.
 Archive Policy:0 versions
 Auto Update Mode:None
 # wait for libvlc inclusion
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags ^v[0-9.]*$
-# Update Check Mode:RepoManifest
 # Vercode Operation:%c + 200000
 Update Check Mode:None
 Current Version:4.0
diff --git a/metadata/de.d120.ophasekistenstapeln.txt b/metadata/de.d120.ophasekistenstapeln.txt
index 561eae3fe3..c45bd8d7aa 100644
--- a/metadata/de.d120.ophasekistenstapeln.txt
+++ b/metadata/de.d120.ophasekistenstapeln.txt
@@ -20,7 +20,6 @@ Build:1.0,1
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/de.luhmer.owncloudnewsreader.txt b/metadata/de.luhmer.owncloudnewsreader.txt
index bb1c5c997b..dbe140becf 100644
--- a/metadata/de.luhmer.owncloudnewsreader.txt
+++ b/metadata/de.luhmer.owncloudnewsreader.txt
@@ -366,10 +366,6 @@ Build:0.9.8,104
         mkdir libs && \
         mv $$JavaOptionClass$$/target/option-1.3-SNAPSHOT.jar libs/option-1.3.jar
 
-Maintainer Notes:
-# Auto Update Mode:Version v.%v
-.
-
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.9.8
diff --git a/metadata/de.ub0r.android.portaltimer.txt b/metadata/de.ub0r.android.portaltimer.txt
index ceb85c945b..25fc45c764 100644
--- a/metadata/de.ub0r.android.portaltimer.txt
+++ b/metadata/de.ub0r.android.portaltimer.txt
@@ -21,7 +21,6 @@ Build:1.5,7150000
     rm=libs/*
     extlibs=android/android-support-v4.jar
 
-# Auto Update Mode:Version PortalTimer-%v
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.5
diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt
index 2632d803ac..dbf1e10364 100644
--- a/metadata/dev.ukanth.ufirewall.txt
+++ b/metadata/dev.ukanth.ufirewall.txt
@@ -323,7 +323,6 @@ Build:2.1.3,15217
         export NDK_PROJECT_PATH=`pwd` && \
         make -C external NDK=$$NDK$$
 
-# Auto Update Mode:Version v%v
 Auto Update Mode:None
 Update Check Mode:Tags ^[0-9\.vV]+$
 Current Version:2.1.3
diff --git a/metadata/es.usc.citius.servando.calendula.txt b/metadata/es.usc.citius.servando.calendula.txt
index c8e442ea91..63b3e533e5 100644
--- a/metadata/es.usc.citius.servando.calendula.txt
+++ b/metadata/es.usc.citius.servando.calendula.txt
@@ -135,7 +135,6 @@ Maintainer Notes:
 .
 
 Auto Update Mode:None
-# Update Check Mode:Tags
 Update Check Mode:RepoManifest
 Current Version:2.3.8
 Current Version Code:24
diff --git a/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt b/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
index 4923f3ea0f..23ef7ce89c 100644
--- a/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
+++ b/metadata/fr.tvbarthel.apps.simpleweatherforcast.txt
@@ -29,8 +29,6 @@ Build:1.3.0,8
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Update Check Mode:RepoManifest
 Current Version:1.3.0
 Current Version Code:8
diff --git a/metadata/fr.tvbarthel.attempt.googlyzooapp.txt b/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
index eed437e999..2ec42106a3 100644
--- a/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
+++ b/metadata/fr.tvbarthel.attempt.googlyzooapp.txt
@@ -27,7 +27,6 @@ Build:2.0,4
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:2.0
 Current Version Code:4
diff --git a/metadata/in.shick.diode.txt b/metadata/in.shick.diode.txt
index d654458043..08f5168abd 100644
--- a/metadata/in.shick.diode.txt
+++ b/metadata/in.shick.diode.txt
@@ -63,7 +63,6 @@ Replace jar files before AUM!
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version d%v
 Update Check Mode:Tags
 Current Version:1.2.0
 Current Version Code:17
diff --git a/metadata/io.github.otakuchiyan.dnsman.txt b/metadata/io.github.otakuchiyan.dnsman.txt
index cf9a9648a1..1fe0fa2ed6 100644
--- a/metadata/io.github.otakuchiyan.dnsman.txt
+++ b/metadata/io.github.otakuchiyan.dnsman.txt
@@ -54,7 +54,6 @@ Build:0.8.1,81
         ./depending_repos.sh
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.8.1
 Current Version Code:81
diff --git a/metadata/io.github.sanbeg.flashlight.txt b/metadata/io.github.sanbeg.flashlight.txt
index 475758157c..f7725274a4 100644
--- a/metadata/io.github.sanbeg.flashlight.txt
+++ b/metadata/io.github.sanbeg.flashlight.txt
@@ -34,7 +34,6 @@ Build:1.3.0,6
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.3.0
 Current Version Code:6
diff --git a/metadata/it.sieke.android.cacertorgcertificateinstaller.txt b/metadata/it.sieke.android.cacertorgcertificateinstaller.txt
index 0ade584be5..96de38137c 100644
--- a/metadata/it.sieke.android.cacertorgcertificateinstaller.txt
+++ b/metadata/it.sieke.android.cacertorgcertificateinstaller.txt
@@ -26,6 +26,5 @@ Build:1.1,2
 
 Auto Update Mode:None
 Update Check Mode:None
-# Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:2
diff --git a/metadata/net.fred.feedex.txt b/metadata/net.fred.feedex.txt
index 6272e61260..fd0efee404 100644
--- a/metadata/net.fred.feedex.txt
+++ b/metadata/net.fred.feedex.txt
@@ -205,7 +205,6 @@ Build:1.8.1,56
         sed -i -e '/fileTree/acompile project(":libs:textdrawable")' build.gradle
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.9.0
 Current Version Code:57
diff --git a/metadata/net.justdave.nwsweatheralertswidget.txt b/metadata/net.justdave.nwsweatheralertswidget.txt
index fb98cd20df..33081fa6e1 100644
--- a/metadata/net.justdave.nwsweatheralertswidget.txt
+++ b/metadata/net.justdave.nwsweatheralertswidget.txt
@@ -31,7 +31,6 @@ Build:1.1,7
     init=mv aidl/net/justdave/nwsweatheralertswidget/* src/net/justdave/nwsweatheralertswidget/
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.1
 Current Version Code:7
diff --git a/metadata/net.kismetwireless.android.smarterwifimanager.txt b/metadata/net.kismetwireless.android.smarterwifimanager.txt
index 7faa5b9cec..f8d63407c1 100644
--- a/metadata/net.kismetwireless.android.smarterwifimanager.txt
+++ b/metadata/net.kismetwireless.android.smarterwifimanager.txt
@@ -36,7 +36,6 @@ don't detect them now.
 .
 
 Auto Update Mode:None
-# Update Check Mode:RepoManifest
 Update Check Mode:None
 Current Version:2015.07.70
 Current Version Code:70
diff --git a/metadata/org.androidfromfrankfurt.archnews.txt b/metadata/org.androidfromfrankfurt.archnews.txt
index ce6c278738..f14d78a224 100644
--- a/metadata/org.androidfromfrankfurt.archnews.txt
+++ b/metadata/org.androidfromfrankfurt.archnews.txt
@@ -21,7 +21,6 @@ Build:2.0,4
     prebuild=cp libs/android-support-v4.jar $$SimpleRss2$$/libs/android-support-v4.jar
 
 Auto Update Mode:None
-# Auto Update Mode:Version %v
 Update Check Mode:RepoManifest
 Current Version:2.0
 Current Version Code:4
diff --git a/metadata/org.developfreedom.ccdroid.app.txt b/metadata/org.developfreedom.ccdroid.app.txt
index 1ed4d192b9..2212d82301 100644
--- a/metadata/org.developfreedom.ccdroid.app.txt
+++ b/metadata/org.developfreedom.ccdroid.app.txt
@@ -31,7 +31,6 @@ Crashlytics ticker is https://github.com/shubhamchaudhary/CCDroid/issues/23
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.0.3
 Current Version Code:3
diff --git a/metadata/org.fedorahosted.freeotp.txt b/metadata/org.fedorahosted.freeotp.txt
index 2455b20e1a..660eb95d3e 100644
--- a/metadata/org.fedorahosted.freeotp.txt
+++ b/metadata/org.fedorahosted.freeotp.txt
@@ -50,7 +50,6 @@ Build:1.5,17
     subdir=app
     gradle=yes
 
-# Auto Update Mode:Version v%v
 Auto Update Mode:Version r%c
 Update Check Mode:Tags
 Current Version:1.5
diff --git a/metadata/org.jamienicol.episodes.txt b/metadata/org.jamienicol.episodes.txt
index 9589a1c71f..95fda05837 100644
--- a/metadata/org.jamienicol.episodes.txt
+++ b/metadata/org.jamienicol.episodes.txt
@@ -67,7 +67,6 @@ Re-enable AUM and maybe add UCName after next release.
 .
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.11
 Current Version Code:11
diff --git a/metadata/org.libreoffice.impressremote.txt b/metadata/org.libreoffice.impressremote.txt
index 26fe34f563..709acb4884 100644
--- a/metadata/org.libreoffice.impressremote.txt
+++ b/metadata/org.libreoffice.impressremote.txt
@@ -62,7 +62,6 @@ in the parent directory. We don't evaluate gradle files, so it doesn't work.
 .
 
 Auto Update Mode:None
-# Update Check Mode:Tags ^sdremote-
 Update Check Mode:None
 Current Version:2.2.3
 Current Version Code:17
diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index f3e3e594ef..40c94a0e43 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -123,7 +123,6 @@ Build:0.8.11,19
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.8.11
 Current Version Code:19
diff --git a/metadata/org.piwik.mobile.txt b/metadata/org.piwik.mobile.txt
index a73b06999a..eb803bc0d2 100644
--- a/metadata/org.piwik.mobile.txt
+++ b/metadata/org.piwik.mobile.txt
@@ -12,7 +12,6 @@ gives you access to your statistics.
 .
 
 Auto Update Mode:None
-# Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.9.6
 Current Version Code:20
diff --git a/metadata/org.runnerup.txt b/metadata/org.runnerup.txt
index 7f5fc0c899..e3649ffc89 100644
--- a/metadata/org.runnerup.txt
+++ b/metadata/org.runnerup.txt
@@ -128,7 +128,6 @@ Build:1.51,14000051
     scandelete=ANT-Android-SDKs/ANT_Android_SDK/Tools/Android_ANTEmulatorPackage/Android_PC_AndroidEmulatorBridge_2-0/ANTAndroidBridge.exe
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.51
 Current Version Code:14000051
diff --git a/metadata/org.softeg.slartus.forpdaplus.txt b/metadata/org.softeg.slartus.forpdaplus.txt
index 9a13a2943f..b24496b7f5 100644
--- a/metadata/org.softeg.slartus.forpdaplus.txt
+++ b/metadata/org.softeg.slartus.forpdaplus.txt
@@ -129,8 +129,6 @@ Build:3.1.4b4,545
     gradle=yes
 
 Auto Update Mode:None
-# Auto Update Mode:Version %v
-# Update Check Mode:Tags
 Update Check Mode:RepoManifest
 Current Version:3.1.4b4
 Current Version Code:545
diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index 8039e235d3..8d81a6573c 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -232,7 +232,6 @@ Maintainer Notes:
 
 Archive Policy:10 versions
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Vercode Operation:%c + 7
 Current Version:2.7.3
diff --git a/metadata/org.sugr.gearshift.txt b/metadata/org.sugr.gearshift.txt
index 74e94d3d42..0d1376b03a 100644
--- a/metadata/org.sugr.gearshift.txt
+++ b/metadata/org.sugr.gearshift.txt
@@ -65,7 +65,6 @@ Build:1.0,84
     prebuild=sed -i -e '/runTasks/i/*' -e '$a*/' build.gradle
 
 Auto Update Mode:None
-# Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:84
diff --git a/metadata/org.systemcall.scores.txt b/metadata/org.systemcall.scores.txt
index 8b1009c727..c7ea7eb981 100644
--- a/metadata/org.systemcall.scores.txt
+++ b/metadata/org.systemcall.scores.txt
@@ -39,8 +39,6 @@ Build:1.1,2
     forceversion=yes
     forcevercode=yes
 
-# Auto Update Mode:Version v%v
-# Update Check Mode:Tags
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:1.1
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index f77e988cfa..9305c2cbd5 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -570,7 +570,6 @@ Maintainer Notes:
 # +15: x86_64
 # +16: mips64
 # Archive Policy:6 versions
-# Auto Update Mode:Version %v
 Archive Policy:19 versions
 Auto Update Mode:None
 Update Check Mode:Tags ^[^-]*$
diff --git a/metadata/org.transdroid.full.txt b/metadata/org.transdroid.full.txt
index 5d89587f14..e7108225e0 100644
--- a/metadata/org.transdroid.full.txt
+++ b/metadata/org.transdroid.full.txt
@@ -92,7 +92,6 @@ Build:2.5.6,226
         sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:2.5.6
 Current Version Code:226
diff --git a/metadata/org.voidsink.anewjkuapp.txt b/metadata/org.voidsink.anewjkuapp.txt
index b21963cefc..fab8d14e2a 100644
--- a/metadata/org.voidsink.anewjkuapp.txt
+++ b/metadata/org.voidsink.anewjkuapp.txt
@@ -84,7 +84,6 @@ Build:0.42.4,140046
     prebuild=sed -i -e '/applicationVariants/,+2d' -e '/def appendVersionNameVersionCode/,+7d' -e 's|googleCompile|//googleCompile|g' build.gradle
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.42.4
 Current Version Code:140046
diff --git a/metadata/tk.al54.dev.badpixels.txt b/metadata/tk.al54.dev.badpixels.txt
index 6f949214a5..11822bcdb0 100644
--- a/metadata/tk.al54.dev.badpixels.txt
+++ b/metadata/tk.al54.dev.badpixels.txt
@@ -26,7 +26,6 @@ Build:0.2,4
     target=android-22
 
 Auto Update Mode:None
-# Auto Update Mode:Version v%v-b%c
 Update Check Mode:Tags
 Current Version:0.2
 Current Version Code:4