135 files changed, 0 insertions, 268 deletions
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 9fe8e53a2..6c000bfc6 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $form_body = "<p>" . elgg_echo('user:password:text') . "</p>";
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 5e6b5c8fe..8f3986c4e 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $form_body = "<label>" . elgg_echo('loginusername') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index fb9136ad8..c6b47c82e 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $username = get_input('u');
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 7794e3b93..7cab08804 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $admin_option = false;
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 8275bc83b..b6177dfd0 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $menu_items = get_register('menu');
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 894aa856e..4b26465e6 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -7,8 +7,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $plugin = $vars['plugin'];
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 78489c52a..05623ffbb 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $plugin = $vars['plugin'];
diff --git a/views/default/admin/overview.php b/views/default/admin/overview.php
index 66938c0f7..804f4cc5e 100644
--- a/views/default/admin/overview.php
+++ b/views/default/admin/overview.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // Work out number of users
diff --git a/views/default/admin/overview/numentities.php b/views/default/admin/overview/numentities.php
index 0d0e1b83b..6ecd388dd 100644
--- a/views/default/admin/overview/numentities.php
+++ b/views/default/admin/overview/numentities.php
@@ -4,6 +4,4 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
diff --git a/views/default/admin/overview/online.php b/views/default/admin/overview/online.php
index 0045f8299..19e65a764 100644
--- a/views/default/admin/overview/online.php
+++ b/views/default/admin/overview/online.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // users online
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index d5def1eb1..9aae4a05b 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 regenerate_plugin_list();
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index ad85f9ce0..0d1987d05 100644
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 regenerate_plugin_list();
diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php
index 259e7c02a..2bf32d198 100644
--- a/views/default/admin/site/advanced.php
+++ b/views/default/admin/site/advanced.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $action = $vars['url'] . "action/admin/site/update_advanced";
diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php
index eb8a13e0b..d8d1618d1 100644
--- a/views/default/admin/site/basic.php
+++ b/views/default/admin/site/basic.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $action = $vars['url'] . "action/admin/site/update_basic";
diff --git a/views/default/ajax/loader.php b/views/default/ajax/loader.php
index 7942ba470..627c93198 100644
--- a/views/default/ajax/loader.php
+++ b/views/default/ajax/loader.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $loader = <<< END
diff --git a/views/default/api/output.php b/views/default/api/output.php
index 57b8461ea..a7041c0f4 100644
--- a/views/default/api/output.php
+++ b/views/default/api/output.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/default/canvas/default.php b/views/default/canvas/default.php
index 9ad941ccc..cfcee9484 100644
--- a/views/default/canvas/default.php
+++ b/views/default/canvas/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 if (isset($vars['area1'])) {
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index 12aafca78..6df6d5edd 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 <style type="text/css">
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index 68a75f784..e9c2cb113 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 <div id="elgg_content" class="clearfloat">
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index 01bb1e54d..b7efee4d0 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 <div id="elgg_content" class="clearfloat sidebar">
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index 06480b9a9..0717daf64 100644
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -3,8 +3,6 @@
  * Elgg comments add form
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/dashboard/blurb.php b/views/default/dashboard/blurb.php
index d4f9cfd43..c400dc2b9 100644
--- a/views/default/dashboard/blurb.php
+++ b/views/default/dashboard/blurb.php
@@ -3,8 +3,6 @@
  * Elgg comments add form
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/entities/entity_list.php b/views/default/entities/entity_list.php
index 90fe6ead3..cf3df78b7 100644
--- a/views/default/entities/entity_list.php
+++ b/views/default/entities/entity_list.php
@@ -3,8 +3,6 @@
  * View a list of entities
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  */
 
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
index ffae92fd9..6e0d9c0f8 100644
--- a/views/default/entities/entity_listing.php
+++ b/views/default/entities/entity_listing.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses string $vars['icon'] Full icon HTML to display.
  * @uses string $vars['info'] Info about the entity.
diff --git a/views/default/entities/gallery.php b/views/default/entities/gallery.php
index 73cab6dd8..bfdd4d4d8 100644
--- a/views/default/entities/gallery.php
+++ b/views/default/entities/gallery.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $entities = $vars['entities'];
diff --git a/views/default/entities/gallery_listing.php b/views/default/entities/gallery_listing.php
index 55f11a2cd..897509b0a 100644
--- a/views/default/entities/gallery_listing.php
+++ b/views/default/entities/gallery_listing.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses string $vars['icon'] Full icon HTML to display.
  * @uses string $vars['info'] Info about the entity.
diff --git a/views/default/export/entity.php b/views/default/export/entity.php
index 12e34335e..c2fd7f8b8 100644
--- a/views/default/export/entity.php
+++ b/views/default/export/entity.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $entity = $vars['entity'];
diff --git a/views/default/export/metadata.php b/views/default/export/metadata.php
index 61da01f31..477cde3c3 100644
--- a/views/default/export/metadata.php
+++ b/views/default/export/metadata.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $m = $vars['metadata'];
diff --git a/views/default/export/relationship.php b/views/default/export/relationship.php
index 3e92625c5..e7c8ac121 100644
--- a/views/default/export/relationship.php
+++ b/views/default/export/relationship.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $r = $vars['relationship'];
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index 5683d5982..5262d3494 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @see collections.php
  *
diff --git a/views/default/friends/collections.php b/views/default/friends/collections.php
index d73568b71..f1e27f9b7 100644
--- a/views/default/friends/collections.php
+++ b/views/default/friends/collections.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['collections'] The array of friends collections
  */
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index 43a8aef46..0030536da 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['collections'] The array of friends collections
  */
diff --git a/views/default/friends/forms/collectionfields.php b/views/default/friends/forms/collectionfields.php
index f9d8ac5ff..35db3a962 100644
--- a/views/default/friends/forms/collectionfields.php
+++ b/views/default/friends/forms/collectionfields.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 if (isset($vars['collection'])) {
diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php
index 5751950d8..df1188fe1 100644
--- a/views/default/friends/forms/edit.php
+++ b/views/default/friends/forms/edit.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] Optionally, the collection edit
  */
diff --git a/views/default/friends/list.php b/views/default/friends/list.php
index 7bc42a015..182dc2ef5 100644
--- a/views/default/friends/list.php
+++ b/views/default/friends/list.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['friends'] The array of ElggUser objects
  */
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 7b47ed675..34a02d086 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['entities'] The array of ElggUser objects
  */
diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php
index 178459304..b0319beb5 100644
--- a/views/default/friends/river/create.php
+++ b/views/default/friends/river/create.php
@@ -3,8 +3,6 @@
  * Elgg create new friend river item
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php
index 4581c04f7..12a0763c9 100644
--- a/views/default/friends/tablelist.php
+++ b/views/default/friends/tablelist.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['entities'] The array of ElggUser objects
  */
diff --git a/views/default/friends/tablelistcountupdate.php b/views/default/friends/tablelistcountupdate.php
index 81a061439..8e2ab637d 100644
--- a/views/default/friends/tablelistcountupdate.php
+++ b/views/default/friends/tablelistcountupdate.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['count'] The count
  * @uses $vars['friendspicker'] The friendspicker counter number
diff --git a/views/default/graphics/icon.php b/views/default/graphics/icon.php
index 6b92a510d..226287d6e 100644
--- a/views/default/graphics/icon.php
+++ b/views/default/graphics/icon.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['entity'] The entity the icon represents - uses getIcon() method
  * @uses $vars['js'] Any JavaScript to add to img tag
diff --git a/views/default/group/default.php b/views/default/group/default.php
index 92594bf4a..662baef92 100644
--- a/views/default/group/default.php
+++ b/views/default/group/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 echo elgg_view('object/default', $vars);
diff --git a/views/default/group/search/finishblurb.php b/views/default/group/search/finishblurb.php
index 756ad03c0..f802282e7 100644
--- a/views/default/group/search/finishblurb.php
+++ b/views/default/group/search/finishblurb.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  * @deprecated 1.7
  */
 elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
diff --git a/views/default/group/search/startblurb.php b/views/default/group/search/startblurb.php
index 19138a360..3a5809193 100644
--- a/views/default/group/search/startblurb.php
+++ b/views/default/group/search/startblurb.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  * @deprecated 1.7
  */
 elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7);
diff --git a/views/default/input/access.php b/views/default/input/access.php
index 2515180ce..b7273acb1 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -6,9 +6,7 @@
  * @package Elgg
  * @subpackage Core
 
- * @author Curverider Ltd
 
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index b6044e55f..28e0cf6a7 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @todo This currently only works for ONE AUTOCOMPLETE TEXT FIELD on a page.
  *
diff --git a/views/default/input/button.php b/views/default/input/button.php
index d6d3aec62..63a140524 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/captcha.php b/views/default/input/captcha.php
index d1d780e77..210e0f50a 100644
--- a/views/default/input/captcha.php
+++ b/views/default/input/captcha.php
@@ -4,7 +4,5 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 \ No newline at end of file
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index dfab90a0a..adfe19914 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -9,8 +9,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses string $vars['internalname'] The name of the input fields (Forced to an array by appending [])
  * @uses array $vars['options'] An array of strings representing the label => option for the each checkbox field
diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php
index 684c872f9..fceb8b30c 100644
--- a/views/default/input/datepicker.php
+++ b/views/default/input/datepicker.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/email.php b/views/default/input/email.php
index f8df87dd4..efe2c5848 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -6,9 +6,7 @@
  * @package Elgg
  * @subpackage Core
 
- * @author Curverider Ltd
 
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/file.php b/views/default/input/file.php
index bd27df525..bf9101991 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['js'] Any Javascript to enter into the input tag
  * @uses $vars['internalname'] The name of the input field
diff --git a/views/default/input/form.php b/views/default/input/form.php
index c22e644b9..f40d8ad8c 100644
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['body'] The body of the form (made up of other input/xxx views and html
  * @uses $vars['method'] Method (default POST)
diff --git a/views/default/input/hidden.php b/views/default/input/hidden.php
index 2abf4faf5..a5fb01e73 100644
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index e1bc235e3..6fe2c9e8e 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any - will be html encoded
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/password.php b/views/default/input/password.php
index ad9f45c16..90864a4a7 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index dd1178945..cf798e4d8 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 415ab3ad8..7eb9456b4 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -7,8 +7,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index 8520b2b83..82c49fea4 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/reset.php b/views/default/input/reset.php
index bb8d278c3..1d5e47ccb 100644
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/securitytoken.php b/views/default/input/securitytoken.php
index a2a4a0e01..9a8cb1ebe 100644
--- a/views/default/input/securitytoken.php
+++ b/views/default/input/securitytoken.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $ts = time();
diff --git a/views/default/input/submit.php b/views/default/input/submit.php
index 377a86c8f..dd520fa8e 100644
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -6,8 +6,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 1c71cb0e0..5a7ca4ef3 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -6,9 +6,7 @@
  * @package Elgg
  * @subpackage Core
 
- * @author Curverider Ltd
 
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any - string or array - tags will be encoded
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/text.php b/views/default/input/text.php
index a77956985..ea35efe2a 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -6,9 +6,7 @@
  * @package Elgg
  * @subpackage Core
 
- * @author Curverider Ltd
 
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/url.php b/views/default/input/url.php
index 0b9e124c6..1271bd3be 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
diff --git a/views/default/input/urlshortener.php b/views/default/input/urlshortener.php
index 7a8c2786a..ecfb02efa 100644
--- a/views/default/input/urlshortener.php
+++ b/views/default/input/urlshortener.php
@@ -4,7 +4,5 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 \ No newline at end of file
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 75186c948..f51f9f484 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['internalname'] The name of the input field
diff --git a/views/default/likes/forms/display.php b/views/default/likes/forms/display.php
index f8fc661fd..36e2cddc2 100644
--- a/views/default/likes/forms/display.php
+++ b/views/default/likes/forms/display.php
@@ -3,8 +3,6 @@
  * Elgg likes - display users liked link/text
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 99dbe598b..508b2ad82 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -3,8 +3,6 @@
  * Elgg likes add form
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/likes/forms/link.php b/views/default/likes/forms/link.php
index 6f5d41829..34c2848d3 100644
--- a/views/default/likes/forms/link.php
+++ b/views/default/likes/forms/link.php
@@ -3,8 +3,6 @@
  * Elgg likes link form - used on riverdashboard where we want the likes link separate from the list of users that liked the object
  *
  * @package Elgg
- * @author Curverider Ltd <info@elgg.com>
- * @link http://elgg.com/
  *
  * @uses $vars['entity']
  */
diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php
index e681b090b..a8690010e 100644
--- a/views/default/messages/errors/error.php
+++ b/views/default/messages/errors/error.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An error message (string)
  */
diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 5e4b2ff31..922f23787 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An array of error messages
  */
diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php
index 65ec7cdbf..6e66445a3 100644
--- a/views/default/messages/exceptions/exception.php
+++ b/views/default/messages/exceptions/exception.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An exception
  */
diff --git a/views/default/messages/list.php b/views/default/messages/list.php
index 62500882c..3084f09f8 100644
--- a/views/default/messages/list.php
+++ b/views/default/messages/list.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] The array of message registers
  */
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 36b55a20e..07fae11e7 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An array of system messages
  */
diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php
index 499165a90..611ffbaf5 100644
--- a/views/default/messages/messages/message.php
+++ b/views/default/messages/messages/message.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] A system message (string)
  */
diff --git a/views/default/navigation/breadcrumbs.php b/views/default/navigation/breadcrumbs.php
index d0becb367..7bb709be9 100644
--- a/views/default/navigation/breadcrumbs.php
+++ b/views/default/navigation/breadcrumbs.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses optional $vars['breadcrumbs'] = array('title' => 'The title', 'link' => 'url')
  * @see elgg_push_breadcrumb
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 9747ddae4..d193bd433 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses int $vars['offset']
  * @uses int $vars['limit']
diff --git a/views/default/navigation/sidebar_menu.php b/views/default/navigation/sidebar_menu.php
index b03a5540b..75fe7c743 100644
--- a/views/default/navigation/sidebar_menu.php
+++ b/views/default/navigation/sidebar_menu.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/default/navigation/submenu_group.php b/views/default/navigation/submenu_group.php
index 08e417494..df750aff7 100644
--- a/views/default/navigation/submenu_group.php
+++ b/views/default/navigation/submenu_group.php
@@ -7,8 +7,6 @@
  * @uses $vars['items']
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $group = (isset($vars['group'])) ? $vars['group'] : 'default';
diff --git a/views/default/navigation/submenu_item.php b/views/default/navigation/submenu_item.php
index 0e3c485ef..09aa24a8e 100644
--- a/views/default/navigation/submenu_item.php
+++ b/views/default/navigation/submenu_item.php
@@ -7,8 +7,6 @@
  * @uses $vars['children_html']
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $group = (isset($vars['group'])) ? $vars['group'] : 'default';
diff --git a/views/default/navigation/submenu_js.php b/views/default/navigation/submenu_js.php
index 0f0c88888..1ed710b2b 100644
--- a/views/default/navigation/submenu_js.php
+++ b/views/default/navigation/submenu_js.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index 044dc6608..44cf4a63d 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -4,7 +4,5 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
diff --git a/views/default/navigation/viewtype.php b/views/default/navigation/viewtype.php
index 486e40c9a..8b2a64978 100644
--- a/views/default/navigation/viewtype.php
+++ b/views/default/navigation/viewtype.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $baseurl = elgg_http_remove_url_query_element($vars['baseurl'], 'search_viewtype');
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index c659ae0ba..0da9f4c30 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 global $NOTIFICATION_HANDLERS;
diff --git a/views/default/object/default.php b/views/default/object/default.php
index cc3dd1e72..7ef563e91 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 if ($vars['full']) {
diff --git a/views/default/object/object.php b/views/default/object/object.php
index 2be9e1fa1..9e1441a9f 100644
--- a/views/default/object/object.php
+++ b/views/default/object/object.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $entity = $vars['entity'];
diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php
index 411a9f8d8..7b1e7d2df 100644
--- a/views/default/object/plugin.php
+++ b/views/default/object/plugin.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $entity = $vars['entity'];
diff --git a/views/default/object/widget.php b/views/default/object/widget.php
index 9dd2999ce..b3ef5bb8c 100644
--- a/views/default/object/widget.php
+++ b/views/default/object/widget.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 echo elgg_view('widgets/wrapper',$vars);
diff --git a/views/default/output/calendar.php b/views/default/output/calendar.php
index 0a21eb74c..f791d435e 100644
--- a/views/default/output/calendar.php
+++ b/views/default/output/calendar.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The current value, if any
  *
diff --git a/views/default/output/checkboxes.php b/views/default/output/checkboxes.php
index 537d996e0..56d2588ac 100644
--- a/views/default/output/checkboxes.php
+++ b/views/default/output/checkboxes.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['text'] The text to display
  *
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index c4c0e0bfa..d7bb5c56f 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['text'] The text of the link
  * @uses $vars['href'] The address
diff --git a/views/default/output/date.php b/views/default/output/date.php
index fdc8e3a1b..bd8a65714 100644
--- a/views/default/output/date.php
+++ b/views/default/output/date.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] A UNIX epoch timestamp
  *
diff --git a/views/default/output/email.php b/views/default/output/email.php
index e2142b09b..02d2e67e0 100644
--- a/views/default/output/email.php
+++ b/views/default/output/email.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The email address to display
  *
diff --git a/views/default/output/iframe.php b/views/default/output/iframe.php
index e1a1e98c4..7df9332f1 100644
--- a/views/default/output/iframe.php
+++ b/views/default/output/iframe.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] Source of the page
  *
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index 1c57375de..22a4ad46d 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['value'] The text to display
  * @uses $vars['parse_urls'] Whether to turn urls into links. Default is true.
diff --git a/views/default/output/pulldown.php b/views/default/output/pulldown.php
index 6e48043a9..df58bebfe 100644
--- a/views/default/output/pulldown.php
+++ b/views/default/output/pulldown.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['text'] The text to display
  *
diff --git a/views/default/output/radio.php b/views/default/output/radio.php
index b454bae71..dd3198b6d 100644
--- a/views/default/output/radio.php
+++ b/views/default/output/radio.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['text'] The text to display
  *
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index ee28f751a..a4ecb72da 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['tagcloud'] An array of stdClass objects with two elements: 'tag' (the text of the tag) and 'total' (the number of elements with this tag)
  * @uses $vars['value'] Sames as tagcloud
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 1afc89d88..99c898de6 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -7,8 +7,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['tags'] The tags to display
  * @uses $vars['tagtype'] The tagtype, optionally
diff --git a/views/default/output/text.php b/views/default/output/text.php
index bcfe33ea0..e0194099b 100644
--- a/views/default/output/text.php
+++ b/views/default/output/text.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['text'] The text to display
  *
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 10f68d8a8..9dd0bf3f5 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses string $vars['href'] The URL.
  * @uses string $vars['text'] The string between the <a></a> tags.
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 1591c2267..4c3197b58 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -15,7 +15,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @link http://elgg.org/
  */
 
 $page_owner = page_owner_entity();
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index f7ef30284..14b35d87f 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
index 0f632d97d..62ec5a110 100644
--- a/views/default/page_elements/elgg_footer.php
+++ b/views/default/page_elements/elgg_footer.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 429683777..649591058 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php
index 184cd4fd9..9ca10f606 100644
--- a/views/default/page_shells/admin.php
+++ b/views/default/page_shells/admin.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['config'] The site configuration settings, imported
  * @uses $vars['title'] The page title
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php
index b098ddf59..86171b24f 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page_shells/default.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['config'] The site configuration settings, imported
  * @uses $vars['title'] The page title
diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php
index e1155cd28..d791c74e8 100644
--- a/views/default/river/item/list.php
+++ b/views/default/river/item/list.php
@@ -3,8 +3,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 ?>
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index 6391f23fb..cad70f92b 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -4,8 +4,6 @@
  * Wraps all river items.
  *
  * @package Elgg
- * @author Curverider
- * @link http://elgg.com/
  */
 
 //get the site admins choice avatars or action icons
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 5d8240185..3b3aaf808 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
  */
diff --git a/views/default/settings/upgrading.php b/views/default/settings/upgrading.php
index af0835f57..9f13e4c3f 100644
--- a/views/default/settings/upgrading.php
+++ b/views/default/settings/upgrading.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 
diff --git a/views/default/site/default.php b/views/default/site/default.php
index 36e041de2..5dacb4019 100644
--- a/views/default/site/default.php
+++ b/views/default/site/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // sites information (including plugin settings) shouldn't be shown.
diff --git a/views/default/spotlight/default.php b/views/default/spotlight/default.php
index cd52700da..6c872985d 100644
--- a/views/default/spotlight/default.php
+++ b/views/default/spotlight/default.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 ?>
diff --git a/views/default/upload/upload_form_content.php b/views/default/upload/upload_form_content.php
index 32ab0a0ee..5b66a9bf3 100644
--- a/views/default/upload/upload_form_content.php
+++ b/views/default/upload/upload_form_content.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
  */
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 8e48b13f6..8c5fdee3e 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -4,7 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @link http://elgg.org/
  */
 
 if ($vars['full']) {
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index e58b1252d..9c4b1d79d 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  * @deprecated 1.7
  */
 
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index 8a3377820..a4ee421a1 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -2,9 +2,7 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
  * @deprecated 1.7
- * @link http://elgg.org/
  */
 
 elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index 791f3932c..30f3da8b6 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 if ($vars['config']->allow_user_default_access) {
 	$user = page_owner_entity();
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 7b6ea9f00..19902d532 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $user = page_owner_entity();
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index 36964a638..fd93cfbba 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 global $CONFIG;
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index d1d61482a..5111b5db1 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -5,9 +5,7 @@
  * @package Elgg
  * @subpackage Core
 
- * @author Curverider Ltd
 
- * @link http://elgg.org/
  */
 
 $user = page_owner_entity();
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index 68db18136..82806e06b 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $user = page_owner_entity();
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 64765ac1a..4bce6b228 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $form_body = elgg_view("usersettings/user");
diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php
index 32d6c2c51..d1cf85448 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // Description of what's going on
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index 2b6793386..0454a94d2 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 global $CONFIG;
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index bbb4fc64d..0ca5b5d51 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 <div class="menu_admin_option">
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index 369fc7bd3..f6e28d63e 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 <div class="menu_admin_option">
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index b1de9ebbd..71be11d9f 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // Description of what's going on
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index 79286ec90..9638e00af 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -7,8 +7,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 
diff --git a/views/default/usersettings/statistics.php b/views/default/usersettings/statistics.php
index 728abf37c..c90d14c6d 100644
--- a/views/default/usersettings/statistics.php
+++ b/views/default/usersettings/statistics.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 ?>
 \ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index ee38bdfee..c80347b34 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 // Get entity statistics
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index e176aaf9f..bbe6203ce 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $user = get_loggedin_user();
diff --git a/views/default/usersettings/user.php b/views/default/usersettings/user.php
index e48ee6ecc..c6a56a14e 100644
--- a/views/default/usersettings/user.php
+++ b/views/default/usersettings/user.php
@@ -2,7 +2,5 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 ?>
 \ No newline at end of file
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 8ed29dd59..45068adfe 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $guid = $vars['entity']->getGUID();
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index eeb6d1cd1..888938d97 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 static $widgettypes;