diff --git a/clients/android/old-uploader/.gitignore b/clients/android/old-uploader/.gitignore
deleted file mode 100644
index 7b34ae85a..000000000
--- a/clients/android/old-uploader/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-gen
-*~
-local.properties
diff --git a/clients/android/old-uploader/AndroidManifest.xml b/clients/android/old-uploader/AndroidManifest.xml
deleted file mode 100644
index 81183f64c..000000000
--- a/clients/android/old-uploader/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.danga.camlistore.uploader"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="@string/app_name">
-        <activity android:name="ConfigActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
diff --git a/clients/android/old-uploader/build.properties b/clients/android/old-uploader/build.properties
deleted file mode 100644
index edc7f2305..000000000
--- a/clients/android/old-uploader/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/clients/android/old-uploader/build.xml b/clients/android/old-uploader/build.xml
deleted file mode 100644
index eb5d6501a..000000000
--- a/clients/android/old-uploader/build.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="CamliUpload" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source.dir
-             the name of the source directory. Default is 'src'.
-         out.dir
-             the name of the output directory. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
-
-         -->
-    <property file="build.properties" />
-
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
-
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
-
-         To customize some build steps for your project:
-         - copy the content of the main node <project> from android_rules.xml
-         - paste it in this build.xml below the <setup /> task.
-         - disable the import by changing the setup task below to <setup import="false" />
-
-         This will ensure that the properties are setup correctly but that your customized
-         build steps are used.
-    -->
-    <setup />
-
-</project>
diff --git a/clients/android/old-uploader/default.properties b/clients/android/old-uploader/default.properties
deleted file mode 100644
index 9d79b12c7..000000000
--- a/clients/android/old-uploader/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-4
diff --git a/clients/android/old-uploader/local.properties.template b/clients/android/old-uploader/local.properties.template
deleted file mode 100644
index 2d779674f..000000000
--- a/clients/android/old-uploader/local.properties.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copy this file to one named 'local.properties' in this directory to
-# build with Ant.
-sdk.dir=/home/YOU/sdk/android/
-#sdk.dir=/home/YOU/sdk/android/or/wherever/you/put/it
-
-
-
diff --git a/clients/android/old-uploader/res/layout/main.xml b/clients/android/old-uploader/res/layout/main.xml
deleted file mode 100644
index 348dc0faa..000000000
--- a/clients/android/old-uploader/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, ConfigActivity"
-    />
-</LinearLayout>
-
diff --git a/clients/android/old-uploader/res/values/strings.xml b/clients/android/old-uploader/res/values/strings.xml
deleted file mode 100644
index 57d9f4740..000000000
--- a/clients/android/old-uploader/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">ConfigActivity</string>
-</resources>
diff --git a/clients/android/old-uploader/src/com/danga/camlistore/uploader/ConfigActivity.java b/clients/android/old-uploader/src/com/danga/camlistore/uploader/ConfigActivity.java
deleted file mode 100644
index 06fe916d9..000000000
--- a/clients/android/old-uploader/src/com/danga/camlistore/uploader/ConfigActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.danga.camlistore.uploader;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class ConfigActivity extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}