diff --git a/.gitignore b/.gitignore
index 086c3d65e..c89f31027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,19 +45,16 @@ captures/
 
 
 # IntelliJ IDEA
-*.iml
 *.iws
 /out/
 
 # User-specific configurations
 .idea/.name
-.idea/assetWizardSettings.xml
 .idea/caches/
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
 .idea/dataSources.ids
 .idea/datasources.xml
-.idea/dictionaries
 .idea/dynamic.xml
 .idea/encodings.xml
 .idea/jsLibraryMappings.xml
@@ -67,10 +64,8 @@ captures/
 .idea/scopes/scope_settings.xml
 .idea/shelf/
 .idea/sqlDataSources.xml
-.idea/tasks.xml
 .idea/vcs.xml
 .idea/uiDesigner.xml
-.idea/workspace.xml
 
 # Keystore files
 *.jks
diff --git a/src/main/res/drawable/ic_location_on_black_24dp.xml b/src/main/res/drawable/ic_location_on_black_24dp.xml
deleted file mode 100644
index aea56cb5a..000000000
--- a/src/main/res/drawable/ic_location_on_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
-</vector>
diff --git a/src/main/res/drawable/ic_split_frequency_24dp.xml b/src/main/res/drawable/ic_split_frequency_24dp.xml
deleted file mode 100644
index 704a3b8e0..000000000
--- a/src/main/res/drawable/ic_split_frequency_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,1L9,1v2h6L15,1zM11,14h2L13,8h-2v6zM19.03,7.39l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
-</vector>
diff --git a/src/main/res/drawable/ic_statistics_24dp.xml b/src/main/res/drawable/ic_statistics_24dp.xml
deleted file mode 100644
index 13cfc8fad..000000000
--- a/src/main/res/drawable/ic_statistics_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
-</vector>
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index f552472a3..014d775d0 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -22,7 +22,6 @@ limitations under the License.
         <a href="https://github.com/material-components/material-components-android">Material Components for Android</a> (Apache License, Version 2.0)
     </string>
 
-    <string name="marker_statistics_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
     <string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
 
     <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
diff --git a/src/main/res/values/preferences_internal.xml b/src/main/res/values/preferences_internal.xml
index d1249f80d..9653c35b7 100644
--- a/src/main/res/values/preferences_internal.xml
+++ b/src/main/res/values/preferences_internal.xml
@@ -16,7 +16,6 @@ limitations under the License.
 <resources>
     <!-- Keys for persisted preferences that are used by internally. -->
     <!--But they should not get backed up or restored.-->
-    <string name="auto_resume_track_current_retry_key" translatable="false">autoResumeTrackCurrentRetry</string>
     <string name="recording_track_id_key" translatable="false">recordingTrackId</string>
 
     <string name="recording_track_paused_key" translatable="false">recordingTrackPaused</string>