googleapis
diff --git a/src/main/java/com/google/api/resourcenames/ResourceName.java b/src/main/java/com/google/api/resourcenames/ResourceName.java
@@ -35,13 +35,4 @@
 
 /** An interface that generated resource name types must implement. */
 @BetaApi
-public interface ResourceName {
-
-  /**
-   * The ResourceNameType of the resource name object.
-   *
-   * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
-   */
-  @Deprecated
-  public ResourceNameType getType();
-}
+public interface ResourceName {}
diff --git a/src/main/java/com/google/api/resourcenames/ResourceNameType.java b/src/main/java/com/google/api/resourcenames/ResourceNameType.java
@@ -34,8 +34,8 @@
 import com.google.api.core.BetaApi;
 
 /**
- * An interface that resource name types must implement. A ResourceNameType class is required for
- * any class that implements {@link ResourceName}.
+ * An interface that resource name types used to have to implement. A ResourceNameType class was
+ * required for any class that implements {@link ResourceName}.
  *
  * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
  */

diff --git a/src/main/java/com/google/api/resourcenames/UntypedResourceName.java b/src/main/java/com/google/api/resourcenames/UntypedResourceName.java
@@ -48,14 +48,6 @@ private UntypedResourceName(String rawValue) {
     this.rawValue = Preconditions.checkNotNull(rawValue);
   }
 
-  /**
-   * @deprecated use {@link #of(ResourceName)} instead.
-   */
-  @Deprecated
-  public static UntypedResourceName from(ResourceName resourceName) {
-    return new UntypedResourceName(resourceName.toString());
-  }
-
   public static UntypedResourceName of(ResourceName resourceName) {
     return new UntypedResourceName(resourceName.toString());
   }
@@ -68,16 +60,6 @@ public static boolean isParsableFrom(String formattedString) {
     return true;
   }
 
-  /*
-   * @deprecated With Oneof types being converted to use inheritance, this is
-   * no longer necessary.
-   */
-  @Override
-  @Deprecated
-  public ResourceNameType getType() {
-    return UntypedResourceNameType.instance();
-  }
-
   @Override
   public String toString() {
     return rawValue;

diff --git a/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java b/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java