diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java b/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java
index 817f0238c2..5d7ced75f5 100644
--- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java
+++ b/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java
@@ -86,7 +86,7 @@ public class KeyHelper {
     start--;
 
     for (int i=0;i<count;i++) {
-      results.add(new PreKeyRecord(((start + i) % (Medium.MAX_VALUE-1)) + 1, Curve.generateKeyPair()));
+      results.add(new PreKeyRecord(((start + i) % (0xFFFFFF-1)) + 1, Curve.generateKeyPair()));
     }
 
     return results;
diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Medium.java b/libsignal/src/main/java/org/session/libsignal/libsignal/util/Medium.java
deleted file mode 100644
index aea21d951b..0000000000
--- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (C) 2014-2016 Open Whisper Systems
- *
- * Licensed according to the LICENSE file in this repository.
- */
-package org.session.libsignal.libsignal.util;
-
-public class Medium {
-  public static int MAX_VALUE = 0xFFFFFF;
-}
diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java b/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java
index 7eee2a0740..e44561bebd 100644
--- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java
+++ b/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java
@@ -16,10 +16,6 @@
 
 package org.session.libsignal.libsignal.util.guava;
 
-import org.session.libsignal.libsignal.util.guava.Function;
-import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.libsignal.util.guava.Supplier;
-
 import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull;
 
 import java.util.Collections;