diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index 163c561e9..e6359e4ba 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -43,7 +43,7 @@ import org.whispersystems.textsecuregcm.push.PushSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.util.Base64;
 import org.whispersystems.textsecuregcm.util.IterablePair;
-import org.whispersystems.textsecuregcm.util.IterablePair.Pair;
+import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.textsecuregcm.util.Util;
 
 import javax.servlet.AsyncContext;
diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java b/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java
index 269af4628..05c09ebb4 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java
@@ -21,6 +21,7 @@ import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import org.whispersystems.textsecuregcm.entities.ClientContact;
 import org.whispersystems.textsecuregcm.util.IterablePair;
+import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.textsecuregcm.util.Util;
 
 import java.util.LinkedList;
@@ -110,7 +111,7 @@ public class DirectoryManager {
 
       IterablePair<byte[], Response<byte[]>> lists = new IterablePair<>(tokens, futures);
 
-      for (IterablePair.Pair<byte[], Response<byte[]>> pair : lists) {
+      for (Pair<byte[], Response<byte[]>> pair : lists) {
         if (pair.second().get() != null) {
           TokenValue    tokenValue    = new Gson().fromJson(new String(pair.second().get()), TokenValue.class);
           ClientContact clientContact = new ClientContact(pair.first(), tokenValue.relay, tokenValue.supportsSms);
diff --git a/src/main/java/org/whispersystems/textsecuregcm/util/IterablePair.java b/src/main/java/org/whispersystems/textsecuregcm/util/IterablePair.java
index 854812aa5..4c3be396c 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/util/IterablePair.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/util/IterablePair.java
@@ -19,7 +19,7 @@ package org.whispersystems.textsecuregcm.util;
 import java.util.Iterator;
 import java.util.List;
 
-public class IterablePair <T1, T2> implements Iterable<IterablePair.Pair<T1,T2>> {
+public class IterablePair <T1, T2> implements Iterable<Pair<T1,T2>> {
   private final List<T1> first;
   private final List<T2> second;
 
@@ -33,24 +33,6 @@ public class IterablePair <T1, T2> implements Iterable<IterablePair.Pair<T1,T2>>
     return new ParallelIterator<>( first.iterator(), second.iterator() );
   }
 
-  public static class Pair<T1, T2> {
-    private final T1 v1;
-    private final T2 v2;
-
-    Pair(T1 v1, T2 v2) {
-      this.v1 = v1;
-      this.v2 = v2;
-    }
-
-    public T1 first(){
-      return v1;
-    }
-
-    public T2 second(){
-      return v2;
-    }
-  }
-
   public static class ParallelIterator <T1, T2> implements Iterator<Pair<T1, T2>> {
 
     private final Iterator<T1> it1;
diff --git a/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java b/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
new file mode 100644
index 000000000..601f5a229
--- /dev/null
+++ b/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
@@ -0,0 +1,19 @@
+package org.whispersystems.textsecuregcm.util;
+
+public class Pair<T1, T2> {
+  private final T1 v1;
+  private final T2 v2;
+
+  Pair(T1 v1, T2 v2) {
+    this.v1 = v1;
+    this.v2 = v2;
+  }
+
+  public T1 first(){
+    return v1;
+  }
+
+  public T2 second(){
+    return v2;
+  }
+}