diff --git a/admin/auth_config.php b/admin/auth_config.php
index 648757b7631..369365bd257 100644
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -174,4 +174,4 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
     }
 }
 
-?>
+
diff --git a/admin/cron.php b/admin/cron.php
index fd14064d022..4f926725e68 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 /// This script looks through all the module directories for cron.php files
 /// and runs them.  These files can contain cleanup functions, email functions
@@ -591,4 +591,4 @@
         echo "</xmp>";
     }
 
-?>
+
diff --git a/admin/delete.php b/admin/delete.php
index 215c766172b..36a7afa68b4 100644
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -1,4 +1,4 @@
-<?PHP //$Id$
+<?php
 
 // Deletes the moodledata directory, COMPLETELY!!
 // BE VERY CAREFUL USING THIS!
@@ -83,4 +83,4 @@ function delete_subdirectories($rootdir) {
     closedir($dir);
 }
 
-?>
+
diff --git a/admin/enrol.php b/admin/enrol.php
index 4eafca50105..889ef777a57 100644
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -1,4 +1,4 @@
-<?PHP  // $Id$
+<?php
        // enrol.php - allows admin to edit all enrollment variables
        //             Yes, enrol is correct English spelling.
 
@@ -138,4 +138,4 @@
 
     echo $OUTPUT->footer();
 
-?>
+
diff --git a/admin/environment.php b/admin/environment.php
index ee89bde7c07..d057df449c3 100644
--- a/admin/environment.php
+++ b/admin/environment.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -134,4 +134,4 @@
 
 /// Print footer
     echo $OUTPUT->footer();
-?>
+
diff --git a/admin/filters.php b/admin/filters.php
index 3726674bb03..6489ee0b219 100644
--- a/admin/filters.php
+++ b/admin/filters.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
diff --git a/admin/handlevirus.php b/admin/handlevirus.php
index 86b5f292c0d..5dff5e517b5 100644
--- a/admin/handlevirus.php
+++ b/admin/handlevirus.php
@@ -1,6 +1,6 @@
 <?php
 /** This expects the output from a command like
- * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php 
+ * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php
  * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
  * also it should be run as root, or whatever the webserver runs as so that it has the right permissions in the quarantine dir etc.
  * php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
@@ -36,7 +36,7 @@ while(!feof($fd)) {
     }
     $action = clam_handle_infected_file($file,$log->userid,true);
     clam_replace_infected_file($file);
-    
+
     $user = $DB->get_record("user", array("id"=>$log->userid));
     $course = $DB->get_record("course", array("id"=>$log->course));
     $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
@@ -86,13 +86,13 @@ function notify_admins($user,$subject,$a) {
         $eventdata->fullmessage       = $body;
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
-        $eventdata->smallmessage      = '';			    
+        $eventdata->smallmessage      = '';			
         events_trigger('message_send', $eventdata);
     }
 }
 
 function notify_admins_unknown($file,$a) {
-    
+
     global $site;
 
     $admins = get_admins();
diff --git a/admin/health.php b/admin/health.php
index 5a727969006..8a3b8b32b43 100644
--- a/admin/health.php
+++ b/admin/health.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
     ob_start(); //for whitespace test
     require_once('../config.php');
@@ -815,4 +815,4 @@ TODO:
 
 */
 
-?>
+
diff --git a/admin/lang.php b/admin/lang.php
index e29ed1d6b96..0d642d3ae46 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -1,4 +1,4 @@
-<?PHP // $Id$
+<?php
     /**
     * Display the admin/language menu and process strings translation.
     *
@@ -1382,4 +1382,4 @@ function lang_help_save_file($helproot, $file, $content) {
 }
 
 
-?>
+
diff --git a/admin/mailout-debugger.php b/admin/mailout-debugger.php
index 855f3b4753b..ce7c1918bba 100644
--- a/admin/mailout-debugger.php
+++ b/admin/mailout-debugger.php
@@ -74,4 +74,4 @@ function mdie($msg='', $errorcode=1) {
     exit($errorcode);
 }
 
-?>
+
diff --git a/admin/oacleanup.php b/admin/oacleanup.php
index 8e53ebf8f03..30b5aa1c89f 100644
--- a/admin/oacleanup.php
+++ b/admin/oacleanup.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 if (!isset($CFG)) {
 
@@ -153,4 +153,4 @@ function online_assignment_cleanup($output=false) {
     echo '</center>';
 }
 
-?>
+
diff --git a/admin/process_email.php b/admin/process_email.php
index cff7541ddd3..c8b63ac9c1d 100755
--- a/admin/process_email.php
+++ b/admin/process_email.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php -f
-<?php // $Id$
+<?php
 
 //error_reporting(0);
 //ini_set('display_errors',0);
@@ -77,4 +77,4 @@ fclose($fd);
 
 
 
-?>
+