diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 113636702..55390026f 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -141,7 +141,6 @@ limitations under the License.
     android:hardwareAccelerated="true"
     android:icon="@drawable/my_tracks_icon"
     android:label="@string/my_tracks_app_name"
-    android:name="com.google.android.apps.mytracks.MyTracksApplication"
     android:theme="@style/ThemeSelector" >
     <!-- For data backup -->
     <meta-data
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java
deleted file mode 100644
index 36d2043ff..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.services.RemoveTempFilesService;
-import com.google.android.apps.mytracks.util.ApiAdapterFactory;
-import com.google.android.maps.mytracks.BuildConfig;
-
-import android.app.Application;
-import android.content.Intent;
-
-/**
- * MyTracksApplication for keeping global state.
- * 
- * @author Jimmy Shih
- */
-public class MyTracksApplication extends Application {
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    if (BuildConfig.DEBUG) {
-      ApiAdapterFactory.getApiAdapter().enableStrictMode();
-    }
-    Intent intent = new Intent(this, RemoveTempFilesService.class);
-    startService(intent);
-  }
-}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 174928878..292aeb354 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -40,6 +40,7 @@ import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sync.SyncUtils;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
+import com.google.android.apps.mytracks.services.RemoveTempFilesService;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.settings.SettingsActivity;
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
@@ -55,6 +56,7 @@ import com.google.android.apps.mytracks.util.TrackIconUtils;
 import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.maps.mytracks.BuildConfig;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Dialog;
@@ -360,6 +362,13 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    
+    if (BuildConfig.DEBUG) {
+      ApiAdapterFactory.getApiAdapter().enableStrictMode();
+    }
+    Intent intent = new Intent(this, RemoveTempFilesService.class);
+    startService(intent);    
+    
     setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
     myTracksProviderUtils = MyTracksProviderUtils.Factory.get(this);