diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index 0fe2be03d..90d9ff019 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -72,7 +72,6 @@ limitations under the License.
   <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="selected_track_id_key">selectedTrackId</string>
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="settings_backup_key">settingsBackup</string>
   <string name="settings_backup_reset_key">settingsBackupReset</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
index 74df002b0..344b09e19 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
@@ -156,7 +156,6 @@ public class TrackDataHub implements DataSourceListener {
           return;
         }
         selectedTrackId = trackId;
-        PreferencesUtils.setLong(context, R.string.selected_track_id_key, selectedTrackId);
         loadDataForAll();
       }
     });
@@ -259,17 +258,6 @@ public class TrackDataHub implements DataSourceListener {
     runInHanderThread(new Runnable() {
         @Override
       public void run() {
-        if (key == null
-            || key.equals(PreferencesUtils.getKey(context, R.string.selected_track_id_key))) {
-          long trackId = PreferencesUtils.getLong(context, R.string.selected_track_id_key);
-          boolean hasChanged = trackId != selectedTrackId;
-          selectedTrackId = trackId;
-          if (key != null) {
-            if (hasChanged) {
-              loadDataForAll();
-            }
-          }
-        }
         if (key == null
             || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_id_key))) {
           recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
index 6a39e4b08..62345cc0f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java
@@ -61,7 +61,6 @@ public class PreferenceBackupHelper {
     doNotBackup.add(context.getString(R.string.google_account_key));
     doNotBackup.add(context.getString(R.string.recording_track_id_key));
     doNotBackup.add(context.getString(R.string.recording_track_paused_key));
-    doNotBackup.add(context.getString(R.string.selected_track_id_key));
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPath.java b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPath.java
index f79e15798..d28d12575 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPath.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPath.java
@@ -34,10 +34,10 @@ public interface TrackPath {
   /**
    * Updates state.
    * 
-   * @param tripstatistics the trip statistics
+   * @param tripStatistics the trip statistics
    * @return true if the state is updated.
    */
-  public boolean updateState(TripStatistics tripStatistrics);
+  public boolean updateState(TripStatistics tripStatistics);
 
   /**
    * Updates the path.
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
index 5c600f79a..f65bf7453 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
@@ -99,7 +99,6 @@ public class TrackDataHubTest extends AndroidTestCase {
     trackDataListener2 = AndroidMock.createStrictMock(
         "trackDataListener2", TrackDataListener.class);
     PreferencesUtils.setLong(context, R.string.recording_track_id_key, TRACK_ID);
-    PreferencesUtils.setLong(context, R.string.selected_track_id_key, TRACK_ID);
   }
 
   @Override
@@ -135,6 +134,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.TRACKS_TABLE));
     trackDataHub.registerTrackDataListener(
@@ -206,6 +206,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.WAYPOINTS_TABLE));
     trackDataHub.registerTrackDataListener(
@@ -281,6 +282,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
     verifyAndReset();
@@ -352,6 +354,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
     verifyAndReset();
@@ -402,6 +405,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
     verifyAndReset();
@@ -462,6 +466,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
     trackDataHub.registerTrackDataListener(trackDataListener2, EnumSet.of(
@@ -490,6 +495,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     replay();
 
     trackDataHub.start();
+    trackDataHub.loadTrack(TRACK_ID);
     trackDataHub.registerTrackDataListener(
         trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE));
     verifyAndReset();
@@ -809,20 +815,4 @@ public class TrackDataHubTest extends AndroidTestCase {
         .getKey(context, R.string.report_speed_key));
     assertEquals(!value, trackDataHub.isReportSpeed());
   }
-  
-  /**
-   * Tests the method {@link TrackDataHub#notifyPreferenceChanged(String)} when
-   * the key is R.string.selected_track_id_key and no listener is registered.
-   */
-  public void testNotifyPreferenceChanged_trackIdNoListener() {
-    long value = 1;
-    PreferencesUtils.setLong(context, R.string.selected_track_id_key, value);
-    trackDataHub.notifyPreferenceChanged(PreferencesUtils
-        .getKey(context, R.string.selected_track_id_key));
-    assertEquals(value, trackDataHub.getSelectedTrackId());
-    PreferencesUtils.setLong(context, R.string.selected_track_id_key, value + 1);
-    trackDataHub.notifyPreferenceChanged(PreferencesUtils
-        .getKey(context, R.string.selected_track_id_key));
-    assertEquals(value + 1, trackDataHub.getSelectedTrackId());
-  }
 }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
index 79ef9dfa0..54766dd2e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptorTest.java
@@ -78,8 +78,8 @@ public class DynamicSpeedTrackPathDescriptorTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link DynamicSpeedTrackPathDescriptor#updateState()} by different
-   * averageMovingSpeed.
+   * Tests {@link DynamicSpeedTrackPathDescriptor#updateState(com.google.android.apps.mytracks.stats.TripStatistics)}
+   * by different averageMovingSpeed.
    */
   public void testIsDiffereceSignificant() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(