diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
index 2656c6683..d4f036f08 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -537,15 +537,14 @@ public class AccountController {
     Account account = disabledPermittedAuth.getAccount();
     Device device = disabledPermittedAuth.getAuthenticatedDevice();
 
-    if (device.getGcmId() != null &&
-        device.getGcmId().equals(registrationId.getGcmRegistrationId())) {
+    if (device.getGcmId() != null && device.getGcmId().equals(registrationId.gcmRegistrationId())) {
       return;
     }
 
     accounts.updateDevice(account, device.getId(), d -> {
       d.setApnId(null);
       d.setVoipApnId(null);
-      d.setGcmId(registrationId.getGcmRegistrationId());
+      d.setGcmId(registrationId.gcmRegistrationId());
       d.setFetchesMessages(false);
     });
   }
@@ -576,8 +575,8 @@ public class AccountController {
     Device device = disabledPermittedAuth.getAuthenticatedDevice();
 
     accounts.updateDevice(account, device.getId(), d -> {
-      d.setApnId(registrationId.getApnRegistrationId());
-      d.setVoipApnId(registrationId.getVoipRegistrationId());
+      d.setApnId(registrationId.apnRegistrationId());
+      d.setVoipApnId(registrationId.voipRegistrationId());
       d.setGcmId(null);
       d.setFetchesMessages(false);
     });
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
index c8d288a50..0741a9599 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
@@ -4,32 +4,9 @@
  */
 package org.whispersystems.textsecuregcm.entities;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.annotations.VisibleForTesting;
+import javax.annotation.Nullable;
 import javax.validation.constraints.NotEmpty;
 
-public class ApnRegistrationId {
-
-  @JsonProperty
-  @NotEmpty
-  private String apnRegistrationId;
-
-  @JsonProperty
-  private String voipRegistrationId;
-
-  public ApnRegistrationId() {}
-
-  @VisibleForTesting
-  public ApnRegistrationId(String apnRegistrationId, String voipRegistrationId) {
-    this.apnRegistrationId  = apnRegistrationId;
-    this.voipRegistrationId = voipRegistrationId;
-  }
-
-  public String getApnRegistrationId() {
-    return apnRegistrationId;
-  }
-
-  public String getVoipRegistrationId() {
-    return voipRegistrationId;
-  }
+public record ApnRegistrationId(@NotEmpty String apnRegistrationId,
+                                @Nullable String voipRegistrationId) {
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java
index a52349cf4..f715301a6 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java
@@ -4,27 +4,7 @@
  */
 package org.whispersystems.textsecuregcm.entities;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.annotations.VisibleForTesting;
 import javax.validation.constraints.NotEmpty;
 
-public class GcmRegistrationId {
-
-  @JsonProperty
-  @NotEmpty
-  private String gcmRegistrationId;
-
-  public GcmRegistrationId() {}
-
-  @VisibleForTesting
-  public GcmRegistrationId(String id) {
-    this.gcmRegistrationId = id;
-  }
-
-  public String getGcmRegistrationId() {
-    return gcmRegistrationId;
-  }
-
-
+public record GcmRegistrationId(@NotEmpty String gcmRegistrationId) {
 }
-