diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
index 7e9e552f4..c2f61c51a 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -98,8 +98,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
   // Preferences
   private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
   private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
-  private String sensorType = PreferencesUtils.SENSOR_TYPE_DEFAULT;
-  
+
   private MenuItem insertMarkerMenuItem;
   private MenuItem insertPhotoMenuItem;
   private MenuItem shareMenuItem;
@@ -152,11 +151,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
                 R.string.recording_track_paused_key,
                 PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
           }
-          if (key == null || key.equals(
-              PreferencesUtils.getKey(TrackDetailActivity.this, R.string.sensor_type_key))) {
-            sensorType = PreferencesUtils.getString(TrackDetailActivity.this,
-                R.string.sensor_type_key, PreferencesUtils.SENSOR_TYPE_DEFAULT);
-          }
           if (key != null) {
             runOnUiThread(new Runnable() {
                 @Override
@@ -519,7 +513,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
       splitFrequencyMenuItem.setVisible(isRecording);
     }    
     if (sensorStateMenuItem != null) {
-      sensorStateMenuItem.setVisible(!PreferencesUtils.SENSOR_TYPE_DEFAULT.equals(sensorType));
+      sensorStateMenuItem.setVisible(isRecording);
     }
 
     String title;
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java
index a07a2b2e9..8c384de86 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -79,7 +79,6 @@ public class PreferencesUtils {
   
   public static final long RECORDING_TRACK_ID_DEFAULT = -1L;
   public static final boolean RECORDING_TRACK_PAUSED_DEFAULT = true;
-  public static final String SENSOR_TYPE_DEFAULT = "NONE";
 
   public static final int SPLIT_FREQUENCY_DEFAULT = 0;
   
diff --git a/myTracks/src/main/res/values/keys.xml b/myTracks/src/main/res/values/keys.xml
index b953f078c..1cb9dda54 100644
--- a/myTracks/src/main/res/values/keys.xml
+++ b/myTracks/src/main/res/values/keys.xml
@@ -25,17 +25,12 @@ limitations under the License.
   <string name="chart_show_speed_key">chartShowSpeed</string>
   <string name="chart_x_axis_key">chartXAxis</string>
   <string name="default_activity_key">defaultActivity</string>
-  <string name="export_external_storage_format_key">exportExternalStorageFormat</string>
-  <string name="export_google_fusion_tables_public_key">exportGoogleFusionTablesPublic</string>
-  <string name="export_google_maps_public_key">exportGoogleMapsPublic</string>
-  <string name="export_type_key">exportType</string>
   <string name="map_type_key">mapType</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
   <string name="min_recording_interval_key">minRecordingInterval</string>
   <string name="photo_size_key">photoSize</string>
   <string name="recording_distance_interval_key">recordingDistanceInterval</string>
   <string name="recording_gps_accuracy_key">recordingGpsAccuracy</string>
-  <string name="sensor_type_key">sensorType</string>
   <string name="share_track_invite_key">shareTrackInvite</string>
   <string name="share_track_public_key">shareTrackPublic</string>
   <string name="split_frequency_key">splitFrequency</string>
@@ -55,28 +50,14 @@ limitations under the License.
   <string name="voice_frequency_key">voiceFrequency</string>
   <!-- Keys for persistend preferences. But they should not get backed up or restored. -->
   <string name="activity_recognition_type_key">activityRecognitionType</string>
-  <string name="ant_bike_cadence_sensor_id_key">antBikeCadenceSensorId</string>
-  <string name="ant_combined_bike_sensor_id_key">antCombinedBikeSensorId</string>
-  <string name="ant_heart_rate_monitor_id_key">antHeartRateMonitorId</string>
-  <string name="ant_speed_distance_monitor_id_key">antSpeedDistanceMonitorId</string>
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
   <string name="bluetooth_sensor_key">bluetoothSensor</string>
-  <string name="drive_deleted_list_key">driveDeletedList</string>
-  <string name="drive_edited_list_key">driveEditedList</string>
-  <string name="drive_largest_change_id_key">driveLargestChangeId</string>
-  <string name="drive_sync_key">driveSync</string>
-  <string name="google_account_key">googleAccount</string>
   <string name="recording_track_id_key">recordingTrackId</string>
   <string name="recording_track_paused_key">recordingTrackPaused</string>
   <string name="share_track_account_key">shareTrackAccountKey</string>
-  <string name="weight_key">weight</string>
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="settings_advanced_key">settingsAdvanced</string>
   <string name="settings_chart_key">settingsChart</string>
-  <string name="settings_map_key">settingsMap</string>
-  <string name="settings_map_medium_display_key">settingsMapMediumDisplay</string>
-  <string name="settings_map_percentage_display_key">settingsMapPercentageDisplay</string>
-  <string name="settings_map_slow_display_key">settingsMapSlowDisplay</string>
   <string name="settings_recording_key">settingsRecording</string>
   <string name="settings_reset_key">settingsReset</string>
   <string name="settings_sensor_key">settingsSensor</string>