diff --git a/xwords4/android/XWords4-dbg/.gitignore b/xwords4/android/XWords4-dbg/.gitignore
deleted file mode 100644
index 0681338cd..000000000
--- a/xwords4/android/XWords4-dbg/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.apk
-ant_out.txt
-local.properties
-bin
-gen
-proguard.cfg
-obj
diff --git a/xwords4/android/XWords4-dbg/archive/.gitignore b/xwords4/android/XWords4-dbg/archive/.gitignore
deleted file mode 100644
index d91be1b56..000000000
--- a/xwords4/android/XWords4-dbg/archive/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/R.java
diff --git a/xwords4/android/XWords4-dbg/assets/.gitignore b/xwords4/android/XWords4-dbg/assets/.gitignore
deleted file mode 100644
index 7ea20678c..000000000
--- a/xwords4/android/XWords4-dbg/assets/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-BasEnglish2to8.xwd
-CollegeEng_2to8.xwd
-Top5000.xwd
-changes.html
-gitvers.txt
diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
deleted file mode 100644
index dfc0150f1..000000000
--- a/xwords4/android/XWords4-dbg/build.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="XWords4" default="release">
-
-    <!-- eeh: allow ant files to refer e.g. to ${env.HOME} -->
-    <property environment="env" />
-
-    <!-- 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="8"/>
-    <property name="VARIANT_NAME" value="xw4dbg"/>
-    <property name="APP_NAME" value="CrossDbg"/>
-    <property name="WIDIR_ENABLED" value="true" />
-
-    <target name="-pre-clean">
-        <antcall target="my-pre-clean" />
-    </target>
-
-    <target name="-pre-build" depends="my-copy-src, my-check-props">
-        <antcall target="my-pre-build">
-            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
-            <param name="APP_NAME" value="${APP_NAME}"/>
-        </antcall>
-    </target>
-
-    <target name="-pre-compile">
-        <antcall target="my-pre-compile">
-            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
-        </antcall>
-    </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-dbg/img_src/.gitignore b/xwords4/android/XWords4-dbg/img_src/.gitignore
deleted file mode 100644
index 177ab2ad1..000000000
--- a/xwords4/android/XWords4-dbg/img_src/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/clear_all.svg
-/search.svg
-/select_all.svg
-back.svg
-content_copy.svg
-content_discard.svg
-content_new.svg
-dict.svg
-down.svg
-download.svg
-email.svg
-new_group.svg
-prefs.svg
-relabel.svg
-reset.svg
-save.svg
-send.svg
-up.svg
-clear_all.svg
-search.svg
-select_all.svg
-content_new_net.svg
-content_new_solo.svg
-multigame.svg
-sologame.svg
diff --git a/xwords4/android/XWords4-dbg/jni/.gitignore b/xwords4/android/XWords4-dbg/jni/.gitignore
deleted file mode 100644
index 1c7bf1313..000000000
--- a/xwords4/android/XWords4-dbg/jni/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-anddict.c
-anddict.h
-andglobals.h
-Android.mk
-andutils.c
-andutils.h
-drawwrapper.c
-drawwrapper.h
-jniutlswrapper.c
-jniutlswrapper.h
-LocalizedStrIncludes.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-dbg/libs/.gitignore b/xwords4/android/XWords4-dbg/libs/.gitignore
deleted file mode 100644
index 655bd701c..000000000
--- a/xwords4/android/XWords4-dbg/libs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-gcm.jar
-armeabi
-x86
-android-support-v13.jar
diff --git a/xwords4/android/XWords4-dbg/libs/crittercism_v5_5_5_sdkonly.jar b/xwords4/android/XWords4-dbg/libs/crittercism_v5_5_5_sdkonly.jar
deleted file mode 100644
index d306fa0d1..000000000
Binary files a/xwords4/android/XWords4-dbg/libs/crittercism_v5_5_5_sdkonly.jar and /dev/null differ
diff --git a/xwords4/android/XWords4-dbg/proguard-project.txt b/xwords4/android/XWords4-dbg/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/xwords4/android/XWords4-dbg/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/xwords4/android/XWords4-dbg/project.properties b/xwords4/android/XWords4-dbg/project.properties
deleted file mode 100644
index 19c32e635..000000000
--- a/xwords4/android/XWords4-dbg/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=android-23
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore
deleted file mode 100644
index aa5ea40dd..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/strings.xml
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ca/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ca/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-ca/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore
deleted file mode 100644
index aa5ea40dd..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/strings.xml
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-cs/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-cs/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-cs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-fr/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-fr/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-fr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ja/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ja/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-ja/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-nl/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-nl/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-nl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-pt/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-pt/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-pt/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-sk/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-sk/.gitignore
deleted file mode 100644
index be5186f01..000000000
--- a/xwords4/android/XWords4-dbg/res_src/values-sk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-strings.xml
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
deleted file mode 100644
index 000c39a92..000000000
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
+++ /dev/null
@@ -1,148 +0,0 @@
-/DlgID.java
-/LookupAlert.java
-ABUtils.java
-BTInviteActivity.java
-BTReceiver.java
-BTService.java
-BoardActivity.java
-BoardCanvas.java
-BoardDims.java
-BoardView.java
-BuildConstants.java
-ChatActivity.java
-CommsTransport.java
-ConnStatusHandler.java
-DBHelper.java
-DBUtils.java
-DbgUtils.java
-DictBrowseActivity.java
-DictImportActivity.java
-DictLangCache.java
-DictListPreference.java
-DictUtils.java
-DictsActivity.java
-DispatchNotify.java
-DlgDelegate.java
-DlgState.java
-EditColorPreference.java
-ExpiringDelegate.java
-ExpiringLinearLayout.java
-ExpiringTextView.java
-FirstRunDialog.java
-GCMConsts.java
-GCMIntentService.java
-GameConfig.java
-GameListAdapter.java
-GameListGroup.java
-GameListItem.java
-GameLock.java
-GameNamer.java
-GameUtils.java
-GamesList.java
-GitVersion.java
-InviteActivity.java
-LookupActivity.java
-MountEventReceiver.java
-MultiMsgSink.java
-MultiService.java
-NBSReceiver.java
-NFCUtils.java
-NetLaunchInfo.java
-NetStateCache.java
-NetUtils.java
-NewGameActivity.java
-PollListPreference.java
-PrefsActivity.java
-ReceiveNBS.java
-RefreshNamesTask.java
-RelayGameActivity.java
-RelayMsgSink.java
-RelayReceiver.java
-RelayService.java
-SMSCheckBoxPreference.java
-SMSInviteActivity.java
-SMSReceiver.java
-SMSService.java
-SelectableItem.java
-StatusReceiver.java
-StudyList.java
-ThumbCanvas.java
-Toolbar.java
-UpdateCheckReceiver.java
-Utils.java
-XWActivity.java
-XWApp.java
-XWConstants.java
-XWEditTextPreference.java
-XWExpandableListActivity.java
-XWListActivity.java
-XWListAdapter.java
-XWListItem.java
-XWListPreference.java
-XWPrefs.java
-XWService.java
-XWSumListPreference.java
-XWThumbListPreference.java
-DelegateBase.java
-DlgID.java
-GamesListDelegate.java
-LookupAlert.java
-BoardDelegate.java
-ChatDelegate.java
-DictBrowseDelegate.java
-DictImportDelegate.java
-DictsDelegate.java
-DrawSelDelegate.java
-GameConfigActivity.java
-GameConfigDelegate.java
-NewGameDelegate.java
-RelayGameDelegate.java
-StudyListActivity.java
-StudyListDelegate.java
-BTInviteDelegate.java
-InviteDelegate.java
-ListDelegateBase.java
-PrefsDelegate.java
-SMSInviteDelegate.java
-DwnldActivity.java
-DwnldDelegate.java
-GroupStateListener.java
-ListGroup.java
-ConnViaViewLayout.java
-Delegator.java
-DevID.java
-HeaderWithExpander.java
-LangListPreference.java
-ListDelegator.java
-NagTurnReceiver.java
-NotAgainView.java
-OnBootReceiver.java
-RelayInviteActivity.java
-RelayInviteDelegate.java
-XWConnAddrPreference.java
-XWDevIDPreference.java
-XWExpListAdapter.java
-RequestCode.java
-BoardFrag.java
-ChatFrag.java
-DictBrowseFrag.java
-FragActivity.java
-GameConfigFrag.java
-GamesListFrag.java
-Main.java
-nohup.out
-StudyListFrag.java
-XWFragment.java
-ConfirmingCheckBoxPreference.java
-RelayCheckBoxPreference.java
-MainActivity.java
-DictsFrag.java
-DualpaneDelegate.java
-BoardContainer.java
-BiDiSockWrap.java
-WiDirService.java
-WiDirInviteActivity.java
-WiDirInviteDelegate.java
-XWPacket.java
-TwoStrsItem.java
-Perms23.java
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore
deleted file mode 100644
index 025de6a24..000000000
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/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-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore
deleted file mode 100644
index a06b22eb8..000000000
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/LocItemEditActivity.java
-/LocItemEditDelegate.java
-LocActivity.java
-LocDelegate.java
-LocIDs.java
-LocIDsData.java
-LocListAdapter.java
-LocListItem.java
-LocSearcher.java
-LocUtils.java
-XlatingSpinnerAdapter.java
-LocItemEditActivity.java
-LocItemEditDelegate.java