Add RDAP nameserver tests for .zz-- TLD hostnames (#2936 )

The actual error is fixed as a side effect of PR #2935, but this adds tests verifying the intended behavior. BUG= http://b/476144993
Remove contacts from RDE (#2934 )
2026-01-20 04:33:03 +00:00 · 2026-01-16 17:55:41 +00:00 · 2026-01-16 15:25:33 +00:00
20 changed files with 126 additions and 572 deletions
--- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java
+++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java
@@ -50,8 +50,6 @@ import google.registry.config.CredentialModule;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.gcs.GcsUtils;
 import google.registry.model.EppResource;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.host.Host;
@@ -73,7 +71,6 @@ import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.HashSet;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.KvCoder;
@@ -138,25 +135,21 @@ import org.joda.time.DateTime;
 * pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further
 * processing.
 *
- * <h3>{@link Contact}</h3>
- *
- * We first join most recent contact histories, represented by (contact repo ID: contact history
- * revision ID) pairs, with referenced contacts, represented by (contact repo ID: pending deposit)
- * pairs, on the contact repo ID, to remove unreferenced contact histories. Contact resources are
- * then loaded from the remaining referenced contact histories, and marshalled into (pending
- * deposit: deposit fragment) pairs.
- *
 * <h3>{@link Host}</h3>
 *
- * Similar to {@link Contact}, we join the most recent host history with referenced hosts to find
- * most recent referenced hosts. For external hosts we do the same treatment as we did on contacts
- * and obtain the (pending deposit: deposit fragment) pairs. For subordinate hosts, we need to find
- * the superordinate domain in order to properly handle pending transfer in the deposit as well. So
- * we first find the superordinate domain repo ID from the host and join the (superordinate domain
- * repo ID: (subordinate host repo ID: (pending deposit: revision ID))) pair with the (domain repo
- * ID: revision ID) pair obtained from the domain history query in order to map the host at
- * watermark to the domain at watermark. We then proceed to create the (pending deposit: deposit
- * fragment) pair for subordinate hosts using the added domain information.
+ * <p>We first join most recent host histories, represented by (host repo ID: host history revision
+ * ID) pairs, with referenced hosts, represented by (host repo ID: pending deposit) pairs, on the
+ * host repo ID, to remove unreferenced host histories. Host resources are then loaded from the
+ * remaining referenced host histories, and marshalled into (pending deposit: deposit fragment)
+ * pairs.
+ *
+ * <p>For subordinate hosts, we need to find the superordinate domain in order to properly handle
+ * pending transfer in the deposit as well. So we first find the superordinate domain repo ID from
+ * the host and join the (superordinate domain repo ID: (subordinate host repo ID: (pending deposit:
+ * revision ID))) pair with the (domain repo ID: revision ID) pair obtained from the domain history
+ * query in order to map the host at watermark to the domain at watermark. We then proceed to create
+ * the (pending deposit: deposit fragment) pair for subordinate hosts using the added domain
+ * information.
 *
 * <h2>Processing {@link DepositFragment}</h2>
 *
@@ -230,9 +223,6 @@ public class RdePipeline implements Serializable {
    PCollection<KV<String, Long>> domainHistories =
        getMostRecentHistoryEntries(pipeline, DomainHistory.class);

-    PCollection<KV<String, Long>> contactHistories =
-        getMostRecentHistoryEntries(pipeline, ContactHistory.class);
-
    PCollection<KV<String, Long>> hostHistories =
        getMostRecentHistoryEntries(pipeline, HostHistory.class);

@@ -241,10 +231,6 @@ public class RdePipeline implements Serializable {
    PCollection<KV<PendingDeposit, DepositFragment>> domainFragments =
        processedDomainHistories.get(DOMAIN_FRAGMENTS);

-    PCollection<KV<PendingDeposit, DepositFragment>> contactFragments =
-        processContactHistories(
-            processedDomainHistories.get(REFERENCED_CONTACTS), contactHistories);
-
    PCollectionTuple processedHosts =
        processHostHistories(processedDomainHistories.get(REFERENCED_HOSTS), hostHistories);

@@ -256,7 +242,6 @@ public class RdePipeline implements Serializable {

    return PCollectionList.of(registrarFragments)
        .and(domainFragments)
-        .and(contactFragments)
        .and(externalHostFragments)
        .and(subordinateHostFragments)
        .apply(
@@ -437,7 +422,6 @@ public class RdePipeline implements Serializable {
  private PCollectionTuple processDomainHistories(PCollection<KV<String, Long>> domainHistories) {
    Counter activeDomainCounter = Metrics.counter("RDE", "ActiveDomainBase");
    Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment");
-    Counter referencedContactCounter = Metrics.counter("RDE", "ReferencedContact");
    Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost");
    return domainHistories.apply(
        "Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host",
@@ -463,19 +447,8 @@ public class RdePipeline implements Serializable {
                                      KV.of(
                                          pendingDeposit,
                                          marshaller.marshalDomain(domain, pendingDeposit.mode())));
-                              // Contacts and hosts are only deposited in RDE, not BRDA.
+                              // Hosts are only deposited in RDE, not BRDA.
                              if (pendingDeposit.mode() == RdeMode.FULL) {
-                                HashSet<Serializable> contacts = new HashSet<>();
-                                domain.getAdminContact().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getTechContact().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getRegistrant().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getBillingContact().ifPresent(c -> contacts.add(c.getKey()));
-                                referencedContactCounter.inc(contacts.size());
-                                contacts.forEach(
-                                    contactRepoId ->
-                                        receiver
-                                            .get(REFERENCED_CONTACTS)
-                                            .output(KV.of((String) contactRepoId, pendingDeposit)));
                                if (domain.getNsHosts() != null) {
                                  referencedHostCounter.inc(domain.getNsHosts().size());
                                  domain
@@ -497,38 +470,6 @@ public class RdePipeline implements Serializable {
                DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS)));
  }

-  private PCollection<KV<PendingDeposit, DepositFragment>> processContactHistories(
-      PCollection<KV<String, PendingDeposit>> referencedContacts,
-      PCollection<KV<String, Long>> contactHistories) {
-    Counter contactFragmentCounter = Metrics.counter("RDE", "ContactFragment");
-    return removeUnreferencedResource(referencedContacts, contactHistories, Contact.class)
-        .apply(
-            "Map Contact to DepositFragment",
-            FlatMapElements.into(
-                    kvs(
-                        TypeDescriptor.of(PendingDeposit.class),
-                        TypeDescriptor.of(DepositFragment.class)))
-                .via(
-                    (KV<String, CoGbkResult> kv) -> {
-                      Contact contact =
-                          (Contact)
-                              loadResourceByHistoryEntryId(
-                                  ContactHistory.class,
-                                  kv.getKey(),
-                                  kv.getValue().getAll(REVISION_ID));
-                      DepositFragment fragment = marshaller.marshalContact(contact);
-                      ImmutableSet<KV<PendingDeposit, DepositFragment>> fragments =
-                          Streams.stream(kv.getValue().getAll(PENDING_DEPOSIT))
-                              // The same contact could be used by multiple domains, therefore
-                              // matched to the same pending deposit multiple times.
-                              .distinct()
-                              .map(pendingDeposit -> KV.of(pendingDeposit, fragment))
-                              .collect(toImmutableSet());
-                      contactFragmentCounter.inc(fragments.size());
-                      return fragments;
-                    }));
-  }
-
  private PCollectionTuple processHostHistories(
      PCollection<KV<String, PendingDeposit>> referencedHosts,
      PCollection<KV<String, Long>> hostHistories) {
--- a/core/src/main/java/google/registry/rde/RdeMarshaller.java
+++ b/core/src/main/java/google/registry/rde/RdeMarshaller.java
@@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;

 import com.google.common.flogger.FluentLogger;
 import google.registry.model.ImmutableObject;
-import google.registry.model.contact.Contact;
 import google.registry.model.domain.Domain;
 import google.registry.model.host.Host;
 import google.registry.model.rde.RdeMode;
@@ -118,12 +117,6 @@ public final class RdeMarshaller implements Serializable {
    }
  }

-  /** Turns {@link Contact} object into an XML fragment. */
-  public DepositFragment marshalContact(Contact contact) {
-    return marshalResource(
-        RdeResourceType.CONTACT, contact, ContactToXjcConverter.convert(contact));
-  }
-
  /** Turns {@link Domain} object into an XML fragment. */
  public DepositFragment marshalDomain(Domain domain, RdeMode mode) {
    return marshalResource(
--- a/core/src/main/java/google/registry/rde/RdeResourceType.java
+++ b/core/src/main/java/google/registry/rde/RdeResourceType.java
@@ -25,7 +25,6 @@ import java.util.EnumSet;

 /** Types of objects that get embedded in an escrow deposit. */
 public enum RdeResourceType {
-  CONTACT("urn:ietf:params:xml:ns:rdeContact-1.0", EnumSet.of(FULL)),
  DOMAIN("urn:ietf:params:xml:ns:rdeDomain-1.0", EnumSet.of(FULL, THIN)),
  HOST("urn:ietf:params:xml:ns:rdeHost-1.0", EnumSet.of(FULL)),
  REGISTRAR("urn:ietf:params:xml:ns:rdeRegistrar-1.0", EnumSet.of(FULL, THIN)),
--- a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java
+++ b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java
@@ -25,13 +25,11 @@ import static google.registry.model.rde.RdeMode.THIN;
 import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar1;
 import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar2;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.rde.RdeResourceType.CONTACT;
 import static google.registry.rde.RdeResourceType.DOMAIN;
 import static google.registry.rde.RdeResourceType.HOST;
 import static google.registry.rde.RdeResourceType.REGISTRAR;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.newDomain;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistEppResource;
@@ -54,10 +52,6 @@ import google.registry.gcs.GcsUtils;
 import google.registry.keyring.api.PgpHelper;
 import google.registry.model.common.Cursor;
 import google.registry.model.common.Cursor.CursorType;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
@@ -114,8 +108,6 @@ public class RdePipelineTest {

  private static final String DOMAIN_NAME_PATTERN = "<rdeDomain:name>(.*)</rdeDomain:name>";

-  private static final String CONTACT_ID_PATTERN = "<rdeContact:id>(.*)</rdeContact:id>";
-
  private static final String HOST_NAME_PATTERN = "<rdeHost:name>(.*)</rdeHost:name>";

  // This is the default creation time for test data.
@@ -139,7 +131,6 @@ public class RdePipelineTest {
      ImmutableList.of(
          DepositFragment.create(DOMAIN, "<rdeDomain:domain/>\n", ""),
          DepositFragment.create(REGISTRAR, "<rdeRegistrar:registrar/>\n", ""),
-          DepositFragment.create(CONTACT, "<rdeContact:contact/>\n", ""),
          DepositFragment.create(HOST, "<rdeHost:host/>\n", ""));

  private final GcsUtils gcsUtils = new GcsUtils(LocalStorageHelper.getOptions());
@@ -165,21 +156,6 @@ public class RdePipelineTest {

  private RdePipeline rdePipeline;

-  private ContactHistory persistContactHistory(ContactBase contact) {
-    return persistResource(
-        new ContactHistory.Builder()
-            .setType(HistoryEntry.Type.HOST_CREATE)
-            .setXmlBytes("<xml></xml>".getBytes(UTF_8))
-            .setModificationTime(clock.nowUtc())
-            .setRegistrarId("TheRegistrar")
-            .setTrid(Trid.create("ABC-123", "server-trid"))
-            .setBySuperuser(false)
-            .setReason("reason")
-            .setRequestedByRegistrar(true)
-            .setContact(contact)
-            .build());
-  }
-
  private DomainHistory persistDomainHistory(DomainBase domain) {
    DomainTransactionRecord transactionRecord =
        new DomainTransactionRecord.Builder()
@@ -254,20 +230,18 @@ public class RdePipelineTest {
              RdeRevision.saveRevision("soy", now, FULL, 0);
            });

-    // This contact is never referenced.
-    persistContactHistory(persistActiveContact("contactX"));
-    Contact contact1 = persistActiveContact("contact1234");
-    persistContactHistory(contact1);
-    Contact contact2 = persistActiveContact("contact456");
-    persistContactHistory(contact2);
-
    // This host is never referenced.
    persistHostHistory(persistActiveHost("ns0.domain.tld"));
    Host host1 = persistActiveHost("ns1.external.tld");
    persistHostHistory(host1);
    Domain helloDomain =
        persistEppResource(
-            newDomain("hello.soy", contact1).asBuilder().addNameserver(host1.createVKey()).build());
+            newDomain("hello.soy")
+                .asBuilder()
+                .addNameserver(host1.createVKey())
+                .setRegistrant(Optional.empty())
+                .setContacts(ImmutableSet.of())
+                .build());
    persistDomainHistory(helloDomain);
    persistHostHistory(persistActiveHost("not-used-subordinate.hello.soy"));
    Host host2 = persistActiveHost("ns1.hello.soy");
@@ -276,14 +250,15 @@ public class RdePipelineTest {
    // This domain has no registrant.
    Domain kittyDomain =
        persistEppResource(
-            newDomain("kitty.fun", contact2)
+            newDomain("kitty.fun")
                .asBuilder()
                .addNameservers(ImmutableSet.of(host1.createVKey(), host2.createVKey()))
                .setRegistrant(Optional.empty())
+                .setContacts(ImmutableSet.of())
                .build());
    persistDomainHistory(kittyDomain);
    // Should not appear because the TLD is not included in a pending deposit.
-    persistDomainHistory(persistEppResource(newDomain("lol.cat", contact1)));
+    persistDomainHistory(persistEppResource(newDomain("lol.cat")));
    // To be deleted.
    Domain deletedDomain = persistActiveDomain("deleted.soy");
    persistDomainHistory(deletedDomain);
@@ -293,8 +268,7 @@ public class RdePipelineTest {
    persistDomainHistory(deletedDomain.asBuilder().setDeletionTime(clock.nowUtc()).build());
    kittyDomain = kittyDomain.asBuilder().setDomainName("cat.fun").build();
    persistDomainHistory(kittyDomain);
-    Contact contact3 = persistActiveContact("contact789");
-    persistContactHistory(contact3);
+
    // This is a subordinate domain in TLD .cat, which is not included in any pending deposit. But
    // it should still be included as a subordinate host in the pendign deposit for .soy.
    Host host3 = persistActiveHost("ns1.lol.cat");
@@ -302,17 +276,8 @@ public class RdePipelineTest {
    persistDomainHistory(
        helloDomain
            .asBuilder()
-            .removeContacts(
-                helloDomain.getContacts().stream()
-                    .filter(dc -> dc.getType() == DesignatedContact.Type.ADMIN)
-                    .collect(toImmutableSet()))
-            .addContacts(
-                ImmutableSet.of(
-                    DesignatedContact.create(DesignatedContact.Type.ADMIN, contact3.createVKey())))
            .addNameserver(host3.createVKey())
            .build());
-    // contact456 is renamed to contactABC.
-    persistContactHistory(contact2.asBuilder().setContactId("contactABC").build());
    // ns1.hello.soy is renamed to ns2.hello.soy
    persistHostHistory(host2.asBuilder().setHostName("ns2.hello.soy").build());

@@ -320,18 +285,11 @@ public class RdePipelineTest {
    // resulting deposit fragments.
    clock.advanceBy(Duration.standardDays(2));
    persistDomainHistory(kittyDomain.asBuilder().setDeletionTime(clock.nowUtc()).build());
-    Contact futureContact = persistActiveContact("future-contact");
-    persistContactHistory(futureContact);
    Host futureHost = persistActiveHost("ns1.future.tld");
    persistHostHistory(futureHost);
    persistDomainHistory(
        persistEppResource(
-            newDomain("future.soy", futureContact)
-                .asBuilder()
-                .setNameservers(futureHost.createVKey())
-                .build()));
-    // contactABC is renamed to contactXYZ.
-    persistContactHistory(contact2.asBuilder().setContactId("contactXYZ").build());
+            newDomain("future.soy").asBuilder().setNameservers(futureHost.createVKey()).build()));
    // ns2.hello.soy is renamed to ns3.hello.soy
    persistHostHistory(host2.asBuilder().setHostName("ns3.hello.soy").build());

@@ -390,11 +348,9 @@ public class RdePipelineTest {
                              """
                              <rdeDomain:domain>
                                  <rdeDomain:name>cat.fun</rdeDomain:name>
-                                  <rdeDomain:roid>15-FUN</rdeDomain:roid>
+                                  <rdeDomain:roid>10-FUN</rdeDomain:roid>
                                  <rdeDomain:uName>cat.fun</rdeDomain:uName>
                                  <rdeDomain:status s="ok"/>
-                                  <rdeDomain:contact type="admin">contact456</rdeDomain:contact>
-                                  <rdeDomain:contact type="tech">contact456</rdeDomain:contact>
                                  <rdeDomain:ns>
                                      <domain:hostObj>ns1.external.tld</domain:hostObj>
                                      <domain:hostObj>ns1.hello.soy</domain:hostObj>
@@ -407,14 +363,7 @@ public class RdePipelineTest {
                              """);
                    }
                    if (kv.getKey().mode().equals(FULL)) {
-                      // Contact fragments for hello.soy.
                      if ("soy".equals(kv.getKey().tld())) {
-                        assertThat(
-                                getFragmentForType(kv, CONTACT)
-                                    .map(getXmlElement(CONTACT_ID_PATTERN))
-                                    .collect(toImmutableSet()))
-                            .containsExactly("contact1234", "contact789");
-
                        // Host fragments for hello.soy.
                        assertThat(
                                getFragmentForType(kv, HOST)
@@ -428,12 +377,9 @@ public class RdePipelineTest {
                                """
                                <rdeDomain:domain>
                                    <rdeDomain:name>hello.soy</rdeDomain:name>
-                                    <rdeDomain:roid>E-SOY</rdeDomain:roid>
+                                    <rdeDomain:roid>8-SOY</rdeDomain:roid>
                                    <rdeDomain:uName>hello.soy</rdeDomain:uName>
                                    <rdeDomain:status s="ok"/>
-                                    <rdeDomain:registrant>contact1234</rdeDomain:registrant>
-                                    <rdeDomain:contact type="admin">contact789</rdeDomain:contact>
-                                    <rdeDomain:contact type="tech">contact1234</rdeDomain:contact>
                                    <rdeDomain:ns>
                                        <domain:hostObj>ns1.external.tld</domain:hostObj>
                                        <domain:hostObj>ns1.lol.cat</domain:hostObj>
@@ -445,13 +391,6 @@ public class RdePipelineTest {
                                </rdeDomain:domain>\
                                """);
                      } else {
-                        // Contact fragments for cat.fun.
-                        assertThat(
-                                getFragmentForType(kv, CONTACT)
-                                    .map(getXmlElement(CONTACT_ID_PATTERN))
-                                    .collect(toImmutableSet()))
-                            .containsExactly("contactABC");
-
                        // Host fragments for cat.soy.
                        assertThat(
                                getFragmentForType(kv, HOST)
@@ -460,22 +399,19 @@ public class RdePipelineTest {
                            .containsExactly("ns1.external.tld", "ns2.hello.soy");
                      }
                    } else {
-                      // BRDA does not contain contact or hosts.
+                      // BRDA does not contain hosts.
                      assertThat(
                              Streams.stream(kv.getValue())
-                                  .anyMatch(
-                                      fragment ->
-                                          fragment.type().equals(CONTACT)
-                                              || fragment.type().equals(HOST)))
+                                  .anyMatch(fragment -> fragment.type().equals(HOST)))
                          .isFalse();

-                      // Domain fragments for hello.soy: Note that this contains no contact info.
+                      // Domain fragments for hello.soy.
                      assertThat(domainFrags.stream().findFirst().get().xml().strip())
                          .isEqualTo(
                              """
                              <rdeDomain:domain>
                                  <rdeDomain:name>hello.soy</rdeDomain:name>
-                                  <rdeDomain:roid>E-SOY</rdeDomain:roid>
+                                  <rdeDomain:roid>8-SOY</rdeDomain:roid>
                                  <rdeDomain:uName>hello.soy</rdeDomain:uName>
                                  <rdeDomain:status s="ok"/>
                                  <rdeDomain:ns>
--- a/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
+++ b/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
@@ -298,9 +298,13 @@ have failed to comply with these terms.",
    }

    JsonFileBuilder addNameserver(String name, String handle) {
+      return addNameserver(Idn.toASCII(name), name, handle);
+    }
+
+    JsonFileBuilder addNameserver(String punycodeName, String unicodeName, String handle) {
      return putNext(
-          "NAMESERVER_NAME_", Idn.toASCII(name),
-          "NAMESERVER_UNICODE_NAME_", name,
+          "NAMESERVER_NAME_", punycodeName,
+          "NAMESERVER_UNICODE_NAME_", unicodeName,
          "NAMESERVER_HANDLE_", handle);
    }

--- a/core/src/test/java/google/registry/rdap/RdapNameserverActionTest.java
+++ b/core/src/test/java/google/registry/rdap/RdapNameserverActionTest.java
@@ -17,6 +17,8 @@ package google.registry.rdap;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistResource;
+import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHost;
+import static google.registry.testing.FullFieldsTestEntityHelper.makePunycodedHost;
 import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
 import static google.registry.testing.GsonSubject.assertAboutJson;
 import static org.mockito.Mockito.verify;
@@ -27,7 +29,6 @@ import google.registry.rdap.RdapMetrics.SearchType;
 import google.registry.rdap.RdapMetrics.WildcardType;
 import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
 import google.registry.request.Action;
-import google.registry.testing.FullFieldsTestEntityHelper;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,20 +44,17 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
  void beforeEach() {
    // normal
    createTld("lol");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
    // idn
    createTld("xn--q9jyb4c");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
+    makeAndPersistHost(
        "ns1.cat.xn--q9jyb4c", "bad:f00d:cafe:0:0:0:15:beef", clock.nowUtc().minusYears(1));
    // multilevel
    createTld("1.tld");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.domain.1.tld", "5.6.7.8", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.domain.1.tld", "5.6.7.8", clock.nowUtc().minusYears(1));
    // deleted
    persistResource(
-        FullFieldsTestEntityHelper.makeAndPersistHost(
-                "nsdeleted.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1))
+        makeAndPersistHost("nsdeleted.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1))
            .asBuilder()
            .setDeletionTime(clock.nowUtc().minusMonths(1))
            .build());
@@ -64,8 +62,7 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
    persistResource(
        makeRegistrar("otherregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE, 102L));
    // external
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.domain.external", "9.10.11.12", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.domain.external", "9.10.11.12", clock.nowUtc().minusYears(1));
  }

  @Test
@@ -80,6 +77,14 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
    assertThat(response.getStatus()).isEqualTo(400);
  }

+  @Test
+  void testInvalidNameserver_domainWithHyphenOn3And4_returns400() {
+    assertAboutJson()
+        .that(generateActualJson("ns1.zz--main-2166.lol"))
+        .isEqualTo(generateExpectedJsonError("Not a valid nameserver", 400));
+    assertThat(response.getStatus()).isEqualTo(400);
+  }
+
  @Test
  void testUnknownNameserver_returns404() {
    assertAboutJson()
@@ -101,6 +106,21 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
    assertThat(response.getStatus()).isEqualTo(200);
  }

+  @Test
+  void testNameserver_tldTithHyphenOn3And4_works() {
+    createTld("zz--main-2166");
+    persistResource(makePunycodedHost("ns1.cat.zz--main-2166", "1.2.3.4", null, "TheRegistrar"));
+    assertAboutJson()
+        .that(generateActualJson("ns1.cat.zz--main-2166"))
+        .isEqualTo(
+            addPermanentBoilerplateNotices(
+                jsonFileBuilder()
+                    .addNameserver("ns1.cat.zz--main-2166", "ns1.cat.zz--main-2166", "F-ROID")
+                    .putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
+                    .load("rdap_host.json")));
+    assertThat(response.getStatus()).isEqualTo(200);
+  }
+
  @Test
  void testTrailingDot_getsIgnored() {
    assertAboutJson()
--- a/core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java
+++ b/core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java
@@ -135,10 +135,15 @@ public final class FullFieldsTestEntityHelper {

  public static Host makeHost(
      String fqhn, @Nullable String ip1, @Nullable String ip2, String registrarClientId) {
+    return makePunycodedHost(Idn.toASCII(fqhn), ip1, ip2, registrarClientId);
+  }
+
+  public static Host makePunycodedHost(
+      String fqhn, @Nullable String ip1, @Nullable String ip2, String registrarClientId) {
    Host.Builder builder =
        new Host.Builder()
            .setRepoId(generateNewContactHostRoid())
-            .setHostName(Idn.toASCII(fqhn))
+            .setHostName(fqhn)
            .setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
            .setPersistedCurrentSponsorRegistrarId(registrarClientId);
    if ((ip1 != null) || (ip2 != null)) {
--- a/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java
+++ b/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java
@@ -31,35 +31,33 @@ class ValidateEscrowDepositCommandTest extends CommandTestCase<ValidateEscrowDep
    assertThat(getStdoutAsString())
        .isEqualTo(
            """
-        ID: 20101017001
-        Previous ID: 20101010001
-        Type: FULL
-        Watermark: 2010-10-17T00:00:00.000Z
-        RDE Version: 1.0
+            ID: 20101017001
+            Previous ID: 20101010001
+            Type: FULL
+            Watermark: 2010-10-17T00:00:00.000Z
+            RDE Version: 1.0

-        RDE Object URIs:
-          - urn:ietf:params:xml:ns:rdeContact-1.0
-          - urn:ietf:params:xml:ns:rdeDomain-1.0
-          - urn:ietf:params:xml:ns:rdeEppParams-1.0
-          - urn:ietf:params:xml:ns:rdeHeader-1.0
-          - urn:ietf:params:xml:ns:rdeHost-1.0
-          - urn:ietf:params:xml:ns:rdeIDN-1.0
-          - urn:ietf:params:xml:ns:rdeNNDN-1.0
-          - urn:ietf:params:xml:ns:rdeRegistrar-1.0
+            RDE Object URIs:
+              - urn:ietf:params:xml:ns:rdeDomain-1.0
+              - urn:ietf:params:xml:ns:rdeEppParams-1.0
+              - urn:ietf:params:xml:ns:rdeHeader-1.0
+              - urn:ietf:params:xml:ns:rdeHost-1.0
+              - urn:ietf:params:xml:ns:rdeIDN-1.0
+              - urn:ietf:params:xml:ns:rdeNNDN-1.0
+              - urn:ietf:params:xml:ns:rdeRegistrar-1.0

-        Contents:
-          - XjcRdeContact: 1 entry
-          - XjcRdeDomain: 2 entries
-          - XjcRdeEppParams: 1 entry
-          - XjcRdeHeader: 1 entry
-          - XjcRdeHost: 2 entries
-          - XjcRdeIdn: 1 entry
-          - XjcRdeNndn: 1 entry
-          - XjcRdePolicy: 1 entry
-          - XjcRdeRegistrar: 1 entry
+            Contents:
+              - XjcRdeDomain: 2 entries
+              - XjcRdeEppParams: 1 entry
+              - XjcRdeHeader: 1 entry
+              - XjcRdeHost: 2 entries
+              - XjcRdeIdn: 1 entry
+              - XjcRdeNndn: 1 entry
+              - XjcRdePolicy: 1 entry
+              - XjcRdeRegistrar: 1 entry

-        RDE deposit is XML schema valid
-        """);
+            RDE deposit is XML schema valid
+            """);
  }

  @Test
@@ -69,46 +67,44 @@ class ValidateEscrowDepositCommandTest extends CommandTestCase<ValidateEscrowDep
    assertThat(getStdoutAsString())
        .isEqualTo(
            """
-        ID: 20101017001
-        Previous ID: 20101010001
-        Type: FULL
-        Watermark: 2010-10-17T00:00:00.000Z
-        RDE Version: 1.0
+            ID: 20101017001
+            Previous ID: 20101010001
+            Type: FULL
+            Watermark: 2010-10-17T00:00:00.000Z
+            RDE Version: 1.0

-        RDE Object URIs:
-          - urn:ietf:params:xml:ns:rdeContact-1.0
-          - urn:ietf:params:xml:ns:rdeDomain-1.0
-          - urn:ietf:params:xml:ns:rdeEppParams-1.0
-          - urn:ietf:params:xml:ns:rdeHeader-1.0
-          - urn:ietf:params:xml:ns:rdeHost-1.0
-          - urn:ietf:params:xml:ns:rdeIDN-1.0
-          - urn:ietf:params:xml:ns:rdeNNDN-1.0
-          - urn:ietf:params:xml:ns:rdeRegistrar-1.0
+            RDE Object URIs:
+              - urn:ietf:params:xml:ns:rdeDomain-1.0
+              - urn:ietf:params:xml:ns:rdeEppParams-1.0
+              - urn:ietf:params:xml:ns:rdeHeader-1.0
+              - urn:ietf:params:xml:ns:rdeHost-1.0
+              - urn:ietf:params:xml:ns:rdeIDN-1.0
+              - urn:ietf:params:xml:ns:rdeNNDN-1.0
+              - urn:ietf:params:xml:ns:rdeRegistrar-1.0

-        Contents:
-          - XjcRdeContact: 1 entry
-          - XjcRdeDomain: 2 entries
-          - XjcRdeEppParams: 1 entry
-          - XjcRdeHeader: 1 entry
-          - XjcRdeHost: 2 entries
-          - XjcRdeIdn: 1 entry
-          - XjcRdeNndn: 1 entry
-          - XjcRdePolicy: 1 entry
-          - XjcRdeRegistrar: 1 entry
+            Contents:
+              - XjcRdeDomain: 2 entries
+              - XjcRdeEppParams: 1 entry
+              - XjcRdeHeader: 1 entry
+              - XjcRdeHost: 2 entries
+              - XjcRdeIdn: 1 entry
+              - XjcRdeNndn: 1 entry
+              - XjcRdePolicy: 1 entry
+              - XjcRdeRegistrar: 1 entry

-        Bad host refs: ns1.LAFFO.com
-        RDE deposit is XML schema valid but has bad references
-        """);
+            Bad host refs: ns1.LAFFO.com
+            RDE deposit is XML schema valid but has bad references
+            """);
  }

  @Test
-  void testRun_badXml() throws Exception {
+  void testRun_badXml_truncatedFile() throws Exception {
    String file = writeToTmpFile(RdeTestData.loadFile("deposit_full.xml").substring(0, 2000));
    XmlException thrown = assertThrows(XmlException.class, () -> runCommand("--input=" + file));
    assertThat(thrown)
        .hasMessageThat()
        .contains(
-            "Syntax error at line 46, column 38: "
+            "Syntax error at line 49, column 18: "
                + "XML document structures must start and end within the same entity.");
  }
 }
--- a/core/src/test/java/google/registry/xjc/XjcObjectTest.java
+++ b/core/src/test/java/google/registry/xjc/XjcObjectTest.java
@@ -45,7 +45,7 @@ class XjcObjectTest {
    String xml = out.toString(UTF_8.toString());
    Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?8\"");
    assertWithMessage("bad xml declaration: " + xml).that(pat.matcher(xml).find()).isTrue();
-    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe");
+    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test");
  }

  @Test
@@ -56,7 +56,7 @@ class XjcObjectTest {
    String xml = out.toString(UTF_16.toString());
    Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?16\"");
    assertWithMessage(xml).that(pat.matcher(xml).find()).isTrue();
-    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe");
+    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test");
  }

  @Test
--- a/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml
+++ b/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml
@@ -3,7 +3,6 @@
    <rde:watermark>2000-01-01T00:00:00Z</rde:watermark>
    <rde:rdeMenu>
        <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
@@ -13,7 +12,6 @@
    <rde:contents>
 <rdeDomain:domain/>
 <rdeRegistrar:registrar/>
-<rdeContact:contact/>
 <rdeHost:host/>

 <rdeIDN:idnTableRef id="extended_latin">
@@ -38,7 +36,6 @@

 <rdeHeader:header>
    <rdeHeader:tld>soy</rdeHeader:tld>
-    <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">1</rdeHeader:count>
    <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
    <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
    <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1</rdeHeader:count>
--- a/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml
+++ b/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml
@@ -10,7 +10,6 @@
    <rdeReport:watermark>2000-01-01T00:00:00Z</rdeReport:watermark>
    <rdeHeader:header>
        <rdeHeader:tld>soy</rdeHeader:tld>
-        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">1</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1</rdeHeader:count>
--- a/core/src/test/resources/google/registry/rde/deposit_full.xml
+++ b/core/src/test/resources/google/registry/rde/deposit_full.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
  xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
        </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
    </rdeHeader:count>
@@ -61,9 +55,6 @@
      <rdeDom:name>example1.test</rdeDom:name>
      <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:ns>
        <domain:hostObj>ns1.example.com</domain:hostObj>
        <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
      <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
      <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:clID>RegistrarX</rdeDom:clID>
      <rdeDom:crRr>RegistrarX</rdeDom:crRr>
      <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
      <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
    </rdeHost:host>

-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
    <!-- Registrar: RegistrarX -->
    <rdeRegistrar:registrar>
      <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:domain-1.0
      </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:host-1.0
      </rdeEppParams:objURI>
--- a/core/src/test/resources/google/registry/rde/deposit_full_badref.xml
+++ b/core/src/test/resources/google/registry/rde/deposit_full_badref.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
  xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
        </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
    </rdeHeader:count>
@@ -61,9 +55,6 @@
      <rdeDom:name>example1.test</rdeDom:name>
      <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:ns>
        <domain:hostObj>ns1.LAFFO.com</domain:hostObj>
        <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
      <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
      <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:clID>RegistrarX</rdeDom:clID>
      <rdeDom:crRr>RegistrarX</rdeDom:crRr>
      <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
      <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
    </rdeHost:host>

-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
    <!-- Registrar: RegistrarX -->
    <rdeRegistrar:registrar>
      <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:domain-1.0
      </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:host-1.0
      </rdeEppParams:objURI>
--- a/core/src/test/resources/google/registry/rde/deposit_full_different.xml
+++ b/core/src/test/resources/google/registry/rde/deposit_full_different.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
  xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
        </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
    </rdeHeader:count>
@@ -61,9 +55,6 @@
      <rdeDom:name>example1.test</rdeDom:name>
      <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:ns>
        <domain:hostObj>ns1.example.com</domain:hostObj>
        <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
      <rdeDom:roid>Dexample3-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
      <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:clID>RegistrarY</rdeDom:clID>
      <rdeDom:crRr>RegistrarY</rdeDom:crRr>
      <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
      <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
    </rdeHost:host>

-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
    <!-- Registrar: RegistrarX -->
    <rdeRegistrar:registrar>
      <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -259,9 +209,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:domain-1.0
      </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:host-1.0
      </rdeEppParams:objURI>
--- a/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml
+++ b/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
  xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
  xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
        </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
      <rdeHeader:count
        uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
    </rdeHeader:count>
@@ -62,9 +56,6 @@
      <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
      <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:clID>RegistrarX</rdeDom:clID>
      <rdeDom:crRr>RegistrarX</rdeDom:crRr>
      <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -76,9 +67,6 @@
      <rdeDom:name>example1.test</rdeDom:name>
      <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
      <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
      <rdeDom:ns>
        <domain:hostObj>ns1.example.com</domain:hostObj>
        <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -125,44 +113,6 @@
      <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
    </rdeHost:host>

-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
    <!-- Registrar: RegistrarX -->
    <rdeRegistrar:registrar>
      <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -225,9 +175,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:domain-1.0
      </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:host-1.0
      </rdeEppParams:objURI>
--- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml
+++ b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml
@@ -19,16 +19,13 @@
             xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
             xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0"
             xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-             xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
             xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
-             xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
             xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
             type="FULL"
             id="AAAABXDKZ6WAA">
    <rde:watermark>2000-01-01T00:00:00Z</rde:watermark>
    <rde:rdeMenu>
        <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
@@ -171,75 +168,6 @@
    </rdeDomain:trnData>
 </rdeDomain:domain>

-<rdeContact:contact>
-    <rdeContact:id>5372808-IRL</rdeContact:id>
-    <rdeContact:roid>6-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>be that word our sign in parting</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>BOFH@cat.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
-<rdeContact:contact>
-    <rdeContact:id>5372808-TRL</rdeContact:id>
-    <rdeContact:roid>7-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>bird or fiend!? i shrieked upstarting</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>bog@cat.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
-<rdeContact:contact>
-    <rdeContact:id>5372808-ERL</rdeContact:id>
-    <rdeContact:roid>3-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>(◕‿◕) nevermore</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>prophet@evil.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
 <rdeIDN:idnTableRef id="extended_latin">
    <rdeIDN:url>https://www.iana.org/domains/idn-tables/tables/google_latn_1.0.txt</rdeIDN:url>
    <rdeIDN:urlPolicy>https://www.registry.google/about/policies/domainabuse/</rdeIDN:urlPolicy>
--- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml
+++ b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml
@@ -18,10 +18,8 @@
                  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
                  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
                  xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0"
-                  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
                  xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
                  xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-                  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
                  xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
    <rdeReport:id>AAAABXDKZ6WAA</rdeReport:id>
    <rdeReport:version>1</rdeReport:version>
@@ -33,7 +31,6 @@
    <rdeReport:watermark>2000-01-01T00:00:00Z</rdeReport:watermark>
    <rdeHeader:header>
        <rdeHeader:tld>lol</rdeHeader:tld>
-        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">3</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">2</rdeHeader:count>
        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">2</rdeHeader:count>
--- a/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
+++ b/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <rde:deposit xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-             xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
-             xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
             xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
             xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
             xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -28,7 +26,6 @@
    <rde:watermark>2010-10-17T00:00:00Z</rde:watermark>
    <rde:rdeMenu>
        <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
        <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -132,7 +129,6 @@
 <rdeHeader:header>
  <rdeHeader:tld>xn--q9jyb4c</rdeHeader:tld>
  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">0</rdeHeader:count>
-  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">0</rdeHeader:count>
  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">2</rdeHeader:count>
  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeIDN-1.0">4</rdeHeader:count>
--- a/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml
+++ b/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml
@@ -7,7 +7,6 @@
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -18,7 +17,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
--- a/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml
+++ b/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml
@@ -7,7 +7,6 @@
  xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
  xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
  xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
  xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
  xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
  xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +18,6 @@
  <rde:rdeMenu>
    <rde:version>1.0</rde:version>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
    <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -106,44 +104,6 @@
      <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
    </rdeHost:host>

-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>Jane Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
    <!-- Registrar: RegistrarX -->
    <rdeRegistrar:registrar>
      <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -206,9 +166,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:domain-1.0
      </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
      <rdeEppParams:objURI>
        urn:ietf:params:xml:ns:host-1.0
      </rdeEppParams:objURI>