diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
index 279115442..c024c0e45 100644
--- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
@@ -12,7 +12,6 @@ public final class BluetoothLEUtils {
         byte[] raw = characteristic.getValue();
         int index = ((raw[0] & 0x1) == 1) ? 2 : 1;
         int format = (index == 1) ? BluetoothGattCharacteristic.FORMAT_UINT8 : BluetoothGattCharacteristic.FORMAT_UINT16;
-        int heartRate = characteristic.getIntValue(format, index);
-        return heartRate;
+        return characteristic.getIntValue(format, index);
     }
 }
diff --git a/src/main/res/drawable-hdpi/ic_menu_sensor_state.png b/src/main/res/drawable-hdpi/ic_menu_sensor_state.png
deleted file mode 100644
index 97231b91f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_menu_sensor_state.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_menu_view_photo.png b/src/main/res/drawable-hdpi/ic_menu_view_photo.png
deleted file mode 100644
index 0f650ee25..000000000
Binary files a/src/main/res/drawable-hdpi/ic_menu_view_photo.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_menu_sensor_state.png b/src/main/res/drawable-mdpi/ic_menu_sensor_state.png
deleted file mode 100644
index 539bad7d7..000000000
Binary files a/src/main/res/drawable-mdpi/ic_menu_sensor_state.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_menu_view_photo.png b/src/main/res/drawable-mdpi/ic_menu_view_photo.png
deleted file mode 100644
index d6235554b..000000000
Binary files a/src/main/res/drawable-mdpi/ic_menu_view_photo.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png b/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png
deleted file mode 100644
index 2caf74c95..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_menu_view_photo.png b/src/main/res/drawable-xhdpi/ic_menu_view_photo.png
deleted file mode 100644
index 3f93e4f65..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_menu_view_photo.png and /dev/null differ
diff --git a/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml
index 911d62f88..39e6c4f87 100644
--- a/src/main/res/layout-land/track_list.xml
+++ b/src/main/res/layout-land/track_list.xml
@@ -81,7 +81,7 @@ limitations under the License.
                     android:layout_height="wrap_content"
                     android:layout_weight=".7"
                     android:text="@string/track_list_empty_message"
-                    android:textColor="@color/list_empty_text"></TextView>
+                    android:textColor="@color/list_empty_text" />
 
                 <View
                     android:layout_width="0dp"
diff --git a/src/main/res/layout/chart.xml b/src/main/res/layout/chart.xml
index 6d896b08c..767d4e6d3 100644
--- a/src/main/res/layout/chart.xml
+++ b/src/main/res/layout/chart.xml
@@ -23,7 +23,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:orientation="vertical"></LinearLayout>
+        android:orientation="vertical" />
 
     <ZoomControls
         android:id="@+id/chart_zoom_controls"
diff --git a/src/main/res/layout/choose_activity_list_item.xml b/src/main/res/layout/choose_activity_list_item.xml
deleted file mode 100644
index 559ee85c1..000000000
--- a/src/main/res/layout/choose_activity_list_item.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2012 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <ImageView
-        android:id="@+id/choose_activity_list_item_icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:contentDescription="@string/image_application"
-        android:scaleType="fitCenter" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/choose_activity_list_item_text1"
-            style="@style/TextChooseActivity"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:paddingLeft="16dp" />
-
-        <TextView
-            android:id="@+id/choose_activity_list_item_text2"
-            style="@style/TextChooseActivity"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:paddingLeft="16dp" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/sensor_state.xml b/src/main/res/layout/sensor_state.xml
deleted file mode 100644
index fda490094..000000000
--- a/src/main/res/layout/sensor_state.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2010 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.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/ScrollView">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="8dp">
-
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/menu_sensor_state" />
-
-        <TextView
-            android:id="@+id/sensor_state"
-            style="@style/SensorStateValue" />
-        <!-- Last sensor time -->
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/sensor_state_last_sensor_time" />
-
-        <TextView
-            android:id="@+id/sensor_state_last_sensor_time"
-            style="@style/SensorStateValue" />
-        <!-- Heart rate -->
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/sensor_state_heart_rate" />
-
-        <TextView
-            android:id="@+id/sensor_state_heart_rate"
-            style="@style/SensorStateValue" />
-        <!-- Cadence -->
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/sensor_state_cadence" />
-
-        <TextView
-            android:id="@+id/sensor_state_cadence"
-            style="@style/SensorStateValue" />
-        <!-- Power -->
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/sensor_state_power" />
-
-        <TextView
-            android:id="@+id/sensor_state_power"
-            style="@style/SensorStateValue" />
-        <!-- Battery level -->
-        <TextView
-            style="@style/TextMedium"
-            android:text="@string/sensor_state_battery" />
-
-        <TextView
-            android:id="@+id/sensor_state_battery"
-            style="@style/SensorStateValue" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index d9c4b0756..5606fa9e8 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -37,7 +37,6 @@ limitations under the License.
                 android:imeOptions="actionNext" />
 
             <TextView
-                android:id="@+id/track_edit_activity_type_label"
                 style="@style/EditLabel.WithPaddingTop"
                 android:text="@string/track_edit_activity_type" />
 
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index d9a81d769..27e45e9bb 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -34,8 +34,5 @@ limitations under the License.
     <color name="text_gradient_center">#B2000000</color> <!-- black 70% opacity -->
     <color name="text_gradient_end">#00000000</color> <!-- black 0% opacity -->
     <color name="text_gradient_start">#FF000000</color> <!-- black 100% opacity -->
-    <color name="track_color_fast">#F7DF0101</color> <!-- red color -->
-    <color name="track_color_normal">#F75858FA</color> <!-- blue color -->
-    <color name="track_color_slow">#F774DF00</color> <!-- green color -->
     <color name="track_controller_background">#FF0E0E0E</color> <!-- dark gray -->
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index ceeffb645..93879196a 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.
     <string name="app_web_url" translatable="false">TODO</string>
     <string name="permission_notification_value" translatable="false">de.dennisguse.opentracks.MYTRACKS_NOTIFICATIONS</string>
     <string name="sensor_type_value_none" translatable="false">NONE</string>
-    <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
     <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
     <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
     <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>