diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -248,24 +248,11 @@ public void init() {
 
         final boolean allowFormat = mVolume != null;
         if (allowFormat) {
-            // Resource IDs that are loaded appropriately based on the storage volume type
-            int titleResId = 0;
-            int summaryResId = 0;
-
-            if (mIsInternal && Environment.isExternalStorageEmulated()) {
-                titleResId = R.string.internal_sd_format;
-                summaryResId = R.string.internal_sd_format_summary;
-            } else if (mIsUsbStorage) {
-                titleResId = R.string.usb_sd_format;
-                summaryResId = R.string.usb_sd_format_summary;
-            } else {
-                titleResId = R.string.sd_sd_format;
-                summaryResId = R.string.sd_sd_format_summary;
-            }
-
             mFormatPreference = new Preference(context);
-            mFormatPreference.setTitle(titleResId);
-            mFormatPreference.setSummary(summaryResId);
+            mFormatPreference.setTitle(mIsUsbStorage ? R.string.usb_sd_format :
+                    R.string.sd_sd_format);
+            mFormatPreference.setSummary(mIsUsbStorage ? R.string.usb_sd_format_summary :
+                    R.string.sd_sd_format_summary);
             addPreference(mFormatPreference);
         }
 

diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -90,7 +90,6 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
         implements AdapterView.OnItemClickListener {
 
     private static final int RINGTONE_REQUEST_CODE = 1000;
-    private static final int NEW_TRIGGER_REQUEST_CODE = 1001;
 
     private static final int MENU_REMOVE = Menu.FIRST;
     private static final int MENU_FILL_PROFILE = Menu.FIRST + 1;
@@ -536,10 +535,6 @@ private void requestProfileRingMode() {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == NEW_TRIGGER_REQUEST_CODE) {
-            mProfile = mProfileManager.getProfile(mProfile.getUuid());
-            rebuildItemList();
-        }
     }
 
     private void requestRingModeDialog(final RingModeSettings setting) {
@@ -776,6 +771,6 @@ private void openTriggersFragment(int openTo) {
 
         SubSettings pa = (SubSettings) getActivity();
         pa.startPreferencePanel(SetupTriggersFragment.class.getCanonicalName(), args,
-                R.string.profile_profile_manage, null, this, NEW_TRIGGER_REQUEST_CODE);
+                R.string.profile_profile_manage, null, null, 0);
     }
 }