diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
index d0b233bea..fa6d1c44d 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
@@ -472,12 +472,12 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
         return true;
       case R.id.track_list_export_all:
         FileTypeDialogFragment.newInstance(R.id.track_list_export_all,
-            R.string.export_all_title, R.string.export_all_option, 4)
+            R.string.export_all_title, R.string.export_all_option)
             .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
         return true;
       case R.id.track_list_import_all:
         FileTypeDialogFragment.newInstance(R.id.track_list_import_all,
-            R.string.import_selection_title, R.string.import_selection_option, 2)
+            R.string.import_selection_title, R.string.import_selection_option)
             .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
         return true;
       case R.id.track_list_delete_all:
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
index 97f1d8cfb..1c13aec02 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
@@ -52,15 +52,12 @@ public class FileTypeDialogFragment extends AbstractMyTracksDialogFragment {
   private static final String KEY_MENU_ID = "menuId";
   private static final String KEY_TITLE_ID = "titleId";
   private static final String KEY_OPTION_ID = "optionId";
-  private static final String KEY_SIZE = "size";
 
-  public static FileTypeDialogFragment newInstance(
-      int menuId, int titleId, int optionId, int size) {
+  public static FileTypeDialogFragment newInstance(int menuId, int titleId, int optionId) {
     Bundle bundle = new Bundle();
     bundle.putInt(KEY_MENU_ID, menuId);
     bundle.putInt(KEY_TITLE_ID, titleId);
     bundle.putInt(KEY_OPTION_ID, optionId);
-    bundle.putInt(KEY_SIZE, size);
 
     FileTypeDialogFragment fileTypeDialogFragment = new FileTypeDialogFragment();
     fileTypeDialogFragment.setArguments(bundle);
@@ -81,12 +78,11 @@ public class FileTypeDialogFragment extends AbstractMyTracksDialogFragment {
 
   @Override
   protected Dialog createDialog() {
-    int size = getArguments().getInt(KEY_SIZE);
     int optionId = getArguments().getInt(KEY_OPTION_ID);
     final int titleId = getArguments().getInt(KEY_TITLE_ID);
     final int menuId = getArguments().getInt(KEY_MENU_ID);
-    String[] choices = new String[size];
     TrackFileFormat[] trackFileFormats = TrackFileFormat.values();
+    String[] choices = new String[trackFileFormats.length];
     for (int i = 0; i < choices.length; i++) {
       TrackFileFormat trackFileFormat = trackFileFormats[i];
       choices[i] = getString(optionId, trackFileFormat.name(),