diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile
index f10ad764ecf9c..a8b7458b411f8 100644
--- a/contrib/pg_tde/Makefile
+++ b/contrib/pg_tde/Makefile
@@ -1,5 +1,3 @@
-# contrib/pg_tde/Makefile
-
 PGFILEDESC = "pg_tde access method"
 MODULE_big = pg_tde
 EXTENSION = pg_tde
diff --git a/contrib/pg_tde/pg_tde--1.0-rc.sql b/contrib/pg_tde/pg_tde--1.0-rc.sql
index c9092e81ee66e..956aa25afb3e8 100644
--- a/contrib/pg_tde/pg_tde--1.0-rc.sql
+++ b/contrib/pg_tde/pg_tde--1.0-rc.sql
@@ -1,5 +1,3 @@
-/* contrib/pg_tde/pg_tde--1.0-rc.sql */
-
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_tde" to load this file. \quit
 
diff --git a/contrib/pg_tde/pg_tde.control b/contrib/pg_tde/pg_tde.control
index b72231dd1aa1e..73d135807fbe4 100644
--- a/contrib/pg_tde/pg_tde.control
+++ b/contrib/pg_tde/pg_tde.control
@@ -1,4 +1,3 @@
-# pg_tde extension
 comment = 'pg_tde access method'
 default_version = '1.0-rc'
 module_pathname = '$libdir/pg_tde'
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog.c b/contrib/pg_tde/src/access/pg_tde_xlog.c
index c0e1ba07510d4..131ee69914f8e 100644
--- a/contrib/pg_tde/src/access/pg_tde_xlog.c
+++ b/contrib/pg_tde/src/access/pg_tde_xlog.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * tdeheap_xlog.c
- *	  TDE XLog resource manager
- *
- *
- * IDENTIFICATION
- *	  src/access/pg_tde_xlog.c
- *
- *-------------------------------------------------------------------------
+/*
+ * TDE XLog resource manager
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog_smgr.c b/contrib/pg_tde/src/access/pg_tde_xlog_smgr.c
index aec73ba3612ef..bd08072aefdcc 100644
--- a/contrib/pg_tde/src/access/pg_tde_xlog_smgr.c
+++ b/contrib/pg_tde/src/access/pg_tde_xlog_smgr.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_xlog_smgr.c
- *	  Encrypted XLog storage manager
- *
- *
- * IDENTIFICATION
- *	  src/access/pg_tde_xlog_smgr.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Encrypted XLog storage manager
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/catalog/tde_keyring.c b/contrib/pg_tde/src/catalog/tde_keyring.c
index 918546e1f8cdb..80f5337066f1f 100644
--- a/contrib/pg_tde/src/catalog/tde_keyring.c
+++ b/contrib/pg_tde/src/catalog/tde_keyring.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * tde_keyring.c
- *      Deals with the tde keyring configuration
- *      routines.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/catalog/tde_keyring.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Deals with the tde keyring configuration routines.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c b/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c
index f9e8a1db87d85..e8714cb02692b 100644
--- a/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c
+++ b/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c
@@ -1,14 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * tde_keyring_parse_opts.c
- *      Parser routines for the keyring JSON options
+/*
+ * Parser routines for the keyring JSON options
  *
  * We expect one-dimentional JSON object with scalar fields
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c
- *
- *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/catalog/tde_principal_key.c b/contrib/pg_tde/src/catalog/tde_principal_key.c
index 2b53d9f561c44..4406c66dec5f5 100644
--- a/contrib/pg_tde/src/catalog/tde_principal_key.c
+++ b/contrib/pg_tde/src/catalog/tde_principal_key.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * tde_principal_key.c
- *      Deals with the tde principal key configuration catalog
- *      routines.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/catalog/tde_principal_key.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Deals with the tde principal key configuration catalog routines.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/common/pg_tde_utils.c b/contrib/pg_tde/src/common/pg_tde_utils.c
index 4a6602ce05f3e..ce2beaf3a9ad8 100644
--- a/contrib/pg_tde/src/common/pg_tde_utils.c
+++ b/contrib/pg_tde/src/common/pg_tde_utils.c
@@ -1,14 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_utils.c
- *      Utility functions.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/pg_tde_utils.c
- *
- *-------------------------------------------------------------------------
- */
-
 #include "postgres.h"
 
 #include "common/pg_tde_utils.h"
diff --git a/contrib/pg_tde/src/include/access/pg_tde_fe_init.h b/contrib/pg_tde/src/include/access/pg_tde_fe_init.h
index 3b2a6f2324b25..784c8952dee84 100644
--- a/contrib/pg_tde/src/include/access/pg_tde_fe_init.h
+++ b/contrib/pg_tde/src/include/access/pg_tde_fe_init.h
@@ -1,9 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_fe.h
- *	   Frontened definitions for encrypted XLog storage manager
- *
- *-------------------------------------------------------------------------
+/*
+ * Frontened definitions for encrypted XLog storage manager
  */
 
 #ifndef PG_TDE_FE_INIT_H
diff --git a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h
index 0ca77332a96f6..f7d99f735c890 100644
--- a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h
+++ b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h
@@ -1,10 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_tdemap.h
- *	  TDE relation fork manapulation.
- *
- *-------------------------------------------------------------------------
- */
 #ifndef PG_TDE_MAP_H
 #define PG_TDE_MAP_H
 
diff --git a/contrib/pg_tde/src/include/access/pg_tde_xlog.h b/contrib/pg_tde/src/include/access/pg_tde_xlog.h
index 5cf5e9c78b7d9..1dcd385b16acc 100644
--- a/contrib/pg_tde/src/include/access/pg_tde_xlog.h
+++ b/contrib/pg_tde/src/include/access/pg_tde_xlog.h
@@ -1,9 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * tdeheap_xlog.h
- *	  TDE XLog resource manager
- *
- *-------------------------------------------------------------------------
+/*
+ * TDE XLog resource manager
  */
 
 #ifndef PG_TDE_XLOG_H
diff --git a/contrib/pg_tde/src/include/access/pg_tde_xlog_smgr.h b/contrib/pg_tde/src/include/access/pg_tde_xlog_smgr.h
index ce8df4b8769e8..cb714ed34438a 100644
--- a/contrib/pg_tde/src/include/access/pg_tde_xlog_smgr.h
+++ b/contrib/pg_tde/src/include/access/pg_tde_xlog_smgr.h
@@ -1,9 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_xlog_smgr.h
- *	   Encrypted XLog storage manager
- *
- *-------------------------------------------------------------------------
+/*
+ * Encrypted XLog storage manager
  */
 
 #ifndef PG_TDE_XLOGSMGR_H
diff --git a/contrib/pg_tde/src/include/catalog/tde_global_space.h b/contrib/pg_tde/src/include/catalog/tde_global_space.h
index cd867aba3f1e5..faa2098a27f0c 100644
--- a/contrib/pg_tde/src/include/catalog/tde_global_space.h
+++ b/contrib/pg_tde/src/include/catalog/tde_global_space.h
@@ -1,11 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * tde_global_space.h
- *	  Global catalog key management
- *
- * src/include/catalog/tde_global_space.h
- *
- *-------------------------------------------------------------------------
+/*
+ * Global catalog key management
  */
 
 #ifndef TDE_GLOBAL_CATALOG_H
diff --git a/contrib/pg_tde/src/include/catalog/tde_keyring.h b/contrib/pg_tde/src/include/catalog/tde_keyring.h
index 5dd09f3e2c12a..db4a83ca02194 100644
--- a/contrib/pg_tde/src/include/catalog/tde_keyring.h
+++ b/contrib/pg_tde/src/include/catalog/tde_keyring.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * tde_keyring.h
- *	  TDE catalog handling
- *
- * src/include/catalog/tde_keyring.h
- *
- *-------------------------------------------------------------------------
+/*
+ * TDE catalog handling
  */
+
 #ifndef TDE_KEYRING_H
 #define TDE_KEYRING_H
 
diff --git a/contrib/pg_tde/src/include/catalog/tde_principal_key.h b/contrib/pg_tde/src/include/catalog/tde_principal_key.h
index 185a92292954a..a3294c73b02cb 100644
--- a/contrib/pg_tde/src/include/catalog/tde_principal_key.h
+++ b/contrib/pg_tde/src/include/catalog/tde_principal_key.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * tde_principal_key.h
- *	  TDE principal key handling
- *
- * src/include/catalog/tde_principal_key.h
- *
- *-------------------------------------------------------------------------
+/*
+ * TDE principal key handling
  */
+
 #ifndef PG_TDE_PRINCIPAL_KEY_H
 #define PG_TDE_PRINCIPAL_KEY_H
 
diff --git a/contrib/pg_tde/src/include/common/pg_tde_utils.h b/contrib/pg_tde/src/include/common/pg_tde_utils.h
index fc2062a0692ad..f91b53f1caa37 100644
--- a/contrib/pg_tde/src/include/common/pg_tde_utils.h
+++ b/contrib/pg_tde/src/include/common/pg_tde_utils.h
@@ -1,10 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_utils.h
- * src/include/common/pg_tde_utils.h
- *
- *-------------------------------------------------------------------------
- */
 #ifndef PG_TDE_UTILS_H
 #define PG_TDE_UTILS_H
 
diff --git a/contrib/pg_tde/src/include/encryption/enc_aes.h b/contrib/pg_tde/src/include/encryption/enc_aes.h
index 0b5269a5456ec..68b9416972fd6 100644
--- a/contrib/pg_tde/src/include/encryption/enc_aes.h
+++ b/contrib/pg_tde/src/include/encryption/enc_aes.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * end_aes.h
- *	  AES Encryption / Decryption routines using OpenSSL
- *
- * src/include/encryption/enc_aes.h
- *
- *-------------------------------------------------------------------------
+/*
+ * AES Encryption / Decryption routines using OpenSSL
  */
+
 #ifndef ENC_AES_H
 #define ENC_AES_H
 
diff --git a/contrib/pg_tde/src/include/encryption/enc_tde.h b/contrib/pg_tde/src/include/encryption/enc_tde.h
index 879733cc0a1af..93148dba244a6 100644
--- a/contrib/pg_tde/src/include/encryption/enc_tde.h
+++ b/contrib/pg_tde/src/include/encryption/enc_tde.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * enc_tde.h
- *	  Encryption / Decryption of functions for TDE
- *
- * src/include/encryption/enc_tde.h
- *
- *-------------------------------------------------------------------------
+/*
+ * Encryption / Decryption of functions for TDE
  */
+
 #ifndef ENC_TDE_H
 #define ENC_TDE_H
 
diff --git a/contrib/pg_tde/src/include/keyring/keyring_api.h b/contrib/pg_tde/src/include/keyring/keyring_api.h
index a137f67f94041..e282323c28377 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_api.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_api.h
@@ -1,11 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_api.h
- * src/include/keyring/keyring_api.h
- *
- *-------------------------------------------------------------------------
- */
-
 #ifndef KEYRING_API_H
 #define KEYRING_API_H
 
diff --git a/contrib/pg_tde/src/include/keyring/keyring_curl.h b/contrib/pg_tde/src/include/keyring/keyring_curl.h
index 6960ad0036d1b..a164a39b51d05 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_curl.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_curl.h
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_curl.h
- *      Contains common curl related methods.
- *
- * IDENTIFICATION
- * src/include/keyring/keyring_curl.h
- *
- *-------------------------------------------------------------------------
+/*
+ * Contains common curl related methods.
  */
 
 #ifndef KEYRING_CURL_H
diff --git a/contrib/pg_tde/src/include/keyring/keyring_file.h b/contrib/pg_tde/src/include/keyring/keyring_file.h
index a72e643464116..a671070dc28d5 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_file.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_file.h
@@ -1,11 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_file.h
- *	  File vault implementation
- *
- * src/include/keyring/keyring_file.h
- *
- *-------------------------------------------------------------------------
+/*
+ * File vault implementation
  */
 
 #ifndef KEYRING_FILE_H
diff --git a/contrib/pg_tde/src/include/keyring/keyring_kmip.h b/contrib/pg_tde/src/include/keyring/keyring_kmip.h
index fc55a5981351b..98b7e7863c815 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_kmip.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_kmip.h
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_kmip.h
- *      KMIP based keyring provider
- *
- * IDENTIFICATION
- * src/include/keyring/keyring_kmip.h
- *
- *-------------------------------------------------------------------------
+/*
+ * KMIP based keyring provider
  */
 
 #ifndef KEYRING_KMIP_H
diff --git a/contrib/pg_tde/src/include/keyring/keyring_kmip_impl.h b/contrib/pg_tde/src/include/keyring/keyring_kmip_impl.h
index df6f46105054c..357ff6c703e81 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_kmip_impl.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_kmip_impl.h
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_kmip_impl.h
- *      Intenrals for the KMIP based keyring provider
- *
- * IDENTIFICATION
- * src/include/keyring/keyring_kmip_impl.h
- *
- *-------------------------------------------------------------------------
+/*
+ * Internals for the KMIP based keyring provider
  */
 
 #ifndef KEYRING_KMIP_IMPL_H
diff --git a/contrib/pg_tde/src/include/keyring/keyring_vault.h b/contrib/pg_tde/src/include/keyring/keyring_vault.h
index 13f7b957e7d78..918027882466e 100644
--- a/contrib/pg_tde/src/include/keyring/keyring_vault.h
+++ b/contrib/pg_tde/src/include/keyring/keyring_vault.h
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_vault.h
- *      HashiCorp Vault 2 based keyring provider
- *
- * IDENTIFICATION
- * src/include/keyring/keyring_vault.h
- *
- *-------------------------------------------------------------------------
+/*
+ * HashiCorp Vault 2 based keyring provider
  */
 
 #ifndef KEYRING_VAULT_H
diff --git a/contrib/pg_tde/src/include/pg_tde.h b/contrib/pg_tde/src/include/pg_tde.h
index cdeff802ed7b1..652dc8eea18c6 100644
--- a/contrib/pg_tde/src/include/pg_tde.h
+++ b/contrib/pg_tde/src/include/pg_tde.h
@@ -1,10 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde.h
- * src/include/pg_tde.h
- *
- *-------------------------------------------------------------------------
- */
 #ifndef PG_TDE_H
 #define PG_TDE_H
 
diff --git a/contrib/pg_tde/src/include/pg_tde_defines.h b/contrib/pg_tde/src/include/pg_tde_defines.h
index c18faff36052f..b8daf01e0b7b8 100644
--- a/contrib/pg_tde/src/include/pg_tde_defines.h
+++ b/contrib/pg_tde/src/include/pg_tde_defines.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_defines.h
- *  Debug definitions for pg_tde
- *
- * src/include/pg_tde_defines.h
- *
- *-------------------------------------------------------------------------
+/*
+ * Debug definitions for pg_tde
  */
+
 #ifndef PG_TDE_DEFINES_H
 #define PG_TDE_DEFINES_H
 
diff --git a/contrib/pg_tde/src/include/pg_tde_event_capture.h b/contrib/pg_tde/src/include/pg_tde_event_capture.h
index cd9ddddf45b41..8a5e1d64bdb29 100644
--- a/contrib/pg_tde/src/include/pg_tde_event_capture.h
+++ b/contrib/pg_tde/src/include/pg_tde_event_capture.h
@@ -1,9 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_event_capture.h
- *
- *-------------------------------------------------------------------------
- */
 #ifndef PG_TDE_EVENT_CAPTURE_H
 #define PG_TDE_EVENT_CAPTURE_H
 
diff --git a/contrib/pg_tde/src/include/pg_tde_fe.h b/contrib/pg_tde/src/include/pg_tde_fe.h
index 79c1c4f4fa72e..6ef811b2b98ec 100644
--- a/contrib/pg_tde/src/include/pg_tde_fe.h
+++ b/contrib/pg_tde/src/include/pg_tde_fe.h
@@ -1,12 +1,7 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_fe.h
- * 		TDE redefinitions for frontend included code
- *
- * src/include/pg_tde_fe.h
- *
- *-------------------------------------------------------------------------
+/*
+ * TDE redefinitions for frontend included code
  */
+
 #ifndef PG_TDE_EREPORT_H
 #define PG_TDE_EREPORT_H
 
diff --git a/contrib/pg_tde/src/include/pg_tde_guc.h b/contrib/pg_tde/src/include/pg_tde_guc.h
index b576e7900b356..a48d0fd6f0294 100644
--- a/contrib/pg_tde/src/include/pg_tde_guc.h
+++ b/contrib/pg_tde/src/include/pg_tde_guc.h
@@ -1,11 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_guc.h
- *	  GUC variables for pg_tde
- *
- * src/include/pg_tde_guc.h
- *
- *-------------------------------------------------------------------------
+/*
+ * GUC variables for pg_tde
  */
 
 #ifndef TDE_GUC_H
diff --git a/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h b/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h
index 31a0d525f4fe6..a97421cfef914 100644
--- a/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h
+++ b/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h
@@ -1,11 +1,3 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_smgr.h
- * src/include/smgr/pg_tde_smgr.h
- *
- *-------------------------------------------------------------------------
- */
-
 #ifndef PG_TDE_SMGR_H
 #define PG_TDE_SMGR_H
 
diff --git a/contrib/pg_tde/src/keyring/keyring_curl.c b/contrib/pg_tde/src/keyring/keyring_curl.c
index 2a4abb601e532..1f2966a8833ba 100644
--- a/contrib/pg_tde/src/keyring/keyring_curl.c
+++ b/contrib/pg_tde/src/keyring/keyring_curl.c
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_curl.c
- *      Contains common curl related methods.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/keyring/keyring_curl.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Contains common curl related methods.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/keyring/keyring_file.c b/contrib/pg_tde/src/keyring/keyring_file.c
index 291fd38f2fb76..a394260cac7fd 100644
--- a/contrib/pg_tde/src/keyring/keyring_file.c
+++ b/contrib/pg_tde/src/keyring/keyring_file.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_file.c
- *	  Implements the file provider keyring
- *	  routines.
- *
- * IDENTIFICATION
- *	contrib/pg_tde/src/keyring/keyring_file.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Implements the file provider keyring routines.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/keyring/keyring_kmip.c b/contrib/pg_tde/src/keyring/keyring_kmip.c
index 12dbcab8d163d..15dc35692dc14 100644
--- a/contrib/pg_tde/src/keyring/keyring_kmip.c
+++ b/contrib/pg_tde/src/keyring/keyring_kmip.c
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_kmip.c
- *      KMIP based keyring provider
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/keyring/keyring_kmip.c
- *
- *-------------------------------------------------------------------------
+/*
+ * KMIP based keyring provider
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/keyring/keyring_vault.c b/contrib/pg_tde/src/keyring/keyring_vault.c
index 55357e8827396..e88b423fb1d79 100644
--- a/contrib/pg_tde/src/keyring/keyring_vault.c
+++ b/contrib/pg_tde/src/keyring/keyring_vault.c
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * keyring_vault.c
- *      HashiCorp Vault 2 based keyring provider
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/keyring/keyring_vault.c
- *
- *-------------------------------------------------------------------------
+/*
+ * HashiCorp Vault 2 based keyring provider
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/pg_tde.c b/contrib/pg_tde/src/pg_tde.c
index 216d6a1f3c6cb..d7738ed869dac 100644
--- a/contrib/pg_tde/src/pg_tde.c
+++ b/contrib/pg_tde/src/pg_tde.c
@@ -1,13 +1,6 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde.c
- *      Main file: setup GUCs, shared memory, hooks and other general-purpose
- *      routines.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/pg_tde.c
- *
- *-------------------------------------------------------------------------
+/*
+ * Main file: setup GUCs, shared memory, hooks and other general-purpose
+ * routines.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/pg_tde_event_capture.c b/contrib/pg_tde/src/pg_tde_event_capture.c
index 5124f209781a2..43ee36cbecfd9 100644
--- a/contrib/pg_tde/src/pg_tde_event_capture.c
+++ b/contrib/pg_tde/src/pg_tde_event_capture.c
@@ -1,12 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_event_capture.c
- *      event trigger logic to identify if we are creating the encrypted table or not.
- *
- * IDENTIFICATION
- *    contrib/pg_tde/src/pg_tde_event_trigger.c
- *
- *-------------------------------------------------------------------------
+/*
+ * event trigger logic to identify if we are creating the encrypted table or not.
  */
 
 #include "postgres.h"
diff --git a/contrib/pg_tde/src/pg_tde_guc.c b/contrib/pg_tde/src/pg_tde_guc.c
index 8b82c3338bc71..fe724d1c91595 100644
--- a/contrib/pg_tde/src/pg_tde_guc.c
+++ b/contrib/pg_tde/src/pg_tde_guc.c
@@ -1,13 +1,5 @@
-/*-------------------------------------------------------------------------
- *
- * pg_tde_guc.c
- *	  GUC variables for pg_tde
- *
- *
- * IDENTIFICATION
- *	  src/pg_tde_guc.c
- *
- *-------------------------------------------------------------------------
+/*
+ * GUC variables for pg_tde
  */
 
 #include "postgres.h"