diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
index 04929fd02..68343c308 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java
@@ -35,7 +35,6 @@ import de.dennisguse.opentracks.content.data.Marker;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
 import de.dennisguse.opentracks.fragments.ChartFragment;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.IntervalsFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordedFragment;
@@ -44,8 +43,6 @@ import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.util.TrackUtils;
 
 /**
  * An activity to show the track detail, record a new track or resumes an existing one.
@@ -53,7 +50,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class TrackRecordedActivity extends AbstractListActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
+public class TrackRecordedActivity extends AbstractListActivity implements ConfirmDeleteDialogFragment.ConfirmDeleteCaller, TrackActivityDataHubInterface {
 
     private static final String TAG = TrackRecordedActivity.class.getSimpleName();
 
@@ -224,17 +221,6 @@ public class TrackRecordedActivity extends AbstractListActivity implements Choos
         }
     }
 
-    public void chooseActivityType(String category) {
-        ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category);
-    }
-
-    @Override
-    public void onChooseActivityTypeDone(String iconValue) {
-        String category = getString(TrackIconUtils.getIconActivityType(iconValue));
-        Track track = contentProviderUtils.getTrack(trackId);
-        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
-    }
-
     private class CustomFragmentPagerAdapter extends FragmentPagerAdapter {
 
         public CustomFragmentPagerAdapter(@NonNull FragmentManager fm, int behavior) {
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index 11bafbc7b..9905999e3 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -35,7 +35,6 @@ import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.util.TrackPointUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
@@ -59,8 +58,6 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
     private TrackStatistics lastTrackStatistics;
 
     private String category = "";
-    @Deprecated //TODO This should be handled somewhere else; not in the UI.
-    private int recordingGpsAccuracy;
 
     public static Fragment newInstance() {
         return new StatisticsRecordingFragment();
@@ -78,16 +75,6 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
                     });
                 }
             }
-            if (PreferencesUtils.isKey(getContext(), R.string.recording_track_id_key, key)) {
-                recordingGpsAccuracy = PreferencesUtils.getRecordingGPSAccuracy(getContext());
-                if (PreferencesUtils.getRecordingTrackId(getContext()).isValid()) {
-                    // A recording track id has been set -> Resumes track and starts timer.
-                    resumeTrackDataHub();
-                    trackRecordingServiceConnection.startConnection(getContext());
-
-                    handlerUpdateUI.post(updateUIeachSecond);
-                }
-            }
         }
     };
 
@@ -201,8 +188,6 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        recordingGpsAccuracy = Integer.parseInt(getResources().getString(R.string.recording_gps_accuracy_default));
-
         handlerUpdateUI = new Handler();
 
         Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
@@ -343,9 +328,8 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
                     TrackPoint trackPoint = lastTrackPoint; //NOTE: There seems to be a race condition; just fix the symptom for now.
                     if (trackPoint != null) {
                         boolean hasFix = !LocationUtils.isLocationOld(trackPoint.getLocation());
-                        boolean hasGoodFix = TrackPointUtils.fulfillsAccuracy(trackPoint, recordingGpsAccuracy);
 
-                        if (!hasFix || !hasGoodFix) {
+                        if (!hasFix) {
                             lastTrackPoint = null;
                         }
                     }
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 4031af8c6..a97bf6e13 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -154,8 +154,8 @@ public class TrackIconUtils {
      * @param context      the context
      * @param activityType the activity type
      */
-    public static @NonNull
-    String getIconValue(Context context, String activityType) {
+    @NonNull
+    public static String getIconValue(Context context, String activityType) {
         if (activityType == null || activityType.equals("")) {
             return UNKNOWN;
         }