diff --git a/api/class.api.php b/api/class.api.php
index 298427286b3533e92badfa1e8ade2922ee6fdbf1..f848ec9cf7a6e78a106e39ee18f551a848a15f45 100644
--- a/api/class.api.php
+++ b/api/class.api.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
 
diff --git a/api/v2/Case.php b/api/v2/Case.php
index ed7ee7e7be14165ab92824d3fd59eca84baa03d0..8836376a3f54abb14ce09992bed96990f919278d 100644
--- a/api/v2/Case.php
+++ b/api/v2/Case.php
@@ -238,10 +238,10 @@ function civicrm_case_get(&$params) {
     }
 
     $sql = "
-SELECT DISTINCT case_id 
-  FROM civicrm_relationship 
- WHERE (contact_id_a = $contact 
-    OR contact_id_b = $contact) 
+SELECT DISTINCT case_id
+  FROM civicrm_relationship
+ WHERE (contact_id_a = $contact
+    OR contact_id_b = $contact)
    AND case_id IS NOT NULL";
     $dao = CRM_Core_DAO::executeQuery($sql);
 
@@ -470,7 +470,7 @@ function _civicrm_case_format_params(&$params, $mode) {
       if (!$params['case_type_id']) {
         $sql = "
 SELECT  ov.value
-  FROM  civicrm_option_value ov 
+  FROM  civicrm_option_value ov
   JOIN  civicrm_option_group og ON og.id = ov.option_group_id
  WHERE  ov.label = %1 AND og.name = 'case_type'";
 
diff --git a/api/v2/Contact.php b/api/v2/Contact.php
index 33a8616c297a90f0ea21978e27899c05d0a5c68d..44aa1adedbd383132b3e201a385293332b305b57 100644
--- a/api/v2/Contact.php
+++ b/api/v2/Contact.php
@@ -472,7 +472,7 @@ function _civicrm_contact_get_deprecated(&$params) {
 /**
  * Delete a contact with given contact id
  *
- * @param  array   	  $params (reference ) input parameters, contact_id element required
+ * @param  array       $params (reference ) input parameters, contact_id element required
  *
  * @return boolean        true if success, else false
  * @static void
diff --git a/api/v3/ActivityType.php b/api/v3/ActivityType.php
index d8b9490639041e415c3ad37946e6432688f1ab62..cc92b29102ce34a3364371a50bd259fa410f1caa 100644
--- a/api/v3/ActivityType.php
+++ b/api/v3/ActivityType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -90,7 +89,7 @@ function civicrm_api3_activity_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Address.php b/api/v3/Address.php
index cfb839c7be03b267034203614918165a26943c6d..1f4c3a7106266660f68f597689cff37e108154ad 100644
--- a/api/v3/Address.php
+++ b/api/v3/Address.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Batch.php b/api/v3/Batch.php
index 1fc7f84d2917b573aa59caa0794c09151e2ca74a..64a03901b30897118442bce67b2c9fa94d679809 100644
--- a/api/v3/Batch.php
+++ b/api/v3/Batch.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Campaign.php b/api/v3/Campaign.php
index 6f047a1a231aa9a203a74049e6e0e3c76ec46894..d9b4e22b16e87ac6985ba5d45be4d939c02ed268 100644
--- a/api/v3/Campaign.php
+++ b/api/v3/Campaign.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -55,7 +54,7 @@ function civicrm_api3_campaign_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Case.php b/api/v3/Case.php
index 5f6d4d0debb768c71a35bbdb3224f128fdfe8f92..856b335a4e64780d9d19e0e0159d9fe059baa614 100644
--- a/api/v3/Case.php
+++ b/api/v3/Case.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
   +--------------------------------------------------------------------+
diff --git a/api/v3/Constant.php b/api/v3/Constant.php
index 51af6e2ff782b4c4d1a185da8651558594552eed..b7987c3b8aebfae567f24ecde26704ecc73e1998 100644
--- a/api/v3/Constant.php
+++ b/api/v3/Constant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ContactType.php b/api/v3/ContactType.php
index f70b4116f3419d19e8ebe7678d390428e065db36..aa1a6db4be064bd115bc5087695d69182a966636 100644
--- a/api/v3/ContactType.php
+++ b/api/v3/ContactType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 6c3387b34cbf3f70653a8cacac63b8648f1b57b0..391463f4c0df7dd3469d2a5986afbb090c916121 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ContributionRecur.php b/api/v3/ContributionRecur.php
index 31cfc4198f705c432b5b643a7cec2c66502c15fd..31320424827cf3a1fee464e75d666fe9540cbf6c 100644
--- a/api/v3/ContributionRecur.php
+++ b/api/v3/ContributionRecur.php
@@ -50,7 +50,7 @@ function civicrm_api3_contribution_recur_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/CustomField.php b/api/v3/CustomField.php
index 0b65242c577dbcb92bea5f423b9bd1612676e637..149075df6de50b9bdc24e3c22e88e0006e01b6ca 100644
--- a/api/v3/CustomField.php
+++ b/api/v3/CustomField.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -93,7 +92,7 @@ function civicrm_api3_custom_field_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * @param array $params array or parameters determined by getfields
  */
 function _civicrm_api3_custom_field_create_spec(&$params) {
@@ -134,11 +133,11 @@ function civicrm_api3_custom_field_get($params) {
 }
 
 /*
- * Helper function to validate custom field values 
- * 
+ * Helper function to validate custom field values
+ *
  * @params Array   $params             Custom fields with values
- * @params Array   $errors             Reference fields to be check with 
- * @params Boolean $checkForDisallowed Check for disallowed elements 
+ * @params Array   $errors             Reference fields to be check with
+ * @params Boolean $checkForDisallowed Check for disallowed elements
  *                                     in params
  * @params Boolean $checkForRequired   Check for non present required elements
  *                                     in params
@@ -147,7 +146,7 @@ function civicrm_api3_custom_field_get($params) {
 
 /**
  * Helper function to validate custom field value
- * 
+ *
  * @params String $fieldName    Custom field name (eg: custom_8 )
  * @params Mixed  $value        Field value to be validate
  * @params Array  $fieldDetails Field Details
@@ -233,7 +232,7 @@ function _civicrm_api3_custom_field_validate_field($fieldName, $value, $fieldDet
       }
 
       $query = "
-SELECT count(*) 
+SELECT count(*)
   FROM civicrm_state_province
  WHERE id IN ('" . implode("','", $value) . "')";
       if (CRM_Core_DAO::singleValueQuery($query) < count($value)) {
diff --git a/api/v3/CustomGroup.php b/api/v3/CustomGroup.php
index 37d17fab4767dbfa4ccd461c78c7e12a49c324c3..e5c06c3d003f219ce41c1fe264ebc260f19a7b74 100644
--- a/api/v3/CustomGroup.php
+++ b/api/v3/CustomGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/CustomValue.php b/api/v3/CustomValue.php
index 90724a691041e89292e436f216d63279ef653ab0..92bd6ee857b4547ce5e0da7903468395db534245 100644
--- a/api/v3/CustomValue.php
+++ b/api/v3/CustomValue.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Domain.php b/api/v3/Domain.php
index 0af1ed486bb5231986dd98f2a5468a4b7b92a975..1650d8fc91bc4e231a7d95544c696a7a0a9e94b1 100644
--- a/api/v3/Domain.php
+++ b/api/v3/Domain.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Email.php b/api/v3/Email.php
index c6b688de35ee57c9bcbd45f4f62e196437d4aed4..822548e9db296bec10979828297bc1dd5cf5d74d 100644
--- a/api/v3/Email.php
+++ b/api/v3/Email.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -54,7 +53,7 @@ function civicrm_api3_email_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Entity.php b/api/v3/Entity.php
index 9a2a935c353b17066eb605307416eb909cbcda7a..d727fc58756fab59ed1214952a17acdd097023ff 100644
--- a/api/v3/Entity.php
+++ b/api/v3/Entity.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 require_once 'api/v3/utils.php';
 
diff --git a/api/v3/EntityTag.php b/api/v3/EntityTag.php
index 62409dcb4706ce2777e54def02913f280ffde561..ed36e5a6b7107841ae706d03ba388b8afa1f2d4e 100644
--- a/api/v3/EntityTag.php
+++ b/api/v3/EntityTag.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Event.php b/api/v3/Event.php
index 569456efe103c42e64a37ffd278ebaa0efadc8ab..8158765f26f5d5b1974f112d1f728823da4034fd 100644
--- a/api/v3/Event.php
+++ b/api/v3/Event.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Extension.php b/api/v3/Extension.php
index 3bcd9948c5bc4b64a9d2d62eb84f7c5a13068c75..8d5a2e457a81de139cfd63dafd01631690289a28 100644
--- a/api/v3/Extension.php
+++ b/api/v3/Extension.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 define('API_V3_EXTENSION_DELIMITER', ',');
 
diff --git a/api/v3/File.php b/api/v3/File.php
index aec82c9bbaf608acce3186acf3d639b01d1fe169..bb2d3c06642acc7f5f822f22a4fece254eb48eb8 100644
--- a/api/v3/File.php
+++ b/api/v3/File.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index 71eaf93af6c11ca3137ce242c72edbf1d01c06b3..250a353b0467bc18de8c8fe7bc9f936c603e1783 100644
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Get information about fields for a given api request. Getfields information
diff --git a/api/v3/Generic/Getactions.php b/api/v3/Generic/Getactions.php
index e7743ae6bce6796a8698ce5388066c96a290576a..50c9548afe903292b668739070353f8fb9fa3729 100644
--- a/api/v3/Generic/Getactions.php
+++ b/api/v3/Generic/Getactions.php
@@ -1,5 +1,30 @@
 <?php
-// $Id$
+
+/*
+ +--------------------------------------------------------------------+
+| CiviCRM version 4.3                                                |
++--------------------------------------------------------------------+
+| Copyright CiviCRM LLC (c) 2004-2013                                |
++--------------------------------------------------------------------+
+| This file is a part of CiviCRM.                                    |
+|                                                                    |
+| CiviCRM is free software; you can copy, modify, and distribute it  |
+| under the terms of the GNU Affero General Public License           |
+| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+|                                                                    |
+| CiviCRM is distributed in the hope that it will be useful, but     |
+| WITHOUT ANY WARRANTY; without even the implied warranty of         |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+| See the GNU Affero General Public License for more details.        |
+|                                                                    |
+| You should have received a copy of the GNU Affero General Public   |
+| License and the CiviCRM Licensing Exception along                  |
+| with this program; if not, contact CiviCRM LLC                     |
+| at info[AT]civicrm[DOT]org. If you have questions about the        |
+| GNU Affero General Public License or the licensing of CiviCRM,     |
+| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
++--------------------------------------------------------------------+
+*/
 
 function civicrm_api3_generic_getActions($params) {
   civicrm_api3_verify_mandatory($params, NULL, array('entity'));
diff --git a/api/v3/Generic/Update.php b/api/v3/Generic/Update.php
index 6de91c74646c042b65734d76667dbe88d205b542..ec453fb28306f4a210c2550c3cd04153aaa1e85e 100644
--- a/api/v3/Generic/Update.php
+++ b/api/v3/Generic/Update.php
@@ -1,5 +1,30 @@
 <?php
-// $Id$
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
 
 /**
  * Update function is basically a hack to get around issues listed in
diff --git a/api/v3/Grant.php b/api/v3/Grant.php
index 348e73b1e8d68b29ddf5ac29b22eb330435900fd..6eeec6400116fe579ef2f055cd5f05564f539a74 100644
--- a/api/v3/Grant.php
+++ b/api/v3/Grant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Group.php b/api/v3/Group.php
index c37fe2f1fda43958232f462009e88c548ba573d2..440f040604a7c46eae152d6312cc89c7c89374cb 100644
--- a/api/v3/Group.php
+++ b/api/v3/Group.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/GroupNesting.php b/api/v3/GroupNesting.php
index 2db1fa8c7d6ccc749a34f75605720d1f968d7788..3aca06e1ec7172b8cb1a3b6296e965a112cd0a13 100644
--- a/api/v3/GroupNesting.php
+++ b/api/v3/GroupNesting.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -72,7 +71,7 @@ function civicrm_api3_group_nesting_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/GroupOrganization.php b/api/v3/GroupOrganization.php
index efb94837653fadfab633cec8fbf5e129ebe39411..9aa2e1bfe32799f65485f606f0ba4fd90dcf8368 100644
--- a/api/v3/GroupOrganization.php
+++ b/api/v3/GroupOrganization.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -78,7 +77,7 @@ function civicrm_api3_group_organization_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Location.php b/api/v3/Location.php
index 345f9c0e3c130baebc824ec9890179e9fe6c3224..739eaa3b89abb365bb4d00b852d90b305b5089a4 100644
--- a/api/v3/Location.php
+++ b/api/v3/Location.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 require_once 'api/v3/utils.php';
 
diff --git a/api/v3/LocationType.php b/api/v3/LocationType.php
index 83ad6a58de1de148f3a43e93e3ef8482709e2ffc..ddf9a120c5fd2474fc55398c0b2cff6f257412ca 100644
--- a/api/v3/LocationType.php
+++ b/api/v3/LocationType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailSettings.php b/api/v3/MailSettings.php
index 0f34bf6a51e706d41689afc7212c4cdbf1910083..be234b78747f369a60b12d01b14d76c73b199b19 100644
--- a/api/v3/MailSettings.php
+++ b/api/v3/MailSettings.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php
index 44a6f6a579fa83e1309087e1220513d3f972f11e..5f8ec91cc88bb3976ff119be51e8967c0ae52e94 100644
--- a/api/v3/Mailing.php
+++ b/api/v3/Mailing.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingEventConfirm.php b/api/v3/MailingEventConfirm.php
index 04b20b47e260b7e7aacf72e293852bdc819c3c04..e59f5b7474c84c49b695d32c9579d8d315b3c769 100644
--- a/api/v3/MailingEventConfirm.php
+++ b/api/v3/MailingEventConfirm.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -64,7 +63,7 @@ function civicrm_api3_mailing_event_confirm_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventResubscribe.php b/api/v3/MailingEventResubscribe.php
index 4dcac85bec8f230201a231b0d54c4982fbd4170c..f6ee1bf9075531e7940219a685bfa4593bdae938 100644
--- a/api/v3/MailingEventResubscribe.php
+++ b/api/v3/MailingEventResubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -69,7 +68,7 @@ function civicrm_api3_mailing_event_resubscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventSubscribe.php b/api/v3/MailingEventSubscribe.php
index 3730d90bdb08163c5d799dff4c5897b177ae061c..9ec4744c39dca52434c1a6d409f564d8e2aa69de 100644
--- a/api/v3/MailingEventSubscribe.php
+++ b/api/v3/MailingEventSubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -81,7 +80,7 @@ function civicrm_api3_mailing_event_subscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventUnsubscribe.php b/api/v3/MailingEventUnsubscribe.php
index 485651985a8f0913f612164697bac17e8e422105..efdee308cc237ecfd88d2a9d53ff7a7b1186e3a6 100644
--- a/api/v3/MailingEventUnsubscribe.php
+++ b/api/v3/MailingEventUnsubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -77,7 +76,7 @@ function civicrm_api3_mailing_event_unsubscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingGroup.php b/api/v3/MailingGroup.php
index b9ac904baae4aa23d81c00be64eb44ab3a93be0f..3f7a6ada837eb3fb7c450ab36a7ae52788ce5adf 100644
--- a/api/v3/MailingGroup.php
+++ b/api/v3/MailingGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingJob.php b/api/v3/MailingJob.php
index 15b6afa5d0705ba421e2a1a00e1ab3696eabd39a..9b761819529f617be123a9f937e125bc36adf7de 100644
--- a/api/v3/MailingJob.php
+++ b/api/v3/MailingJob.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingRecipients.php b/api/v3/MailingRecipients.php
index 3f7213e3c62cd73248d5af1d19bc0a4214821c07..f8568a2e7f74e3b4114dd707523bc8515ed6f5a0 100644
--- a/api/v3/MailingRecipients.php
+++ b/api/v3/MailingRecipients.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Membership.php b/api/v3/Membership.php
index 5b337bd723aa5191e37275bf7ecc7f374d2292f3..95345c1c9106d589c59036bc8cdece9977a6d08c 100644
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MembershipPayment.php b/api/v3/MembershipPayment.php
index f75e8a8cdfcf84a62ad93a81c3fc8afda18f6416..b4332ac813c03269b7a03e7ef66cca1f49fe6a62 100644
--- a/api/v3/MembershipPayment.php
+++ b/api/v3/MembershipPayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -70,7 +69,7 @@ function civicrm_api3_membership_payment_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MembershipStatus.php b/api/v3/MembershipStatus.php
index c974d59278ec10d11d5565a8e7dc7788e70db857..0d82d83da3922fbb40261b178998f400763f1851 100644
--- a/api/v3/MembershipStatus.php
+++ b/api/v3/MembershipStatus.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MembershipType.php b/api/v3/MembershipType.php
index 30f9e5f103785ca9a0aa59da89ef0eadd158d836..b29899383e522be6a53782691e5fa8d88b1fd1af 100644
--- a/api/v3/MembershipType.php
+++ b/api/v3/MembershipType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -65,7 +64,7 @@ function civicrm_api3_membership_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Note.php b/api/v3/Note.php
index 18d39198817df3f7f071f269c9f2b94641afd896..9595264b038c09dd8ab0650bcbc7267485734291 100644
--- a/api/v3/Note.php
+++ b/api/v3/Note.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -77,7 +76,7 @@ function civicrm_api3_note_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
@@ -123,7 +122,7 @@ function civicrm_api3_note_get($params) {
 
 /**
  * Adjust Metadata for Get action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/OptionGroup.php b/api/v3/OptionGroup.php
index 53d954da3aeeae3040309518cb1aed397dc8caf1..8d0706d6abcdd7acfca0755ff3fc68a4a6a5e3e4 100644
--- a/api/v3/OptionGroup.php
+++ b/api/v3/OptionGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function civicrm_api3_option_group_get($params) {
 
@@ -37,7 +36,7 @@ function civicrm_api3_option_group_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/OptionValue.php b/api/v3/OptionValue.php
index de9c61394998603a33be2554c658ddd3652753ad..772a0d54656eee966bfa662134d8c3b38ff0fc15 100644
--- a/api/v3/OptionValue.php
+++ b/api/v3/OptionValue.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Retrieve one or more OptionValues
diff --git a/api/v3/Participant.php b/api/v3/Participant.php
index e3d1c74123ffe8d1f6ef18ae6c2c4e2edcfb1dbb..71c0980416f44f5bf15d475e44a64b3fc54377ae 100644
--- a/api/v3/Participant.php
+++ b/api/v3/Participant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ParticipantPayment.php b/api/v3/ParticipantPayment.php
index 3eae0632927b584a3d8fea8f7b8aa97beabb266d..f2d3dccfd76f1f029de06a4b093229b21f2ddf36 100644
--- a/api/v3/ParticipantPayment.php
+++ b/api/v3/ParticipantPayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -72,7 +71,7 @@ function civicrm_api3_participant_payment_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/ParticipantStatusType.php b/api/v3/ParticipantStatusType.php
index 7c43d7cd8f4f30dfed01dff714dcedbf093b55bd..7ca0e1f9f2878075b43193017c06a8a3097eae49 100644
--- a/api/v3/ParticipantStatusType.php
+++ b/api/v3/ParticipantStatusType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/PaymentProcessorType.php b/api/v3/PaymentProcessorType.php
index d7b6ba1c773aa9c55cf2d75c9d2fc93e99ddd1a6..eb8d57f4fabbda173e22b7af71f5444d0f0542e3 100644
--- a/api/v3/PaymentProcessorType.php
+++ b/api/v3/PaymentProcessorType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Phone.php b/api/v3/Phone.php
index 330de642bcd754a13eaf18c5ba230ad94d11adfe..4bfbcb8f21ae21341500b7743190b5e91cf96210 100644
--- a/api/v3/Phone.php
+++ b/api/v3/Phone.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -53,7 +52,7 @@ function civicrm_api3_phone_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Phone/Get.php b/api/v3/Phone/Get.php
index de9c8ae259dd506ca5402f7d94937ac26d63e2ed..4a9449ab75f0bca81ab892128ccdad72902781ce 100644
--- a/api/v3/Phone/Get.php
+++ b/api/v3/Phone/Get.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Retrieve one or more phones
diff --git a/api/v3/Pledge.php b/api/v3/Pledge.php
index e77858a3f54dd655c7d734e6160d74ca4c2c5b16..2e5caf44f3152fb99f0511b23826cc4d4e5d52dd 100644
--- a/api/v3/Pledge.php
+++ b/api/v3/Pledge.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -73,15 +72,15 @@ function civicrm_api3_pledge_create($params) {
  * @example PledgeDelete.php
  * @access public
  */
-function civicrm_api3_pledge_delete($params) {
-  if (CRM_Pledge_BAO_Pledge::deletePledge($params['id'])) {
-    return civicrm_api3_create_success(array(
-      'id' => $params['id']
-    ), $params, 'pledge', 'delete');
-  }
-  else {
-    return civicrm_api3_create_error('Could not delete pledge');
-  }
+function civicrm_api3_pledge_delete($params) {
+  if (CRM_Pledge_BAO_Pledge::deletePledge($params['id'])) {
+    return civicrm_api3_create_success(array(
+      'id' => $params['id']
+    ), $params, 'pledge', 'delete');
+  }
+  else {
+    return civicrm_api3_create_error('Could not delete pledge');
+  }
 }
 
 function _civicrm_api3_pledge_delete_spec(&$params) {
diff --git a/api/v3/PledgePayment.php b/api/v3/PledgePayment.php
index e39c5c6d3dbe02032c9b16f5ecb7911924ec5e55..994bbbbc5bb45cf4c0e96af95e21f76db45a520c 100644
--- a/api/v3/PledgePayment.php
+++ b/api/v3/PledgePayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Profile.php b/api/v3/Profile.php
index 30343ca9495e963738e9a6e6dd07748c915d5c7f..48a7ddfefad2232373f062b555ac9a704950a8b9 100644
--- a/api/v3/Profile.php
+++ b/api/v3/Profile.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
   +--------------------------------------------------------------------+
diff --git a/api/v3/Relationship.php b/api/v3/Relationship.php
index 82db724c639629606a4542a2927f73cfabb9bc39..ff5e5515a4acffd91ec0613c0724dc68b6b1e521 100644
--- a/api/v3/Relationship.php
+++ b/api/v3/Relationship.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/RelationshipType.php b/api/v3/RelationshipType.php
index d0762420d0759d9bf341d95f2c7b471db1e8a81d..a25ad6716e600d97daec1485aa54933ac42a8b14 100644
--- a/api/v3/RelationshipType.php
+++ b/api/v3/RelationshipType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -80,7 +79,7 @@ function civicrm_api3_relationship_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Survey.php b/api/v3/Survey.php
index 684359d69b8d0d44a17ffc75333bf02575a917a9..aff79bdc501d729de70f15623b3bae14de31d7ec 100644
--- a/api/v3/Survey.php
+++ b/api/v3/Survey.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/SurveyRespondant.php b/api/v3/SurveyRespondant.php
index 851fd98754c0bdb194426e2b2d1f71ba5bd30ecc..b1d09bd3ab44b5b79c65eb97b37b35c558fd63ab 100644
--- a/api/v3/SurveyRespondant.php
+++ b/api/v3/SurveyRespondant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/System.php b/api/v3/System.php
index 80231f821966c46711b8b496438a132f37fd32bb..0373e46ea67db3c20bea31fd7c6cb43317926e3e 100644
--- a/api/v3/System.php
+++ b/api/v3/System.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Tag.php b/api/v3/Tag.php
index 02db94b3a897b02c3f0346027e0fcf4cd7362e0d..2d4e01da671680485376d54f209a7a8013387544 100644
--- a/api/v3/Tag.php
+++ b/api/v3/Tag.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -65,7 +64,7 @@ function civicrm_api3_tag_create($params) {
   }
 
 /**
- * Specify Meta data for create. Note that this data is retrievable via the getfields function 
+ * Specify Meta data for create. Note that this data is retrievable via the getfields function
  * and is used for pre-filling defaults and ensuring mandatory requirements are met.
  */
 function _civicrm_api3_tag_create_spec(&$params) {
diff --git a/api/v3/UFField.php b/api/v3/UFField.php
index 030bd99c1362c1ecd0e3289ad4133eab19b38cab..5c2293b5429138caae67c4991d7f8c5d4ac5505d 100644
--- a/api/v3/UFField.php
+++ b/api/v3/UFField.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -161,7 +160,7 @@ function civicrm_api3_uf_field_delete($params) {
 
   return civicrm_api3_create_success($result, $params);
 }
-/* 
+/*
  * field id accepted for backward compat - unset required on id
  */
 function _civicrm_api3_uf_field_delete_spec(&$params) {
diff --git a/api/v3/UFGroup.php b/api/v3/UFGroup.php
index 80c69a131a862a4438067aca7572e0e361aff7f1..0c77c402d14ee7c32b8209ef2d25b829eb998df5 100644
--- a/api/v3/UFGroup.php
+++ b/api/v3/UFGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/UFJoin.php b/api/v3/UFJoin.php
index 5b0a6ec3c10cc6999bd384e285b593ec599f09a7..4f3377d7f0d8e665e9095f2075e152937c91941d 100644
--- a/api/v3/UFJoin.php
+++ b/api/v3/UFJoin.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -58,9 +57,9 @@ function civicrm_api3_uf_join_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * @param array $params array or parameters determined by getfields
- * @todo - suspect module, weight don't need to be required - need to test 
+ * @todo - suspect module, weight don't need to be required - need to test
  */
 function _civicrm_api3_uf_join_create_spec(&$params) {
   $params['module']['api.required'] = 1;
diff --git a/api/v3/UFMatch.php b/api/v3/UFMatch.php
index 388a562a4f6445928590690bc23c7785ddb8f06e..5a30616bbf5b8c77afe53206451fa26a862b83eb 100644
--- a/api/v3/UFMatch.php
+++ b/api/v3/UFMatch.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Website.php b/api/v3/Website.php
index 2c07014857ee2e5d5d9b5f7b4a98c9138f663320..35ee7835a472495a103662a3e9d416f675b210c3 100644
--- a/api/v3/Website.php
+++ b/api/v3/Website.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/examples/ContactCreate.php b/api/v3/examples/ContactCreate.php
index ba5474a75dfd96f352d8456e3ddedeec99b42185..44c0afe0d73915bbb12ed147589817f760d51943 100644
--- a/api/v3/examples/ContactCreate.php
+++ b/api/v3/examples/ContactCreate.php
@@ -1,10 +1,8 @@
 <?php
-// $Id$
-
 
 
 /*
- 
+
  */
 function contact_create_example() {
   $params = array(
@@ -179,11 +177,11 @@ function contact_create_expectedresult() {
 
 /*
 * This example has been generated from the API test suite. The test that created it is called
-* 
-* testCreateIndividualWithContributionChainedArrays and can be found in 
+*
+* testCreateIndividualWithContributionChainedArrays and can be found in
 * http://svn.civicrm.org/civicrm/branches/v3.4/tests/phpunit/CiviTest/api/v3/ContactTest.php
-* 
-* You can see the outcome of the API tests at 
+*
+* You can see the outcome of the API tests at
 * http://tests.dev.civicrm.org/trunk/results-api_v3
 * and review the wiki at
 * http://wiki.civicrm.org/confluence/display/CRMDOC/CiviCRM+Public+APIs
diff --git a/api/v3/examples/CustomFieldCreate.php b/api/v3/examples/CustomFieldCreate.php
index b5634aed8e499f168e6e5f89889772c7425d3408..fa6d263de2e06084056e83f6012d8dd04c66dcca 100644
--- a/api/v3/examples/CustomFieldCreate.php
+++ b/api/v3/examples/CustomFieldCreate.php
@@ -1,10 +1,9 @@
 <?php
-// $Id$
 
 
 
 /*
- 
+
  */
 function custom_field_create_example() {
   $params = array(
@@ -79,8 +78,8 @@ function custom_field_create_expectedresult() {
 
 /*
 * This example has been generated from the API test suite. The test that created it is called
-* custom_field_create 
-* You can see the outcome of the API tests at 
+* custom_field_create
+* You can see the outcome of the API tests at
 * http://tests.dev.civicrm.org/trunk/results-api_v3
 * and review the wiki at
 * http://wiki.civicrm.org/confluence/display/CRMDOC40/CiviCRM+Public+APIs
diff --git a/api/v3/examples/GroupContact.php b/api/v3/examples/GroupContact.php
index 34045b536fb28e2666d44acac4a9031ca9944d62..944e989a4f113d601f8166f2afcd805843764d2b 100644
--- a/api/v3/examples/GroupContact.php
+++ b/api/v3/examples/GroupContact.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function group_contact__example() {
   $params = array(