diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index a0956c1e9..62e343375 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -2001,7 +2001,7 @@ public class BoardActivity extends XWActivity
             if ( post( new Runnable() {
                     public void run() {
                         m_blockingDlgID = dlgID;
-                        showDialog( dlgID );
+                        showDialog( dlgID.ordinal() );
                     }
                 } ) ) {
 
@@ -2044,7 +2044,7 @@ public class BoardActivity extends XWActivity
         m_dlgBytes = txt;
         post( new Runnable() {
                 public void run() {
-                    showDialog( dlgID );
+                    showDialog( dlgID.ordinal() );
                 }
             } );
     }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
index 972fa37c1..4bab8a9b3 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
@@ -108,10 +108,6 @@ public class DlgDelegate {
     public interface DlgClickNotify {
         void dlgButtonClicked( Action action, int button, Object[] params );
     }
-    public interface DlgClickRegisterer {
-        void registerClickNotify( DlgClickNotify cb );
-        void unregisterClickNotify( DlgClickNotify cb );
-    }
     public interface HasDlgDelegate {
         void showOKOnlyDialog( int msgID );
         void showOKOnlyDialog( String msg );
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyList.java
index 8315b3d0c..b64325901 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyList.java
@@ -212,14 +212,12 @@ public class StudyList extends XWListActivity
     public void itemClicked( SelectableItem.LongClickHandler clicked,
                              GameSummary summary )
     {
-        Assert.assertTrue( clicked instanceof XWListItem );
         m_checkeds.add( ((XWListItem)clicked).getPosition() );
     }
 
     public void itemToggled( SelectableItem.LongClickHandler toggled, 
                              boolean selected )
     {
-        Assert.assertTrue( toggled instanceof XWListItem );
         int position = ((XWListItem)toggled).getPosition();
         if ( selected ) {
             m_checkeds.add( position );
@@ -231,7 +229,6 @@ public class StudyList extends XWListActivity
 
     public boolean getSelected( SelectableItem.LongClickHandler obj )
     {
-        Assert.assertTrue( obj instanceof XWListItem );
         return m_checkeds.contains( ((XWListItem)obj).getPosition() );
     }
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
index f2b1e55bd..e4eca617f 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
@@ -102,11 +102,6 @@ public class XWActivity extends Activity
         return dialog;
     }
 
-    public void showDialog( DlgID dlgID )
-    {
-        super.showDialog( dlgID.ordinal() );
-    }
-
     // these are duplicated in XWListActivity -- sometimes multiple
     // inheritance would be nice to have...
     protected void showAboutDialog()
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListItem.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListItem.java
index a20f7535e..3e4273401 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListItem.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListItem.java
@@ -57,7 +57,6 @@ public class XWListItem extends LinearLayout
     {
         super.onFinishInflate();
         m_checkbox = (CheckBox)findViewById( R.id.checkbox );
-        Assert.assertNotNull( m_checkbox );
         m_checkbox.setOnClickListener( this );
     }