diff --git a/tink/aead/aead_config.cc b/tink/aead/aead_config.cc
index eb20ab01..b5a84cac 100644
--- a/tink/aead/aead_config.cc
+++ b/tink/aead/aead_config.cc
@@ -34,19 +34,6 @@
 
 namespace crypto {
 namespace tink {
-
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-using ::google::crypto::tink::RegistryConfig;
-
-// static
-const RegistryConfig& AeadConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status AeadConfig::Register() {
   auto status = MacConfig::Register();
diff --git a/tink/aead/aead_config.h b/tink/aead/aead_config.h
index 1af3436c..08cb196f 100644
--- a/tink/aead/aead_config.h
+++ b/tink/aead/aead_config.h
@@ -34,18 +34,6 @@ namespace tink {
 //
 class AeadConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kCatalogueName[] = "TinkAead";
-  static constexpr char kPrimitiveName[] = "Aead";
-
-  // Returns config of Aead implementations supported
-  // in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers Aead primitive wrapper and key managers for all Aead key types
   // from the current Tink release.
   static crypto::tink::util::Status Register();
diff --git a/tink/daead/deterministic_aead_config.cc b/tink/daead/deterministic_aead_config.cc
index 00696223..d7a555e5 100644
--- a/tink/daead/deterministic_aead_config.cc
+++ b/tink/daead/deterministic_aead_config.cc
@@ -28,18 +28,6 @@
 namespace crypto {
 namespace tink {
 
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-using google::crypto::tink::RegistryConfig;
-
-// static
-const RegistryConfig& DeterministicAeadConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status DeterministicAeadConfig::Register() {
   // Currently there are no FIPS-validated deterministic AEAD key managers
diff --git a/tink/daead/deterministic_aead_config.h b/tink/daead/deterministic_aead_config.h
index 79ea7306..3fdd1999 100644
--- a/tink/daead/deterministic_aead_config.h
+++ b/tink/daead/deterministic_aead_config.h
@@ -35,18 +35,6 @@ namespace tink {
 //
 class DeterministicAeadConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kCatalogueName[] = "TinkDeterministicAead";
-  static constexpr char kPrimitiveName[] = "DeterministicAead";
-
-  // Returns config of DeterministicAead implementations supported
-  // in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers DeterministicAead primitive wrapper and key managers for all
   // DeterministicAead key types from the current Tink release.
   static crypto::tink::util::Status Register();
diff --git a/tink/hybrid/hybrid_config.cc b/tink/hybrid/hybrid_config.cc
index 1d91c868..bb7dcac4 100644
--- a/tink/hybrid/hybrid_config.cc
+++ b/tink/hybrid/hybrid_config.cc
@@ -31,19 +31,6 @@
 namespace crypto {
 namespace tink {
 
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-
-using google::crypto::tink::RegistryConfig;
-
-// static
-const RegistryConfig& HybridConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status HybridConfig::Register() {
   auto status = AeadConfig::Register();
diff --git a/tink/hybrid/hybrid_config.h b/tink/hybrid/hybrid_config.h
index 20685eb6..adea356b 100644
--- a/tink/hybrid/hybrid_config.h
+++ b/tink/hybrid/hybrid_config.h
@@ -37,21 +37,6 @@ namespace tink {
 //
 class HybridConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kHybridDecryptCatalogueName[] = "TinkHybridDecrypt";
-  static constexpr char kHybridDecryptPrimitiveName[] = "HybridDecrypt";
-  static constexpr char kHybridEncryptCatalogueName[] = "TinkHybridEncrypt";
-  static constexpr char kHybridEncryptPrimitiveName[] = "HybridEncrypt";
-
-  // Returns config with implementations of HybridEncrypt and HybridDecrypt
-  // supported in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers HybridEncrypt and HybridDecrypt primitive wrappers, and key
   // managers for all implementations of HybridEncrypt and HybridDecrypt from
   // the current Tink release.
diff --git a/tink/mac/mac_config.cc b/tink/mac/mac_config.cc
index d8f86bfd..bf7ae81a 100644
--- a/tink/mac/mac_config.cc
+++ b/tink/mac/mac_config.cc
@@ -33,15 +33,6 @@ using google::crypto::tink::RegistryConfig;
 namespace crypto {
 namespace tink {
 
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-const RegistryConfig& MacConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status MacConfig::Register() {
   // Register primitive wrappers.
diff --git a/tink/mac/mac_config.h b/tink/mac/mac_config.h
index 0d986fff..1e482b0b 100644
--- a/tink/mac/mac_config.h
+++ b/tink/mac/mac_config.h
@@ -34,18 +34,6 @@ namespace tink {
 //
 class MacConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kCatalogueName[] = "TinkMac";
-  static constexpr char kPrimitiveName[] = "Mac";
-
-  // Returns config of Mac implementations supported
-  // in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers Mac primitive wrapper and key managers for all Mac key types
   // from the current Tink release.
   static crypto::tink::util::Status Register();
diff --git a/tink/signature/signature_config.cc b/tink/signature/signature_config.cc
index 7c48cabb..1de11e6b 100644
--- a/tink/signature/signature_config.cc
+++ b/tink/signature/signature_config.cc
@@ -38,15 +38,6 @@ using google::crypto::tink::RegistryConfig;
 namespace crypto {
 namespace tink {
 
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-const google::crypto::tink::RegistryConfig& SignatureConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status SignatureConfig::Register() {
   // Register primitive wrappers.
diff --git a/tink/signature/signature_config.h b/tink/signature/signature_config.h
index b7c06405..d1c333ae 100644
--- a/tink/signature/signature_config.h
+++ b/tink/signature/signature_config.h
@@ -37,21 +37,6 @@ namespace tink {
 //
 class SignatureConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kPublicKeySignCatalogueName[] = "TinkPublicKeySign";
-  static constexpr char kPublicKeyVerifyCatalogueName[] = "TinkPublicKeyVerify";
-  static constexpr char kPublicKeySignPrimitiveName[] = "PublicKeySign";
-  static constexpr char kPublicKeyVerifyPrimitiveName[] = "PublicKeyVerify";
-
-  // Returns config with implementations of PublicKeySign and PublicKeyVerify
-  // supported in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers PublicKeySign and PublicKeyVerify primitive wrappers, and key
   // managers for all implementations of PublicKeySign and PublicKeyVerify from
   // the current Tink release.
diff --git a/tink/streamingaead/streaming_aead_config.cc b/tink/streamingaead/streaming_aead_config.cc
index 38e2a95d..4f18175b 100644
--- a/tink/streamingaead/streaming_aead_config.cc
+++ b/tink/streamingaead/streaming_aead_config.cc
@@ -30,15 +30,6 @@ using google::crypto::tink::RegistryConfig;
 namespace crypto {
 namespace tink {
 
-// NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-// TINK-PENDING-REMOVAL-IN-2.0.0-START
-const RegistryConfig& StreamingAeadConfig::Latest() {
-  static const RegistryConfig* config = new RegistryConfig();
-  return *config;
-}
-// TINK-PENDING-REMOVAL-IN-2.0.0-END
-// NOLINTEND(whitespace/line_length)
-
 // static
 util::Status StreamingAeadConfig::Register() {
   // Register primitive wrapper.
diff --git a/tink/streamingaead/streaming_aead_config.h b/tink/streamingaead/streaming_aead_config.h
index d8614808..0ed5ea57 100644
--- a/tink/streamingaead/streaming_aead_config.h
+++ b/tink/streamingaead/streaming_aead_config.h
@@ -35,18 +35,6 @@ namespace tink {
 //
 class StreamingAeadConfig {
  public:
-  // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
-  // TINK-PENDING-REMOVAL-IN-2.0.0-START
-  static constexpr char kCatalogueName[] = "TinkStreamingAead";
-  static constexpr char kPrimitiveName[] = "StreamingAead";
-
-  // Returns config of StreamingAead implementations supported
-  // in the current Tink release.
-  ABSL_DEPRECATED("This is not supported anymore.")
-  static const google::crypto::tink::RegistryConfig& Latest();
-  // TINK-PENDING-REMOVAL-IN-2.0.0-END
-  // NOLINTEND(whitespace/line_length)
-
   // Registers StreamingAead primitive wrapper and key managers for all
   // StreamingAead key types from the current Tink release.
   static crypto::tink::util::Status Register();