diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
index f64b78661..189a0b39b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
@@ -5,25 +5,5 @@
 
 package org.whispersystems.textsecuregcm.entities;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class DeviceInfo {
-  @JsonProperty
-  private long id;
-
-  @JsonProperty
-  private String name;
-
-  @JsonProperty
-  private long lastSeen;
-
-  @JsonProperty
-  private long created;
-
-  public DeviceInfo(long id, String name, long lastSeen, long created) {
-    this.id       = id;
-    this.name     = name;
-    this.lastSeen = lastSeen;
-    this.created  = created;
-  }
+public record DeviceInfo(long id, String name, long lastSeen, long created) {
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfoList.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfoList.java
index 55473ecd9..a67e577f5 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfoList.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfoList.java
@@ -5,16 +5,7 @@
 
 package org.whispersystems.textsecuregcm.entities;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 
-public class DeviceInfoList {
-
-  @JsonProperty
-  private List<DeviceInfo> devices;
-
-  public DeviceInfoList(List<DeviceInfo> devices) {
-    this.devices = devices;
-  }
+public record DeviceInfoList(List<DeviceInfo> devices) {
 }