diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
index cf0d47600..b47553532 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
@@ -182,7 +182,7 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_start() throws TimeoutException, InterruptedException {
+    public void testRecording_start() throws TimeoutException {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
 
@@ -198,7 +198,7 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_stop() throws TimeoutException, InterruptedException {
+    public void testRecording_stop() throws TimeoutException {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         Track.Id trackId = service.startNewTrack();
@@ -216,7 +216,7 @@ public class TrackRecordingServiceTest {
 
     @MediumTest
     @Test
-    public void testRecording_pauseAndResume() throws TimeoutException, InterruptedException {
+    public void testRecording_pauseAndResume() throws TimeoutException {
         // given
         TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context)));
         Track.Id trackId = service.startNewTrack();
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
index 960593c18..b238eae8c 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
@@ -140,10 +140,6 @@ public class TrackPoint {
         return createSegmentEndWithTime(Instant.now());
     }
 
-    public static TrackPoint createSegmentEndWithTime(@NonNull TrackPoint trackPoint) {
-        return createSegmentEndWithTime(trackPoint.getTime());
-    }
-
     public static TrackPoint createSegmentEndWithTime(Instant time) {
         return new TrackPoint(Type.SEGMENT_END_MANUAL, time);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
index 392b24f7b..8877d1402 100644
--- a/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
+++ b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
@@ -29,10 +29,6 @@ public class UnitConversions {
     // TODO Use int instead of long.
     public static final long ONE_SECOND_US = UnitConversions.S_TO_MS * 1000;
     public static final long ONE_SECOND_MS = UnitConversions.S_TO_MS;
-    public static final long ONE_MINUTE_MS = (long) (UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS);
-    public static final long ONE_HOUR_MS = 60 * ONE_MINUTE_MS;
-    public static final long ONE_DAY_MS = 24 * ONE_HOUR_MS;
-    public static final long ONE_WEEK_MS = 7 * ONE_DAY_MS;
 
     // multiplication factor to convert milliseconds to seconds
     public static final double MS_TO_S = 1d / S_TO_MS;