diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index d325308d0..ce8872294 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -149,7 +149,7 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
-		$pattern .= '\#: (\\\\|\/)home\.ctp:100\n';
+		$pattern .= '\#: (\\\\|\/)home\.ctp:83\n';
 		$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
 		$this->assertRegExp($pattern, $result);
 
diff --git a/lib/Cake/Test/test_app/View/Emails/html/custom.ctp b/lib/Cake/Test/test_app/View/Emails/html/custom.ctp
index 923a9f7cf..12ea5ae2b 100644
--- a/lib/Cake/Test/test_app/View/Emails/html/custom.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/html/custom.ctp
@@ -1,23 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-?>
 <p>Here is your value: <b><?php echo $value; ?></b></p>
diff --git a/lib/Cake/Test/test_app/View/Emails/html/default.ctp b/lib/Cake/Test/test_app/View/Emails/html/default.ctp
index e66a19e31..5d6eabd09 100644
--- a/lib/Cake/Test/test_app/View/Emails/html/default.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/html/default.ctp
@@ -1,23 +1,4 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
-<?php
 $content = explode("\n", $content);
 
 foreach ($content as $line):
diff --git a/lib/Cake/Test/test_app/View/Emails/html/image.ctp b/lib/Cake/Test/test_app/View/Emails/html/image.ctp
index fea296342..44a40c954 100644
--- a/lib/Cake/Test/test_app/View/Emails/html/image.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/html/image.ctp
@@ -1,20 +1,4 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @since         CakePHP(tm) v 2.1
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
 
 echo $this->Html->image('image.gif', array(
 	'alt' => 'cool image',
diff --git a/lib/Cake/Test/test_app/View/Emails/html/japanese.ctp b/lib/Cake/Test/test_app/View/Emails/html/japanese.ctp
index d08672b08..14a9d9cc3 100644
--- a/lib/Cake/Test/test_app/View/Emails/html/japanese.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/html/japanese.ctp
@@ -1,23 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-?>
 <p>ここにあなたの設定した値が入ります: <b><?php echo $value; ?></b></p>
diff --git a/lib/Cake/Test/test_app/View/Emails/text/custom.ctp b/lib/Cake/Test/test_app/View/Emails/text/custom.ctp
index 07425833d..887a386e6 100644
--- a/lib/Cake/Test/test_app/View/Emails/text/custom.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/text/custom.ctp
@@ -1,23 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-?>
 Here is your value: <?php echo $value; ?>
diff --git a/lib/Cake/Test/test_app/View/Emails/text/custom_helper.ctp b/lib/Cake/Test/test_app/View/Emails/text/custom_helper.ctp
index 9e13ef780..d64b3a49c 100644
--- a/lib/Cake/Test/test_app/View/Emails/text/custom_helper.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/text/custom_helper.ctp
@@ -1,20 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.pages
- * @since         CakePHP(tm) v 2.0
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 Right now: <?php echo $this->Time->toAtom($time); ?>
diff --git a/lib/Cake/Test/test_app/View/Emails/text/default.ctp b/lib/Cake/Test/test_app/View/Emails/text/default.ctp
index 37a159496..394119568 100644
--- a/lib/Cake/Test/test_app/View/Emails/text/default.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/text/default.ctp
@@ -1,20 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <?php echo $content; ?>
\ No newline at end of file
diff --git a/lib/Cake/Test/test_app/View/Emails/text/japanese.ctp b/lib/Cake/Test/test_app/View/Emails/text/japanese.ctp
index a040529cd..f3c2f4e04 100644
--- a/lib/Cake/Test/test_app/View/Emails/text/japanese.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/text/japanese.ctp
@@ -1,23 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-?>
 ここにあなたの設定した値が入ります: <?php echo $value; ?>
diff --git a/lib/Cake/Test/test_app/View/Emails/text/wide.ctp b/lib/Cake/Test/test_app/View/Emails/text/wide.ctp
index ec8342b8f..750397e11 100644
--- a/lib/Cake/Test/test_app/View/Emails/text/wide.ctp
+++ b/lib/Cake/Test/test_app/View/Emails/text/wide.ctp
@@ -1,21 +1,2 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.elements.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 This element has some text that is just too wide to comply with email standards.
 <?php echo $content; ?>
\ No newline at end of file
diff --git a/lib/Cake/Test/test_app/View/Errors/error400.ctp b/lib/Cake/Test/test_app/View/Errors/error400.ctp
index 4667a0551..aa817e75c 100644
--- a/lib/Cake/Test/test_app/View/Errors/error400.ctp
+++ b/lib/Cake/Test/test_app/View/Errors/error400.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <h2><?php echo $name; ?></h2>
 <p class="error">
 	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
diff --git a/lib/Cake/Test/test_app/View/Errors/error500.ctp b/lib/Cake/Test/test_app/View/Errors/error500.ctp
index dcabf4374..b22038b82 100644
--- a/lib/Cake/Test/test_app/View/Errors/error500.ctp
+++ b/lib/Cake/Test/test_app/View/Errors/error500.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <h2><?php echo $name; ?></h2>
 <p class="error">
 	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
diff --git a/lib/Cake/Test/test_app/View/Helper/BananaHelper.php b/lib/Cake/Test/test_app/View/Helper/BananaHelper.php
index e65c4ddd7..c73cec4f0 100644
--- a/lib/Cake/Test/test_app/View/Helper/BananaHelper.php
+++ b/lib/Cake/Test/test_app/View/Helper/BananaHelper.php
@@ -1,21 +1,4 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.test_app.View.Helper
- * @since         CakePHP(tm) v 1.3
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
 
 App::uses('Helper', 'View');
 
diff --git a/lib/Cake/Test/test_app/View/Layouts/Emails/html/default.ctp b/lib/Cake/Test/test_app/View/Layouts/Emails/html/default.ctp
index 12baea35a..cfbd18c8e 100644
--- a/lib/Cake/Test/test_app/View/Layouts/Emails/html/default.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/Emails/html/default.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
diff --git a/lib/Cake/Test/test_app/View/Layouts/Emails/html/japanese.ctp b/lib/Cake/Test/test_app/View/Layouts/Emails/html/japanese.ctp
index 73cccfe5f..64a912986 100644
--- a/lib/Cake/Test/test_app/View/Layouts/Emails/html/japanese.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/Emails/html/japanese.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
diff --git a/lib/Cake/Test/test_app/View/Layouts/Emails/html/thin.ctp b/lib/Cake/Test/test_app/View/Layouts/Emails/html/thin.ctp
index 88fdefda5..67a43e74c 100644
--- a/lib/Cake/Test/test_app/View/Layouts/Emails/html/thin.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/Emails/html/thin.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts.email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
diff --git a/lib/Cake/Test/test_app/View/Layouts/Emails/text/default.ctp b/lib/Cake/Test/test_app/View/Layouts/Emails/text/default.ctp
index e2a62c2b8..a0d0b982b 100644
--- a/lib/Cake/Test/test_app/View/Layouts/Emails/text/default.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/Emails/text/default.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 
 <?php echo $content_for_layout; ?>
 
diff --git a/lib/Cake/Test/test_app/View/Layouts/Emails/text/japanese.ctp b/lib/Cake/Test/test_app/View/Layouts/Emails/text/japanese.ctp
index 48a9980bd..374eed2e2 100644
--- a/lib/Cake/Test/test_app/View/Layouts/Emails/text/japanese.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/Emails/text/japanese.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts.email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 
 <?php echo $content_for_layout; ?>
 
diff --git a/lib/Cake/Test/test_app/View/Layouts/ajax.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax.ctp
index 11486f8fe..3f290130e 100644
--- a/lib/Cake/Test/test_app/View/Layouts/ajax.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/ajax.ctp
@@ -1,20 +1 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
index 2279ea40f..54db1c86d 100644
--- a/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
@@ -1,23 +1,2 @@
-<?php
-/* SVN FILE: $Id: ajax2.ctp 7062 2008-05-30 11:29:53Z nate $ */
-
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 Ajax!
 <?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp b/lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
index e36807720..71edb98b6 100644
--- a/lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <p>This is regular text</p>
 <!--nocache-->
 	<?php echo microtime(); ?>
diff --git a/lib/Cake/Test/test_app/View/Layouts/default.ctp b/lib/Cake/Test/test_app/View/Layouts/default.ctp
index ce2fa92fc..eb1aa7b26 100644
--- a/lib/Cake/Test/test_app/View/Layouts/default.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/default.ctp
@@ -1,21 +1,5 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
+
 $this->loadHelper('Html');
 
 $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
diff --git a/lib/Cake/Test/test_app/View/Layouts/flash.ctp b/lib/Cake/Test/test_app/View/Layouts/flash.ctp
index 322589859..aa1c74438 100644
--- a/lib/Cake/Test/test_app/View/Layouts/flash.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/flash.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
diff --git a/lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp b/lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
index fcac9edba..0b55e6687 100644
--- a/lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
+++ b/lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <p>This is regular text</p>
 <!--nocache-->
 	<p>A. Layout Before Content</p>
diff --git a/lib/Cake/Test/test_app/View/Pages/home.ctp b/lib/Cake/Test/test_app/View/Pages/home.ctp
index 2f7238a37..2b6af0858 100644
--- a/lib/Cake/Test/test_app/View/Pages/home.ctp
+++ b/lib/Cake/Test/test_app/View/Pages/home.ctp
@@ -1,21 +1,4 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.pages
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
 App::uses('Debugger', 'Utility');
 ?>
 <h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
diff --git a/lib/Cake/Test/test_app/View/Posts/json/index.ctp b/lib/Cake/Test/test_app/View/Posts/json/index.ctp
index b59643908..1de9ed723 100644
--- a/lib/Cake/Test/test_app/View/Posts/json/index.ctp
+++ b/lib/Cake/Test/test_app/View/Posts/json/index.ctp
@@ -1,21 +1,4 @@
 <?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.test_app.View.Json
- * @since         CakePHP(tm) v 2.1.0
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
 
 $paging = isset($this->Paginator->options['url']) ? $this->Paginator->options['url'] : null;
 
diff --git a/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp b/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
index 3267ea8fa..7d10b1cd9 100644
--- a/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
+++ b/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.pages
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <h1>Content</h1>
 <!--nocache-->
 	<p>D. In View File</p>
diff --git a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
index 1701bbba0..6f5bfe16f 100644
--- a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
+++ b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake.libs.view.templates.pages
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <p>
 	<!--nocache-->
 	<span class="notice">