diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index f030311..dd24c9f 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -68,9 +68,7 @@
     private static final String KEY_MODE = "mode";
 
     private static final int SUBACTIVITY_NEW_CONTACT = 2;
-    private static final int SUBACTIVITY_VIEW_CONTACT = 3;
-    private static final int SUBACTIVITY_DISPLAY_GROUP = 4;
-    private static final int SUBACTIVITY_SEARCH = 5;
+    private static final int SUBACTIVITY_DISPLAY_GROUP = 3;
 
     private DialogManager mDialogManager = new DialogManager(this);
 
@@ -686,17 +684,13 @@
                 break;
             }
 
-//            case SUBACTIVITY_VIEW_CONTACT:
-//                if (resultCode == RESULT_OK) {
-//                    mAdapter.notifyDataSetChanged();
-//                }
-//                break;
-//
-//            case SUBACTIVITY_DISPLAY_GROUP:
-//                // Mark as just created so we re-run the view query
-////                mJustCreated = true;
-//                break;
-//
+            case SUBACTIVITY_DISPLAY_GROUP:
+                // TODO: Force the ListFragment to reload its setting and update (don't lookup
+                // directories here)
+                break;
+
+            // TODO: Using the new startActivityWithResultFromFragment API this should not be needed
+            // anymore
             case ContactEntryListFragment.ACTIVITY_REQUEST_CODE_PICKER:
                 if (resultCode == RESULT_OK) {
                     mListFragment.onPickerResult(data);
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index ae63791..3ae2352 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -75,6 +75,8 @@
         implements OnItemClickListener, OnScrollListener, OnFocusChangeListener, OnTouchListener,
                 LoaderCallbacks<Cursor> {
 
+    // TODO: Make this protected. This should not be used from the ContactBrowserActivity but
+    // instead use the new startActivityWithResultFromFragment API
     public static final int ACTIVITY_REQUEST_CODE_PICKER = 1;
 
     private static final String TAG = "ContactEntryListFragment";
@@ -129,8 +131,8 @@
     private boolean mLoadDirectoryList;
 
     /**
-     * Indicates whether we are doing the initial complete load of data or
-     * a refresh caused by a change notification.
+     * Indicates whether we are doing the initial complete load of data (false) or
+     * a refresh caused by a change notification (true)
      */
     private boolean mLoadPriorityDirectoriesOnly;