diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
index e98ad1a47..af8f92ebe 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
@@ -84,8 +84,7 @@ public class GameListAdapter implements ExpandableListAdapter {
             // Then copy in what's left
             Iterator<Long> iter = unused.iterator();
             while ( iter.hasNext() ) {
-                long id = iter.next();
-                newArray[nextIndx++] = id;
+                newArray[nextIndx++] = iter.next();
             }
             m_positions = newArray;
         }
@@ -317,14 +316,15 @@ public class GameListAdapter implements ExpandableListAdapter {
     
     public int getGroupPosition( long groupid )
     {
-        int pos = -1;
+        int result = -1;
         long[] positions = getPositions();
-        for ( pos = 0; pos < positions.length; ++pos ) {
+        for ( int pos = 0; pos < positions.length; ++pos ) {
             if ( positions[pos] == groupid ) {
+                result = pos;
                 break;
             }
         }
-        return pos;
+        return result;
     }
 
     public boolean setField( String fieldName )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
index d3d02f534..1f0790181 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
@@ -33,7 +33,7 @@ public class XWApp extends Application {
     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 = true;
+    public static final boolean DEBUG = false;
     public static final boolean DEBUG_LOCKS = false && DEBUG;
     public static final boolean DEBUG_EXP_TIMERS = false && DEBUG;
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWExpandableListActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWExpandableListActivity.java
index b20e29c87..c4fb9c18b 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWExpandableListActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWExpandableListActivity.java
@@ -1,6 +1,6 @@
 /* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
 /*
- * Copyright 2010 - 2011 by Eric House (xwords@eehouse.org).  All
+ * Copyright 2010 - 2012 by Eric House (xwords@eehouse.org).  All
  * rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -103,11 +103,6 @@ public class XWExpandableListActivity extends ExpandableListActivity
         m_delegate.showConfirmThen( msg, action );
     }
 
-    protected void showConfirmThen( int msg, int action )
-    {
-        showConfirmThen( getString(msg), action );
-    }
-
     protected void showConfirmThen( String msg, int posButton, int action )
     {
         m_delegate.showConfirmThen( msg, posButton, action );
@@ -118,18 +113,12 @@ public class XWExpandableListActivity extends ExpandableListActivity
         m_delegate.showConfirmThen( getString(msg), posButton, action );
     }
 
-    // protected void showConfirmThen( String msg, int action )
-    // {
-    //     m_delegate.showConfirmThen( msg, action );
-    // }
-
     // DlgDelegate.DlgClickNotify interface
     public void dlgButtonClicked( int id, int which )
     {
         Assert.fail();
     }
 
-
     // BTService.BTEventListener interface
     public void eventOccurred( MultiService.MultiEvent event, 
                                final Object ... args )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
index 39858aade..29c3ebdb0 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
@@ -292,7 +292,7 @@ public class JNIThread extends Thread {
         }
         byte[] state = XwJNI.game_saveToStream( m_jniGamePtr, m_gi );
         if ( Arrays.equals( m_gameAtStart, state ) ) {
-            DbgUtils.logf( "no change in game; can skip saving" );
+            // DbgUtils.logf( "no change in game; can skip saving" );
         } else {
             GameSummary summary = new GameSummary( m_context, m_gi );
             XwJNI.game_summarize( m_jniGamePtr, summary );