diff --git a/CRM/Core/Key.php b/CRM/Core/Key.php
index 83317ac14946..637a3a61476f 100644
--- a/CRM/Core/Key.php
+++ b/CRM/Core/Key.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 class CRM_Core_Key {
   public static $_key = NULL;
diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php
index 45d6c96c8e51..da1366b4243a 100644
--- a/CRM/Core/Lock.php
+++ b/CRM/Core/Lock.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 class CRM_Core_Lock implements \Civi\Core\Lock\LockInterface {
 
diff --git a/CRM/Core/Page/AJAX.php b/CRM/Core/Page/AJAX.php
index ccbcd67251f9..17a0fe8f6ef9 100644
--- a/CRM/Core/Page/AJAX.php
+++ b/CRM/Core/Page/AJAX.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Page/File.php b/CRM/Core/Page/File.php
index 0ad98467e8b5..a0a8636c09b5 100644
--- a/CRM/Core/Page/File.php
+++ b/CRM/Core/Page/File.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 class CRM_Core_Page_File extends CRM_Core_Page {
 
diff --git a/CRM/Core/Page/Inline/Help.php b/CRM/Core/Page/Inline/Help.php
index 773f73b57304..0e0e01ae0bd9 100644
--- a/CRM/Core/Page/Inline/Help.php
+++ b/CRM/Core/Page/Inline/Help.php
@@ -12,8 +12,6 @@
 /**
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Permission/Drupal.php b/CRM/Core/Permission/Drupal.php
index 839120520a73..73179d457505 100644
--- a/CRM/Core/Permission/Drupal.php
+++ b/CRM/Core/Permission/Drupal.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Permission/Joomla.php b/CRM/Core/Permission/Joomla.php
index ce338d1c5ede..42d551dd194a 100644
--- a/CRM/Core/Permission/Joomla.php
+++ b/CRM/Core/Permission/Joomla.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Permission/Soap.php b/CRM/Core/Permission/Soap.php
index be856fcbec22..b6add618a227 100644
--- a/CRM/Core/Permission/Soap.php
+++ b/CRM/Core/Permission/Soap.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Permission/Temp.php b/CRM/Core/Permission/Temp.php
index d8f6af1913cf..2f7e32850fb1 100644
--- a/CRM/Core/Permission/Temp.php
+++ b/CRM/Core/Permission/Temp.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Permission/UnitTests.php b/CRM/Core/Permission/UnitTests.php
index 1a282d998659..24879ab5a343 100644
--- a/CRM/Core/Permission/UnitTests.php
+++ b/CRM/Core/Permission/UnitTests.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php
index 8c5f573a8630..390a8e73030e 100644
--- a/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php b/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
index 0e7530f308fb..1a4009e916ca 100644
--- a/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
+++ b/CRM/Core/Smarty/plugins/modifier.crmNumberFormat.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Smarty/plugins/modifier.crmReplace.php b/CRM/Core/Smarty/plugins/modifier.crmReplace.php
index 8dc174bd343f..a6ea517e653d 100644
--- a/CRM/Core/Smarty/plugins/modifier.crmReplace.php
+++ b/CRM/Core/Smarty/plugins/modifier.crmReplace.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Core/Transaction.php b/CRM/Core/Transaction.php
index a2297bee1f2d..f2030606b6f8 100644
--- a/CRM/Core/Transaction.php
+++ b/CRM/Core/Transaction.php
@@ -14,7 +14,6 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @copyright David Strauss <david@fourkitchens.com> (c) 2007
- * $Id$
  *
  * (Note: This has been considerably rewritten; the interface is preserved
  * for backward compatibility.)
diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
index 90d87917edaa..a47e75c4cdf7 100644
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ b/CRM/Custom/Form/ChangeFieldType.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Custom/Form/Preview.php b/CRM/Custom/Form/Preview.php
index e8a6a08dfc62..102712d94d0d 100644
--- a/CRM/Custom/Form/Preview.php
+++ b/CRM/Custom/Form/Preview.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Custom/Import/Form/DataSource.php b/CRM/Custom/Import/Form/DataSource.php
index b7c9a6df0a8d..751969385c31 100644
--- a/CRM/Custom/Import/Form/DataSource.php
+++ b/CRM/Custom/Import/Form/DataSource.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php
index 773e9ac18690..5269cec1c2c4 100644
--- a/CRM/Dedupe/BAO/RuleGroup.php
+++ b/CRM/Dedupe/BAO/RuleGroup.php
@@ -13,8 +13,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 /**
diff --git a/Civi/Api4/Domain.php b/Civi/Api4/Domain.php
index c72a1d2c46f1..a8a40cac74d4 100644
--- a/Civi/Api4/Domain.php
+++ b/Civi/Api4/Domain.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Email.php b/Civi/Api4/Email.php
index 92cdf955fd88..cfb9ef99e868 100644
--- a/Civi/Api4/Email.php
+++ b/Civi/Api4/Email.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Entity.php b/Civi/Api4/Entity.php
index 17b17f45c789..cdb0ef6f7a89 100644
--- a/Civi/Api4/Entity.php
+++ b/Civi/Api4/Entity.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Event.php b/Civi/Api4/Event.php
index a55396c70c1b..66c504a5341b 100644
--- a/Civi/Api4/Event.php
+++ b/Civi/Api4/Event.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Event/Events.php b/Civi/Api4/Event/Events.php
index c5247695c5fb..83ef7b4c97c3 100644
--- a/Civi/Api4/Event/Events.php
+++ b/Civi/Api4/Event/Events.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Event/PostSelectQueryEvent.php b/Civi/Api4/Event/PostSelectQueryEvent.php
index f57cd298f61d..7fd6ce93f4c9 100644
--- a/Civi/Api4/Event/PostSelectQueryEvent.php
+++ b/Civi/Api4/Event/PostSelectQueryEvent.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/GroupContact.php b/Civi/Api4/GroupContact.php
index 8c04cb68f9f6..98e0eb626896 100644
--- a/Civi/Api4/GroupContact.php
+++ b/Civi/Api4/GroupContact.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 namespace Civi\Api4;
diff --git a/Civi/Api4/GroupNesting.php b/Civi/Api4/GroupNesting.php
index 96276beee6a4..10e6b8d17430 100644
--- a/Civi/Api4/GroupNesting.php
+++ b/Civi/Api4/GroupNesting.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 namespace Civi\Api4;
diff --git a/Civi/Api4/MappingField.php b/Civi/Api4/MappingField.php
index 16cf57ad5678..23cb5e0ca964 100644
--- a/Civi/Api4/MappingField.php
+++ b/Civi/Api4/MappingField.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 namespace Civi\Api4;
diff --git a/Civi/Api4/OptionValue.php b/Civi/Api4/OptionValue.php
index 98e9cae38857..09f741ebb66b 100644
--- a/Civi/Api4/OptionValue.php
+++ b/Civi/Api4/OptionValue.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/CustomGroupCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/CustomGroupCreationSpecProvider.php
index c3f422cd1734..925f415681ef 100644
--- a/Civi/Api4/Service/Spec/Provider/CustomGroupCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/CustomGroupCreationSpecProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php b/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
index edcfd3916de8..19c4cdbb6c9a 100644
--- a/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/DefaultLocationTypeProvider.php b/Civi/Api4/Service/Spec/Provider/DefaultLocationTypeProvider.php
index 4a3f1b7449f9..7c3216316174 100644
--- a/Civi/Api4/Service/Spec/Provider/DefaultLocationTypeProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/DefaultLocationTypeProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
index ffad166d5864..a7b0dd8a7ef8 100644
--- a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/EntityTagCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/EntityTagCreationSpecProvider.php
index e994466e5d4e..87f94da38da9 100644
--- a/Civi/Api4/Service/Spec/Provider/EntityTagCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/EntityTagCreationSpecProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/EventCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/EventCreationSpecProvider.php
index b8d8e04cf738..7e63ff5437aa 100644
--- a/Civi/Api4/Service/Spec/Provider/EventCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/EventCreationSpecProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php b/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
index 5d42a723667f..a9768949a043 100644
--- a/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
+++ b/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Service/Spec/Provider/GetActionDefaultsProvider.php b/Civi/Api4/Service/Spec/Provider/GetActionDefaultsProvider.php
index 629cff435d3c..fd8698d74d5e 100644
--- a/Civi/Api4/Service/Spec/Provider/GetActionDefaultsProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/GetActionDefaultsProvider.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/UFMatch.php b/Civi/Api4/UFMatch.php
index d056ebb6f557..de7500ee02b9 100644
--- a/Civi/Api4/UFMatch.php
+++ b/Civi/Api4/UFMatch.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/Civi/Api4/Utils/FormattingUtil.php b/Civi/Api4/Utils/FormattingUtil.php
index 77e50db8f537..900df21ccfe8 100644
--- a/Civi/Api4/Utils/FormattingUtil.php
+++ b/Civi/Api4/Utils/FormattingUtil.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
diff --git a/tests/phpunit/api/v4/Traits/OptionCleanupTrait.php b/tests/phpunit/api/v4/Traits/OptionCleanupTrait.php
index e9bf2488556b..c2571aa64e96 100644
--- a/tests/phpunit/api/v4/Traits/OptionCleanupTrait.php
+++ b/tests/phpunit/api/v4/Traits/OptionCleanupTrait.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 namespace api\v4\Traits;
diff --git a/tests/phpunit/api/v4/Traits/QueryCounterTrait.php b/tests/phpunit/api/v4/Traits/QueryCounterTrait.php
index 81c97b05e0bc..eb62fdcd3687 100644
--- a/tests/phpunit/api/v4/Traits/QueryCounterTrait.php
+++ b/tests/phpunit/api/v4/Traits/QueryCounterTrait.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */