diff --git a/metadata/com.andrewshu.android.reddit.txt b/metadata/com.andrewshu.android.reddit.txt
deleted file mode 100644
index ffc95b591d..0000000000
--- a/metadata/com.andrewshu.android.reddit.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Disabled:Use in.shick.diode
-Category:Internet
-License:GPLv3+
-Web Site:https://github.com/talklittle/reddit-is-fun
-Source Code:https://github.com/talklittle/reddit-is-fun
-Issue Tracker:https://github.com/talklittle/reddit-is-fun/issues
-
-Auto Name:reddit is fun
-Summary:Access social news
-Description:
-An app for the social news website Reddit.
-
-N.B v2.0+ of RiF, found elsewhere, are proprietary
-.
-
-Repo Type:git
-Repo:https://github.com/talklittle/reddit-is-fun.git
-
-Build Version:1.1.2a,67,d507af7facaf46323804,prebuild=rsync -r lib/ libs
-Build Version:1.1.3,68,b302eaa24a975060f7fb,prebuild=rsync -r lib/ libs
-Build Version:1.1.4,69,9372d0ab3a16125e9045,prebuild=rsync -r lib/ libs
-Build Version:1.2.0,70,442e604760506e25e6c9,prebuild=rsync -r lib/ libs
-Build Version:1.2.0a,71,e37439e12d11ff17a841,prebuild=rsync -r lib/ libs
-Build Version:1.2.1,73,e35fd128c954d41e24abf91b71f301740f6ca483,prebuild=rsync -r lib/ libs
-Build Version:1.2.1.2,75,28c98a7,prebuild=rsync -r lib/ libs,target=android-10
-Build Version:1.2.1.3,76,143892b558,prebuild=rsync -r lib/ libs,target=android-10
-Build Version:1.2.1.5,78,!more dependency shuffling required and watch out for the proguard config
-Build Version:1.3.0,83,v1.3.0,target=android-11,prebuild=mkdir lib && mv libs-dependencies/* lib && rm -r libs-dependencies && mv libs/* lib && rm -r libs && git checkout proguard.cfg
-Build Version:2.1.1,91,!No source in repo
-Build Version:2.2,92,!No source in repo
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.3.0
-Current Version Code:83
-
diff --git a/metadata/com.droidwave.offlinecalendar.txt b/metadata/com.droidwave.offlinecalendar.txt
deleted file mode 100644
index 1570e78a6e..0000000000
--- a/metadata/com.droidwave.offlinecalendar.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Disabled:2.5+ years of inactivity, better offline calendars available
-Category:Office
-License:MIT
-Web Site:https://bitbucket.org/giszmo/offline-calendar/overview
-Source Code:https://bitbucket.org/giszmo/offline-calendar/src
-Issue Tracker:https://bitbucket.org/giszmo/offline-calendar/issues?status=new&status=open
-
-Auto Name:Offline Calendar
-Summary:Calendar
-Description:
-This calendar software can work completely without servers and independently.
-Offline Calendar can handle
-your Appointments, Tasks and Notes.
-It is a fork of Ancal with an easy to use graphical user interface.
-Like Ancal, future development is unlikely.
-.
-
-Repo Type:hg
-Repo:https://bitbucket.org/giszmo/offline-calendar
-
-Build Version:1.0,1,03be85,target=android-10
-
-Auto Update Mode:None
-# See the forums for a debate over CVs
-Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
-
diff --git a/metadata/com.googlecode.androidcells.txt b/metadata/com.googlecode.androidcells.txt
deleted file mode 100644
index 54f10ae542..0000000000
--- a/metadata/com.googlecode.androidcells.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Disabled:now known as org.openbmap
-Category:Internet
-License:AGPLv3
-Web Site:http://openbmap.org
-Source Code:http://sourceforge.net/p/myposition/androidclient/ci/master/tree
-Issue Tracker:http://sourceforge.net/projects/myposition/support
-
-Auto Name:openBmap
-Summary:Contribute to coverage maps
-Description:
-Provides the ability to record cellular and WiFi locations and upload them
-to the OpenBMap database. See [http://openbmap.org openbmap.org].
-.
-
-Repo Type:git
-Repo:git://myposition.git.sourceforge.net/gitroot/myposition/AndroidClient
-
-Build Version:0.4.96,9,!bc15ce80024,prebuild=mv lib libs,target=android-10
-# Jar versions don't tally but may as well try
-Build Version:0.4.999,14,!3ed4e59f,\
-target=android-10,extlibs=openBmap-1.1.tar.gz,prebuild=\
-tar xvf libs/openBmap-1.1.tar.gz -C src com && mv lib/* libs/ && \
-rm libs/Measure* libs/openBmap*
-
-Auto Update Mode:None
-Update Check Mode:Static
-
diff --git a/metadata/com.googlecode.talkmyphone.txt b/metadata/com.googlecode.talkmyphone.txt
deleted file mode 100644
index 9fad5a81ae..0000000000
--- a/metadata/com.googlecode.talkmyphone.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Disabled:Superseded by com.googlecode.gtalksms
-Category:System
-License:LGPL
-Web Site:http://code.google.com/p/talkmyphone/
-Source Code:http://code.google.com/p/talkmyphone/source/checkout
-Issue Tracker:http://code.google.com/p/talkmyphone/issues/list
-
-Summary:Remote control of phone by XMPP
-Description:
-Allows you to send commands to your device remotely, via the XMPP protocol.
-You can also receive information, such as incoming calls and SMS, and
-battery state.
-.
-
-Update Check Mode:Static
-Current Version:2.06-beta
-Current Version Code:17
-
diff --git a/metadata/com.passwordmaker.txt b/metadata/com.passwordmaker.txt
deleted file mode 100644
index 3371c1f772..0000000000
--- a/metadata/com.passwordmaker.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Disabled:Not and won't be in a public repo
-Category:Internet
-License:GPLv3
-Web Site:http://www.hansche.de/android/apoma/
-Source Code:http://passwordmaker.hansche.de/passwordmaker/src
-
-Summary:PasswordMaker for Android
-Description:
-N.B. Not related to PasswordMaker Pro.
-This won't be getting any more updates because the source
-code is no longer available in a public repository.
-
-PasswordMaker allows users to create and access unique, secure passwords.
-It is multi-platform and works
-by mixing the website url with unique info of your own choosing, such as a
-master password. The app
-creates an item in the share menu to quickly get at the password.
-For more info see passwordmaker.org.
-.
-
-#Not in use any more
-Repo Type:hg
-Repo:https://bitbucket.org/Loxley/passwordmaker
-
-Build Version:2.1.5,10,0c4427cfbc7d,target=android-15
-
-#Device variable
-Update Check Mode:Static
-Current Version:2.1.5
-Current Version Code:10
-
diff --git a/metadata/com.rackspace.cloud.android.txt b/metadata/com.rackspace.cloud.android.txt
deleted file mode 100644
index a6dd6e1c64..0000000000
--- a/metadata/com.rackspace.cloud.android.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Disabled:Never build, source repo deleted
-Category:Internet
-License:MIT
-Web Site:https://github.com/rackspace/android-rackspacecloud
-Source Code:https://github.com/rackspace/android-rackspacecloud
-Issue Tracker:https://github.com/rackspace/android-rackspacecloud/issues
-
-Summary:Monitor your servers
-Description:
-Log in with your API key that's available at manage.rackspacecloud.com.
-* Support for US, UK, and custom API endpoints
-* Support for multiple accounts
-* List all Cloud Servers in your account
-* Create new Cloud Servers (including from any existing backups)
-* Delete Cloud Servers
-* Resize Cloud Servers
-* Perform Hard and Soft Reboots
-* Manage backup schedules
-* Ping Cloud Servers
-* Rename Cloud Servers
-* Rebuild Cloud Servers
-* Change a Cloud Server's root password
-* View and Create Cloud Files Containers
-* Upload text files to Cloud Files
-* Download and Preview Cloud Files
-* Passcode Lock
-* Detailed Error Handling: if you get an error from the API, you can see exactly what happened with an equivalent curl command to reproduce it in a shell
-* Links to contact Rackspace Fanatical Support via phone or Twitter
-.
-
-#Repo deleted
-#Repo Type:git
-#Repo:https://github.com/rackspace/android-rackspacecloud.git
-
-Build Version:1.2,2,!wait for next release HEAD,srclibs=NoAnalytics@158a4a,prebuild=\
-echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
-rm libs/libGoogleAnalytics.jar android-rackspacecloud.apk.zip
-
-Auto Update Mode:None
-Update Check Mode:Static
-
diff --git a/metadata/com.webworxshop.swallowcatcher.txt b/metadata/com.webworxshop.swallowcatcher.txt
deleted file mode 100644
index 690dc17af2..0000000000
--- a/metadata/com.webworxshop.swallowcatcher.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Disabled:Development ceased
-Category:Internet
-License:AGPLv3
-Web Site:http://blog.webworxshop.com/projects/swallowcatcher
-Source Code:http://gitorious.org/swallowcatcher
-Issue Tracker:
-FlattrID:126225
-
-Auto Name:SwallowCatcher
-Summary:Podcast client
-Description:
-A podcatcher, or client for downloading and keeping track of audio shows
-hosted on the internet.
-.
-
-Repo Type:git
-Repo:git://gitorious.org/swallowcatcher/swallowcatcher.git
-
-Build Version:0.1.2,5,1528089ae926c6424f9017b46940616cf1164820
-Build Version:0.1.3,6,96660ce659e830f1ac18d4187948a3ac227e2225
-Build Version:0.2.0,7,cb4dd3114342b41ae63fe050628bb4811efa8beb
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.2.0
-Current Version Code:7
-
diff --git a/metadata/de.ub0r.android.adBlock.txt b/metadata/de.ub0r.android.adBlock.txt
deleted file mode 100644
index f01ffe9743..0000000000
--- a/metadata/de.ub0r.android.adBlock.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Disabled:Use org.adblockplus.android instead
-Category:System
-License:GPLv3+
-Web Site:http://code.google.com/p/andblock/
-Source Code:https://github.com/felixb/adBlock
-Issue Tracker:http://code.google.com/p/andblock/issues/list
-
-Auto Name:AdBlock
-Summary:Ad-blocking HTTP proxy
-Description:
-Blocks advertisements in the web browser by filtering requests by URL.
-Root is not required. The app is
-still in beta and hasn't been updated in a while so your mileage might vary.
-.
-
-Repo Type:git
-Repo:https://github.com/felixb/adBlock.git
-
-Build Version:0.5,5,v0.5,oldsdkloc=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.5
-Current Version Code:5
-
diff --git a/metadata/org.androhid.txt b/metadata/org.androhid.txt
deleted file mode 100644
index 253dbf7b95..0000000000
--- a/metadata/org.androhid.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Disabled:Still not buildable, no code updates for three years
-Category:System
-License:GPLv3
-Web Site:https://code.google.com/p/androhid/
-Source Code:https://code.google.com/p/androhid/source/browse/
-Issue Tracker:https://code.google.com/p/androhid/issues/list
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6R56TQAX8GTVQ
-
-Auto Name:AndroHid
-Summary:Bluetooth HID (keyboard) implementation
-Description:
-Use your android device as a bluetooth keyboard. Sending keystroke events over the bluetooth
-HID protocol to your computer, allows you to remotely control your PC or Laptop. As the
-bluetooth HID protocol is a standard specification which is provided by most modern operating
-systems you don't have to install any further software on the host.
-.
-
-#Why?
-Requires Root:Yes
-
-Repo Type:svn
-Repo:http://androhid.googlecode.com/svn/trunk/
-
-Auto Update Mode:None
-# needs a libbluetooth.so (e.g from CM zip) and headers from a device, then find a way for
-# the ndk to find them without them actually being inside the ndk
-#Build Version:0.6,6,34,buildjni=yes
-#,patch=jni.patch
-#not in the market; not updated since 10/2010
-Update Check Mode:Static
-
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
deleted file mode 100644
index 21116aadf3..0000000000
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Disabled:Old and not much good
-Category:Reading
-License:Apache2
-Web Site:http://code.google.com/p/shelves/
-Source Code:http://code.google.com/p/shelves/source/checkout
-Issue Tracker:http://code.google.com/p/shelves/issues/list
-
-Auto Name:Shelves
-Name:Shelves
-Summary:Book collection manager
-Description:
-Shelves lets you manage and search your collection of books from your phone.
-You can add books by scanning their barcodes (if you have
-[[com.google.zxing.client.android]] installed), using Web searches or entering
-information manually.
-.
-
-Repo Type:svn
-Repo:http://shelves.googlecode.com/svn/trunk/Shelves
-
-Build Version:1.0,1,26,oldsdkloc=yes
-Build Version:1.5,2,!No source code apparently
-
-Auto Update Mode:None
-#not in market
-Update Check Mode:Static
-
diff --git a/metadata/org.fdroid.dashclock.k9.txt b/metadata/org.fdroid.dashclock.k9.txt
deleted file mode 100644
index b8fb1a8ce7..0000000000
--- a/metadata/org.fdroid.dashclock.k9.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Disabled:org.fdroid.k9 replaced by source built com.fsck.k9
-Category:Wallpaper
-License:Apache2
-Web Site:
-Source Code:https://github.com/cketti/DashClock_K-9
-Issue Tracker:https://github.com/cketti/DashClock_K-9/issues
-
-Name:DashClock: K-9 Mail~
-Auto Name:K-9 Mail DashClock Extension
-Summary:Email info on the lockscreen
-Description:
-[[net.nurik.roman.dashclock]] extension that displays the number of
-unread emails from [[org.fdroid.k9]], from your choice of accounts.
-
-'''Only works with F-Droid's K-9 package'''
-
-Marking messages as read in K-9 won't reliably update the unread count
-if you are using v4.201 of K-9 — current versions of K-9 should work fine.
-.
-
-Repo Type:git
-Repo:https://github.com/cketti/DashClock_K-9.git
-
-Build Version:1.1-fdroid,2,release-v1.1,forceversion=yes,patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
-echo "android.jar=$$SDK$$/platforms/android-17/android.jar" > ant.properties
-Build Version:1.2-fdroid,3,release-v1.2,\
-forceversion=yes,\
-patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
- echo 'android.jar=$$SDK$$/platforms/android-17/android.jar' > ant.properties
-
-Build Version:1.3-fdroid,4,release-v1.3,forceversion=yes,patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
- echo 'android.jar=$$SDK$$/platforms/android-17/android.jar' > ant.properties
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.3
-Current Version Code:4
-
diff --git a/metadata/org.fdroid.dashclock.k9/packageid.patch b/metadata/org.fdroid.dashclock.k9/packageid.patch
deleted file mode 100644
index 470f03d56b..0000000000
--- a/metadata/org.fdroid.dashclock.k9/packageid.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 820fcd0..278fd07 100644
---- a/build.xml
-+++ b/build.xml
-@@ -88,5 +88,23 @@
- -->
-
-
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
deleted file mode 100644
index d13815173f..0000000000
--- a/metadata/org.mozilla.firefox_beta.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Disabled:We'll just have org.mozilla.firefox
-Category:Internet
-#mostly...
-License:MPL2
-Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
-Source Code:http://hg.mozilla.org/
-Issue Tracker:https://bugzilla.mozilla.org
-
-Summary:Next version of the web browser
-Description:
-Mobile version of the Mozilla Firefox web browser. Uses the Gecko layout engine to render web pages,
-which implements current and anticipated web standards. Features include bookmark sync and custom search
-engines.
-
-N.B each version has several betas but only one of them is here. See the website for a link to the
-ftp site to get the latest, and a list of compatible devices. This version is for ARMv7 architectures
-only but the ftp server has versions that work on the more powerful ARMv6 devices.
-.
-
-Update Check Mode:Static
-
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
deleted file mode 100644
index 886bd0e50f..0000000000
--- a/metadata/org.swiftp.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Disabled:Superseded by be.ppareit...
-Category:Internet
-License:GPLv3+
-Web Site:http://code.google.com/p/swiftp/
-Source Code:http://code.google.com/p/swiftp/source/checkout
-Issue Tracker:http://code.google.com/p/swiftp/issues/list
-Donate:http://www.swiftp.org/donate.html
-
-Auto Name:SwiFTP
-Summary:FTP server
-Description:
-You need to access files on your phone, but you don't have a cable? This FTP server allows remote access
-to files on your SD card (or any files on the device, optionally, if you have root access). The author
-seems to have stopped developing it but it should still work fine.
-.
-
-Repo Type:svn
-Repo:http://swiftp.googlecode.com/svn/trunk/
-
-Auto Update Mode:None
-#Not in market
-Update Check Mode:Static
-Current Version:1.24
-Current Version Code:17
-
-#Can't build this version - see http://code.google.com/p/swiftp/issues/detail?id=128
-#Build Version:1.24,17,69,target=android-3
-#Can't build this version - res/values/strings.xml:117: error: Apostrophe not preceded by \
-#Build Version:1.23,15,66,target=android-3
diff --git a/metadata/pl.magot.vetch.ancal.txt b/metadata/pl.magot.vetch.ancal.txt
deleted file mode 100644
index 0d38833855..0000000000
--- a/metadata/pl.magot.vetch.ancal.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Disabled:2.5+ years of inactivity, better offline calendars available
-Category:Office
-License:MIT
-Web Site:http://code.google.com/p/ancal/
-Source Code:http://code.google.com/p/ancal/source/checkout
-Issue Tracker:http://code.google.com/p/ancal/issues/list
-
-Auto Name:AnCal
-Summary:Calendar
-Description:
-A calendar application that works offline. The application hasn't been updated
-in a while so your mileage may vary. There is a fork of this called Offline
-Calendar that has some usability improvements.
-.
-
-Repo Type:svn
-Repo:http://ancal.googlecode.com/svn/trunk/
-
-Build Version:1.6,32,23,fixtrans=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.6
-Current Version Code:32
-
diff --git a/metadata/ru.qrck.quitetaskmanager.txt b/metadata/ru.qrck.quitetaskmanager.txt
deleted file mode 100644
index aed139870d..0000000000
--- a/metadata/ru.qrck.quitetaskmanager.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Disabled:pre-alpha abandonware
-Category:System
-License:GPLv3
-Web Site:http://code.google.com/p/quitetaskmanager/
-Source Code:http://code.google.com/p/quitetaskmanager/source/checkout
-Issue Tracker:http://code.google.com/p/quitetaskmanager/issues/list
-
-Auto Name:QuiteTaskManager
-Summary:Lightweight task manager
-Description:
-Simple task/process manager with task kill support.
-.
-
-Repo Type:git-svn
-Repo:http://quitetaskmanager.googlecode.com/svn/trunk/
-
-Build Version:1.2,2,14
-
-Auto Update Mode:None
-#not in market
-Update Check Mode:Static
-Current Version:1.2
-Current Version Code:2
-
diff --git a/metadata/se.chalmers.doit.txt b/metadata/se.chalmers.doit.txt
deleted file mode 100644
index c278a6b6db..0000000000
--- a/metadata/se.chalmers.doit.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Disabled:Let's forget this one: alpha and probably won't get any more revisions
-Category:Office
-License:GPLv3
-Web Site:http://code.google.com/p/dat255-doit/
-Source Code:http://code.google.com/p/dat255-doit/source/checkout
-Issue Tracker:http://code.google.com/p/dat255-doit/issues/list
-
-Auto Name:doIT
-Summary:Todo lists
-Description:
-Create tasks and sort by due date or priority.
-.
-
-Repo Type:git-svn
-Repo:http://dat255-doit.googlecode.com/svn/trunk/
-
-Build Version:1.0,1,110,subdir=doIT,target=android-10,prebuild=rm -rf ./doIT.apk
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
-