diff --git a/xwords4/android/XWords4-bt/.gitignore b/xwords4/android/XWords4-bt/.gitignore
deleted file mode 100644
index bfe74a058..000000000
--- a/xwords4/android/XWords4-bt/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.apk
-local.properties
-bin
-gen
-proguard.cfg
-proguard-project.txt
-obj
-res/drawable*/*gen.png
-img_src
diff --git a/xwords4/android/XWords4-bt/AndroidManifest.xml b/xwords4/android/XWords4-bt/AndroidManifest.xml
deleted file mode 100644
index 5171398ec..000000000
--- a/xwords4/android/XWords4-bt/AndroidManifest.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Declare the contents of this Android application.  The namespace
-     attribute brings in the Android platform namespace, and the package
-     supplies a unique name for the application.  When writing your
-     own application, the package name must be changed from "com.example.*"
-     to come from a domain that you own or have control over. -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.eehouse.android.xw4bt"
-          android:versionCode="82"
-          android:versionName="@string/app_version"
-          >
-
-  <!-- BE SURE TO MODIFY project.project AND the variable TARGET in
-       ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
-       -->
-  <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" />
-
-  <supports-screens android:resizeable="true"
-                    android:smallScreens="true"
-                    android:normalScreens="true"
-                    android:largeScreens="true"
-                    android:xlargeScreens="true"
-                    />
-
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  <uses-permission android:name="android.permission.VIBRATE" />
-  <uses-permission android:name="android.permission.RECEIVE_SMS" /> 
-  <uses-permission android:name="android.permission.SEND_SMS" />
-  <uses-permission android:name="android.permission.READ_SMS" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-  <uses-permission android:name="android.permission.READ_CONTACTS" />
-
-  <uses-feature android:name="android.hardware.telephony"
-                android:required = "false"
-                /> 
-  <uses-feature android:name="android.hardware.nfc" android:required="false" />
-
-  <!-- GCM stuff -->
-  <permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" 
-              android:protectionLevel="signature" />
-  <uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" /> 
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.NFC" />
-
-  <application android:icon="@drawable/icon48x48"
-               android:label="@string/app_name"
-               android:name=".XWApp"
-               >
-
-    <activity android:name="GamesListActivity" 
-              android:label="@string/app_name"
-              android:launchMode="standard"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="@string/xwords_nfc_mime" />
-      </intent-filter>
-
-    </activity>
-
-    <activity android:name="DictsActivity"
-              android:label="@string/title_dicts_list"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-          />
-    
-    <activity android:name="NewGameActivity"
-              android:theme="@android:style/Theme.NoTitleBar"
-              />
-    <activity android:name="BTInviteActivity"
-              android:theme="@android:style/Theme.Dialog"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-    <activity android:name="SMSInviteActivity"
-              android:theme="@android:style/Theme.Dialog"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              android:screenOrientation="sensor"
-              />
-
-    <activity android:name="GameConfigActivity"
-              android:screenOrientation="sensor"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              >
-      <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="PrefsActivity"
-              android:label="@string/title_prefs"
-              android:screenOrientation="sensor"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-
-    <activity android:name="BoardActivity"
-              android:screenOrientation="portrait"
-              android:configChanges="keyboardHidden"
-              />
-
-    <activity android:name="StudyListActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-
-    <receiver android:name="OnBootReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED"/>
-      </intent-filter>
-    </receiver>
-    <receiver android:name="RelayReceiver"/>
-    <receiver android:name="NagTurnReceiver"/>
-
-    <receiver android:name="UpdateCheckReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED"/>
-      </intent-filter>
-    </receiver>
-
-    <activity android:name="DispatchNotify">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="newxwgame"/>
-      </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="http"
-              android:host="@string/invite_host"
-              android:pathPrefix="@string/invite_prefix"
-              />
-      </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="@string/invite_mime" />
-      </intent-filter>
-    </activity>
-
-    <!-- downloading dicts -->
-    <activity android:name=".DwnldActivity"
-              android:label="@string/app_name"
-              android:theme="@android:style/Theme.Dialog"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              >
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"></action>
-        <category android:name="android.intent.category.DEFAULT"></category>
-        <category android:name="android.intent.category.BROWSABLE"></category>
-        <data android:scheme="file" android:host="*" 
-              android:pathPattern=".*\\.xwd" />
-        <data android:scheme="http"
-              android:mimeType="application/x-xwordsdict"
-              android:host="*" 
-              android:pathPattern=".*\\.xwd" />
-      </intent-filter> 
-    </activity>
-
-    <activity android:name="RelayGameActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-    <activity android:name="DictBrowseActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-    <activity android:name="ChatActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-    <activity android:name=".loc.LocActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-    <activity android:name=".loc.LocItemEditActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
-
-    <service android:name="RelayService"/>
-
-    <receiver android:name=".MountEventReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.MEDIA_MOUNTED" />
-            <data android:scheme="file" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.MEDIA_EJECT" />
-            <data android:scheme="file" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name="BTReceiver">
-      <intent-filter>
-        <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
-      </intent-filter>
-    </receiver>
-
-    <service android:name="BTService"/>
-
-    <receiver android:name="SMSReceiver" >
-      <intent-filter android:priority="999" >
-        <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-      </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> 
-        <data android:scheme="sms" /> 
-        <data android:port="3344" /> 
-        <data android:host="*" /> 
-      </intent-filter> 
-
-    </receiver>
-
-    <service android:name="SMSService"/>
-
-    <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" 
-              android:permission="com.google.android.c2dm.permission.SEND" >
-      <intent-filter>
-        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-        <category android:name="org.eehouse.android.xw4" />
-      </intent-filter>
-    </receiver>
-
-    <service android:name=".GCMIntentService" />
-
-  </application>
-</manifest>
diff --git a/xwords4/android/XWords4-bt/archive/.gitignore b/xwords4/android/XWords4-bt/archive/.gitignore
deleted file mode 100644
index d91be1b56..000000000
--- a/xwords4/android/XWords4-bt/archive/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/R.java
diff --git a/xwords4/android/XWords4-bt/assets/.gitignore b/xwords4/android/XWords4-bt/assets/.gitignore
deleted file mode 100644
index 7926bc1b2..000000000
--- a/xwords4/android/XWords4-bt/assets/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-BasEnglish2to8.xwd
-CollegeEng_2to8.xwd
-Top5000.xwd
-changes.html
diff --git a/xwords4/android/XWords4-bt/build.xml b/xwords4/android/XWords4-bt/build.xml
deleted file mode 100644
index 7b07d8cb6..000000000
--- a/xwords4/android/XWords4-bt/build.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="XWords4" default="release">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <loadproperties srcFile="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         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 into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- An attempt to define stuff to be included from multiple build.xml files -->
-    <import file="../scripts/common_targets.xml" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
-            unless="sdk.dir"
-    />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-
-    <property name="INITIAL_CLIENT_VERS" value="4"/>
-    <property name="VARIANT_NAME" value="xw4bt"/>
-    <property name="APP_NAME" value="cWords-BT"/>
-
-    <target name="-pre-clean">
-        <antcall target="my-pre-clean" />
-    </target>
-
-    <target name="-pre-build" depends="my-copy-src">
-        <antcall target="my-pre-build" />
-    </target>
-
-    <target name="-pre-compile">
-        <antcall target="my-pre-compile" />
-    </target>
-
-<!--
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/xwords4/android/XWords4-bt/jni/.gitignore b/xwords4/android/XWords4-bt/jni/.gitignore
deleted file mode 100644
index 75d406707..000000000
--- a/xwords4/android/XWords4-bt/jni/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-anddict.c
-anddict.h
-andglobals.h
-andutils.c
-andutils.h
-drawwrapper.c
-drawwrapper.h
-jniutlswrapper.c
-jniutlswrapper.h
-LocalizedStrIncludes.h
-paths.h
-utils.c
-utilwrapper.c
-utilwrapper.h
-xportwrapper.c
-xportwrapper.h
-xptypes.h
-xwjni.c
-#paths.h#
-Application.mk
diff --git a/xwords4/android/XWords4-bt/jni/Android.mk b/xwords4/android/XWords4-bt/jni/Android.mk
deleted file mode 100644
index 97e4f4bd2..000000000
--- a/xwords4/android/XWords4-bt/jni/Android.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-COMMON_PATH=../../../common
-LOCAL_C_INCLUDES+= \
-	-I$(LOCAL_PATH)/$(COMMON_PATH) \
-	-I$(LOCAL_PATH)/../../../relay \
-
-LOCAL_LDLIBS += -llog
-
-ifeq ($(BUILD_TARGET),debug)
-	LOCAL_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
-endif
-LOCAL_DEFINES += \
-	$(LOCAL_DEBUG) \
-	-DXWFEATURE_RELAY \
-	-DXWFEATURE_BLUETOOTH \
-	-DXWFEATURE_SMS \
-	-DXWFEATURE_COMMSACK \
-	-DXWFEATURE_TURNCHANGENOTIFY \
-	-DCOMMS_XPORT_FLAGSPROC \
-	-DKEY_SUPPORT \
-	-DXWFEATURE_CROSSHAIRS \
-	-DPOINTER_SUPPORT \
-	-DSCROLL_DRAG_THRESHHOLD=1 \
-	-DDROP_BITMAPS \
-	-DXWFEATURE_TRAYUNDO_ONE \
-	-DDISABLE_TILE_SEL \
-	-DXWFEATURE_BOARDWORDS \
-	-DXWFEATURE_WALKDICT \
-	-DXWFEATURE_WALKDICT_FILTER \
-	-DXWFEATURE_DICTSANITY \
-	-DFEATURE_TRAY_EDIT \
-	-DXWFEATURE_BONUSALL \
-	-DMAX_ROWS=32 \
-	-DHASH_STREAM \
-	-DXWFEATURE_BASE64 \
-	-DXWFEATURE_DEVID \
-	-DCOMMON_LAYOUT \
-	-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
-	-DRELAY_ROOM_DEFAULT=\"\" \
-	-D__LITTLE_ENDIAN \
-
-ifeq ($(CHAT_ENABLED),true)
-	LOCAL_DEFINES += -DXWFEATURE_CHAT
-endif
-
-#	-DXWFEATURE_SCOREONEPASS \
-
-LOCAL_SRC_FILES +=         \
-	xwjni.c                \
-	utilwrapper.c          \
-	drawwrapper.c          \
-	xportwrapper.c         \
-	anddict.c              \
-	andutils.c             \
-	jniutlswrapper.c       \
-
-
-COMMON_PATH=../../../common
-COMMON_SRC_FILES +=        \
-	$(COMMON_PATH)/boarddrw.c   \
-	$(COMMON_PATH)/scorebdp.c   \
-	$(COMMON_PATH)/dragdrpp.c   \
-	$(COMMON_PATH)/pool.c       \
-	$(COMMON_PATH)/tray.c       \
-	$(COMMON_PATH)/dictnry.c    \
-	$(COMMON_PATH)/dictiter.c   \
-	$(COMMON_PATH)/dictmgr.c    \
-	$(COMMON_PATH)/mscore.c     \
-	$(COMMON_PATH)/vtabmgr.c    \
-	$(COMMON_PATH)/strutils.c   \
-	$(COMMON_PATH)/engine.c     \
-	$(COMMON_PATH)/board.c      \
-	$(COMMON_PATH)/mempool.c    \
-	$(COMMON_PATH)/game.c       \
-	$(COMMON_PATH)/server.c     \
-	$(COMMON_PATH)/model.c      \
-	$(COMMON_PATH)/comms.c      \
-	$(COMMON_PATH)/memstream.c  \
-	$(COMMON_PATH)/movestak.c   \
-	$(COMMON_PATH)/dbgutil.c    \
-
-
-LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES) -Wall
-LOCAL_SRC_FILES := $(linux_SRC_FILES) $(LOCAL_SRC_FILES) $(COMMON_SRC_FILES)
-LOCAL_MODULE    := xwjni
-LOCAL_LDLIBS 	:= -L${SYSROOT}/usr/lib -llog -lz 
-
-include $(BUILD_SHARED_LIBRARY)
-
-ifneq ($(shell which ccache),)
-	TARGET_CC = ccache $(TOOLCHAIN_PREFIX)gcc
-	TARGET_CXX = ccache $(TOOLCHAIN_PREFIX)g++
-endif
-
-COMMON_SRC_FILES :=
-COMMON_PATH :=
diff --git a/xwords4/android/XWords4-bt/libs/.gitignore b/xwords4/android/XWords4-bt/libs/.gitignore
deleted file mode 100644
index 4cfb66f3f..000000000
--- a/xwords4/android/XWords4-bt/libs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-armeabi
-x86
-gcm.jar
-android-support-v13.jar
diff --git a/xwords4/android/XWords4-bt/project.properties b/xwords4/android/XWords4-bt/project.properties
deleted file mode 100644
index 4bcb2f55c..000000000
--- a/xwords4/android/XWords4-bt/project.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,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=Google Inc.:Google APIs:14
diff --git a/xwords4/android/XWords4-bt/res/drawable-hdpi/.gitignore b/xwords4/android/XWords4-bt/res/drawable-hdpi/.gitignore
deleted file mode 100644
index e69955751..000000000
--- a/xwords4/android/XWords4-bt/res/drawable-hdpi/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-back__gen.png
-content_discard__gen.png
-content_edit.png
-content_new__gen.png
-dict__gen.png
-down__gen.png
-download__gen.png
-edit__gen.png
-email__gen.png
-new_group__gen.png
-prefs__gen.png
-relabel__gen.png
-reset__gen.png
-save__gen.png
-send__gen.png
-up__gen.png
-content_copy__gen.png
-clear_all__gen.png
-search__gen.png
-select_all__gen.png
diff --git a/xwords4/android/XWords4-bt/res/drawable-mdpi/.gitignore b/xwords4/android/XWords4-bt/res/drawable-mdpi/.gitignore
deleted file mode 100644
index e69955751..000000000
--- a/xwords4/android/XWords4-bt/res/drawable-mdpi/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-back__gen.png
-content_discard__gen.png
-content_edit.png
-content_new__gen.png
-dict__gen.png
-down__gen.png
-download__gen.png
-edit__gen.png
-email__gen.png
-new_group__gen.png
-prefs__gen.png
-relabel__gen.png
-reset__gen.png
-save__gen.png
-send__gen.png
-up__gen.png
-content_copy__gen.png
-clear_all__gen.png
-search__gen.png
-select_all__gen.png
diff --git a/xwords4/android/XWords4-bt/res/drawable-xhdpi/.gitignore b/xwords4/android/XWords4-bt/res/drawable-xhdpi/.gitignore
deleted file mode 100644
index e69955751..000000000
--- a/xwords4/android/XWords4-bt/res/drawable-xhdpi/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-back__gen.png
-content_discard__gen.png
-content_edit.png
-content_new__gen.png
-dict__gen.png
-down__gen.png
-download__gen.png
-edit__gen.png
-email__gen.png
-new_group__gen.png
-prefs__gen.png
-relabel__gen.png
-reset__gen.png
-save__gen.png
-send__gen.png
-up__gen.png
-content_copy__gen.png
-clear_all__gen.png
-search__gen.png
-select_all__gen.png
diff --git a/xwords4/android/XWords4-bt/res/drawable/.gitignore b/xwords4/android/XWords4-bt/res/drawable/.gitignore
deleted file mode 100644
index d2643c9a8..000000000
--- a/xwords4/android/XWords4-bt/res/drawable/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-bluetooth_active.png
-bluetooth_disabled.png
-dicticon.png
-downarrow.png
-expander_ic_maximized.9.png
-expander_ic_minimized.9.png
-flip.png
-icon48x48.png
-ic_popup_sync_1.png
-netarrow_allconn.png
-netarrow_someconn.png
-netarrow_unconn.png
-next_hint.png
-origin.png
-prev_hint.png
-refresh.png
-relaygame.png
-rightarrow.png
-shuffle.png
-sologame.png
-stat_notify_chat.png
-stat_notify_sync.png
-undo.png
-values.png
-zoom.png
-in_arrow_active.png
-in_arrow.png
-out_arrow_active.png
-out_arrow.png
diff --git a/xwords4/android/XWords4-bt/res/layout-small/.gitignore b/xwords4/android/XWords4-bt/res/layout-small/.gitignore
deleted file mode 100644
index 060ef29f7..000000000
--- a/xwords4/android/XWords4-bt/res/layout-small/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-board.xml
diff --git a/xwords4/android/XWords4-bt/res/layout/.gitignore b/xwords4/android/XWords4-bt/res/layout/.gitignore
deleted file mode 100644
index 195d912c8..000000000
--- a/xwords4/android/XWords4-bt/res/layout/.gitignore
+++ /dev/null
@@ -1,42 +0,0 @@
-about_dlg.xml
-board.xml
-btinviter_item.xml
-btinviter_item.xml.~1~
-btinviter.xml
-chat_history_local.xml
-chat_history_remote.xml
-chat.xml
-color_display.xml
-color_edit.xml
-dflt_name.xml
-dict_browser.xml
-dict_browse.xml
-divider_view.xml
-force_remote.xml
-game_config.xml
-game_list_item.xml
-game_list.xml
-import_dict.xml
-list_item.xml
-lookup.xml
-new_game.xml
-passwd_view.xml
-player_edit.xml
-player_list_elem.xml
-prefs_w_buttons.xml
-relay_game_config.xml
-rename_game.xml
-select_dialog_item.xml
-smsinviter_item.xml
-smsinviter.xml
-confirm_sms.xml
-game_list_group.xml
-studylist.xml
-loc_list_item.xml
-loc_main.xml
-import_dict_item.xml
-list_group.xml
-loc_item_edit.xml
-remote_dict_details.xml
-toolbar.xml
-expander_header.xml
diff --git a/xwords4/android/XWords4-bt/res/menu-small/.gitignore b/xwords4/android/XWords4-bt/res/menu-small/.gitignore
deleted file mode 100644
index 275932284..000000000
--- a/xwords4/android/XWords4-bt/res/menu-small/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-board_menu.xml
diff --git a/xwords4/android/XWords4-bt/res/menu/.gitignore b/xwords4/android/XWords4-bt/res/menu/.gitignore
deleted file mode 100644
index d53bc34bc..000000000
--- a/xwords4/android/XWords4-bt/res/menu/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-board_menu.xml
-chat_menu.xml
-dicts_item_menu.xml
-games_list_item_menu.xml
-games_list_menu.xml
-dicts_menu.xml
-studylist.xml
-loc_menu.xml
-empty.xml
-loc_item_menu.xml
diff --git a/xwords4/android/XWords4-bt/res/raw/.gitignore b/xwords4/android/XWords4-bt/res/raw/.gitignore
deleted file mode 100644
index 5c56af15d..000000000
--- a/xwords4/android/XWords4-bt/res/raw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-changes
diff --git a/xwords4/android/XWords4-bt/res/values-ca/.gitignore b/xwords4/android/XWords4-bt/res/values-ca/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-bt/res/values-ca/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-bt/res/values-cs/.gitignore b/xwords4/android/XWords4-bt/res/values-cs/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-bt/res/values-cs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-bt/res/values-large/.gitignore b/xwords4/android/XWords4-bt/res/values-large/.gitignore
deleted file mode 100644
index 684760d58..000000000
--- a/xwords4/android/XWords4-bt/res/values-large/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-styles.xml
diff --git a/xwords4/android/XWords4-bt/res/values-pt/.gitignore b/xwords4/android/XWords4-bt/res/values-pt/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-bt/res/values-pt/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-bt/res/values-sk/.gitignore b/xwords4/android/XWords4-bt/res/values-sk/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-bt/res/values-sk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-bt/res/values/.gitignore b/xwords4/android/XWords4-bt/res/values/.gitignore
deleted file mode 100644
index 72e6f3e45..000000000
--- a/xwords4/android/XWords4-bt/res/values/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-git_string.xml
-strings.xml
-styles.xml
-common_rsrc.xml
diff --git a/xwords4/android/XWords4-bt/res/values/app_name.xml b/xwords4/android/XWords4-bt/res/values/app_name.xml
deleted file mode 100644
index df8964efd..000000000
--- a/xwords4/android/XWords4-bt/res/values/app_name.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-  <string name="app_version">4.4-bt beta 89</string>
-</resources>
diff --git a/xwords4/android/XWords4-bt/res/xml/.gitignore b/xwords4/android/XWords4-bt/res/xml/.gitignore
deleted file mode 100644
index df69711b0..000000000
--- a/xwords4/android/XWords4-bt/res/xml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-xwprefs.xml
diff --git a/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore b/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore
deleted file mode 100644
index 1e28ff4b4..000000000
--- a/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/strings.xml
diff --git a/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore b/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore
deleted file mode 100644
index 1e28ff4b4..000000000
--- a/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/strings.xml
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore
deleted file mode 100644
index 38135d923..000000000
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore
+++ /dev/null
@@ -1,116 +0,0 @@
-BoardActivity.java
-BoardDims.java
-BoardView.java
-BTInviteActivity.java
-BTReceiver.java
-BTService.java
-ChatActivity.java
-CommsTransport.java
-DbgUtils.java
-DBHelper.java
-DBUtils.java
-DictBrowseActivity.java
-DictImportActivity.java
-DictLangCache.java
-DictListPreference.java
-DictsActivity.java
-DictUtils.java
-DispatchNotify.java
-DlgDelegate.java
-EditColorPreference.java
-FirstRunDialog.java
-GameConfig.java
-GameListAdapter.java
-GamesList.java
-GameUtils.java
-GitVersion.java
-MountEventReceiver.java
-MultiMsgSink.java
-NetLaunchInfo.java
-NetStateCache.java
-NetUtils.java
-NewGameActivity.java
-PollListPreference.java
-PrefsActivity.java
-RefreshNamesTask.java
-RelayGameActivity.java
-RelayMsgSink.java
-RelayReceiver.java
-RelayService.java
-StatusReceiver.java
-Toolbar.java
-Utils.java
-XWActivity.java
-XWConstants.java
-XWEditTextPreference.java
-XWListActivity.java
-XWListAdapter.java
-XWListItem.java
-XWListPreference.java
-GameNamer.java
-LookupActivity.java
-InviteActivity.java
-SMSInviteActivity.java
-SMSListItem.java
-SMSReceiver.java
-SMSService.java
-MultiService.java
-ABUtils.java
-BoardCanvas.java
-BuildConstants.java
-ConnStatusHandler.java
-DlgState.java
-ExpiringDelegate.java
-ExpiringLinearLayout.java
-ExpiringTextView.java
-GameListGroup.java
-GameListItem.java
-GameLock.java
-GCMConsts.java
-GCMIntentService.java
-NFCUtils.java
-SelectableItem.java
-SMSCheckBoxPreference.java
-ThumbCanvas.java
-UpdateCheckReceiver.java
-XWExpandableListActivity.java
-XWPrefs.java
-XWService.java
-XWSumListPreference.java
-XWThumbListPreference.java
-StudyList.java
-CrashTrack.java
-DelegateBase.java
-DlgID.java
-GamesListActivity.java
-GamesListDelegate.java
-LookupAlert.java
-BoardDelegate.java
-BTInviteDelegate.java
-ChatDelegate.java
-DictBrowseDelegate.java
-DictImportDelegate.java
-DictsDelegate.java
-DrawSelDelegate.java
-GameConfigActivity.java
-GameConfigDelegate.java
-InviteDelegate.java
-ListDelegateBase.java
-NewGameDelegate.java
-PrefsDelegate.java
-RelayGameDelegate.java
-SMSInviteDelegate.java
-StudyListActivity.java
-StudyListDelegate.java
-DwnldActivity.java
-DwnldDelegate.java
-GroupStateListener.java
-ListGroup.java
-XWExpListAdapter.java
-Delegator.java
-ListDelegator.java
-NagTurnReceiver.java
-OnBootReceiver.java
-HeaderWithExpander.java
-AbsLaunchInfo.java
-BTLaunchInfo.java
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
deleted file mode 100644
index 1f492f6b5..000000000
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
-/*
- * Copyright 2010 - 2011 by Eric House (xwords@eehouse.org).  All
- * rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package org.eehouse.android.xw4bt;
-
-import android.app.Application;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.preference.PreferenceManager;
-
-import java.util.UUID;
-
-import org.eehouse.android.xw4bt.jni.XwJNI;
-
-public class XWApp extends Application {
-
-    public static final boolean BTSUPPORTED = true;
-    public static final boolean SMSSUPPORTED = true;
-    public static final boolean GCMSUPPORTED = true;
-    public static final boolean ATTACH_SUPPORTED = true;
-    public static final boolean REMATCH_SUPPORTED = false;
-    public static final boolean DEBUG_LOCKS = false;
-    public static final boolean DEBUG_EXP_TIMERS = false;
-    public static final boolean GCM_IGNORED = false;
-    public static final boolean UDP_ENABLED = true;
-    
-    public static final String SMS_PUBLIC_HEADER = "-XW4";
-    public static final int MAX_TRAY_TILES = 7; // comtypes.h
-    public static final int SEL_COLOR = Color.argb( 0xFF, 0x09, 0x70, 0x93 );
-
-    private static UUID s_UUID = null;
-    private static Boolean s_onEmulator = null;
-
-    @Override
-    public void onCreate()
-    {
-        super.onCreate();
-
-        // This one line should always get logged even if logging is
-        // off -- because logging is on by default until logEnable is
-        // called.
-        DbgUtils.logf( "XWApp.onCreate(); git_rev=%s", 
-                       getString( R.string.git_rev ) );
-        DbgUtils.logEnable( this );
-
-        ConnStatusHandler.loadState( this );
-
-        OnBootReceiver.startTimers( this );
-
-        boolean mustCheck = Utils.firstBootThisVersion( this );
-        PreferenceManager.setDefaultValues( this, R.xml.xwprefs, mustCheck );
-        if ( mustCheck ) {
-            XWPrefs.setHaveCheckedUpgrades( this, false );
-        } else {
-            mustCheck = ! XWPrefs.getHaveCheckedUpgrades( this );
-        }
-        if ( mustCheck ) {
-            UpdateCheckReceiver.checkVersions( this, false );
-        }
-        UpdateCheckReceiver.restartTimer( this );
-
-        BTService.startService( this );
-        SMSService.checkForInvites( this );
-        RelayService.startService( this );
-        GCMIntentService.init( this );
-    }
-
-    // This is called on emulator only, but good for ensuring no memory leaks
-    // by forcing JNI cleanup
-    public void onTerminate()
-    {
-        DbgUtils.logf( "XwApp.onTerminate() called" );
-        XwJNI.cleanGlobals();
-        super.onTerminate();
-    }
-
-    public static UUID getAppUUID()
-    {
-        if ( null == s_UUID ) {
-            s_UUID = UUID.fromString( XwJNI.comms_getUUID() );
-        }
-        return s_UUID;
-    }
-
-    public static String getAppName( Context context ) 
-    {
-        return context.getString( R.string.app_name );
-    }
-
-    public static boolean onEmulator()
-    {
-        if ( null == s_onEmulator ) {
-            s_onEmulator = new Boolean( "google_sdk".equals(Build.MODEL) );
-        }
-        return s_onEmulator;
-    }
-}
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/jni/.gitignore b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/jni/.gitignore
deleted file mode 100644
index 025de6a24..000000000
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/jni/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-BoardHandler.java
-CommonPrefs.java
-CommsAddrRec.java
-CurGameInfo.java
-DictInfo.java
-DrawCtx.java
-DrawScoreInfo.java
-GameSummary.java
-JNIThread.java
-JNIUtilsImpl.java
-JNIUtils.java
-LocalPlayer.java
-SyncedDraw.java
-TransportProcs.java
-UtilCtxtImpl.java
-UtilCtxt.java
-XwJNI.java
-BoardDims.java
-LastMoveInfo.java
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore
deleted file mode 100644
index 44aa43b28..000000000
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-LocActivity.java
-LocDelegate.java
-LocIDsData.java
-LocIDs.java
-LocListAdapter.java
-LocListItem.java
-LocSearcher.java
-LocUtils.java
-XlatingSpinnerAdapter.java
-LocItemEditActivity.java
-LocItemEditDelegate.java