diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index bc622de8..7d4ef041 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -323,4 +323,4 @@ class AssetAdmin_DeleteBatchAction extends CMSBatchAction {
 		return Convert::raw2json($status);
 	}
 }
-?>
+
diff --git a/code/controllers/NestedController.php b/code/controllers/NestedController.php
index 8930638e..2dc4aa83 100644
--- a/code/controllers/NestedController.php
+++ b/code/controllers/NestedController.php
@@ -11,4 +11,3 @@ interface NestedController {
 
 }
 
-?>
\ No newline at end of file
diff --git a/code/controllers/ReportAdmin.php b/code/controllers/ReportAdmin.php
index a1c26ae6..1d13c849 100644
--- a/code/controllers/ReportAdmin.php
+++ b/code/controllers/ReportAdmin.php
@@ -99,4 +99,3 @@ class ReportAdmin extends LeftAndMain {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/code/controllers/SilverStripeNavigator.php b/code/controllers/SilverStripeNavigator.php
index 030d453c..1c3acb45 100644
--- a/code/controllers/SilverStripeNavigator.php
+++ b/code/controllers/SilverStripeNavigator.php
@@ -343,4 +343,3 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/code/controllers/StaticExporter.php b/code/controllers/StaticExporter.php
index 79890a7d..1dbb8dd6 100644
--- a/code/controllers/StaticExporter.php
+++ b/code/controllers/StaticExporter.php
@@ -112,4 +112,3 @@ class StaticExporter extends Controller {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/code/forms/AssetTableField.php b/code/forms/AssetTableField.php
index 02e406d0..6856d70a 100644
--- a/code/forms/AssetTableField.php
+++ b/code/forms/AssetTableField.php
@@ -360,4 +360,4 @@ class AssetTableField extends ComplexTableField {
 	}
 }
 
-?>
+
diff --git a/code/forms/FileList.php b/code/forms/FileList.php
index 37aa69f7..1c42fa0e 100644
--- a/code/forms/FileList.php
+++ b/code/forms/FileList.php
@@ -18,4 +18,3 @@ class FileList extends TableListField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/code/forms/ThumbnailStripField.php b/code/forms/ThumbnailStripField.php
index d4f560c7..1b5b4b42 100644
--- a/code/forms/ThumbnailStripField.php
+++ b/code/forms/ThumbnailStripField.php
@@ -192,4 +192,3 @@ HTML;
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/code/model/CurrentPageIdentifier.php b/code/model/CurrentPageIdentifier.php
index 1a0fe1c2..215a28a8 100644
--- a/code/model/CurrentPageIdentifier.php
+++ b/code/model/CurrentPageIdentifier.php
@@ -19,4 +19,3 @@ interface CurrentPageIdentifier {
 	function isCurrentPage(DataObject $page);
 }
 
-?>
\ No newline at end of file
diff --git a/code/model/ErrorPage.php b/code/model/ErrorPage.php
index ff9a08a1..33aecfc8 100644
--- a/code/model/ErrorPage.php
+++ b/code/model/ErrorPage.php
@@ -281,4 +281,4 @@ class ErrorPage_Controller extends Page_Controller {
 }
 
 
-?>
+
diff --git a/code/model/VirtualPage.php b/code/model/VirtualPage.php
index 1f563e14..6e1131f2 100644
--- a/code/model/VirtualPage.php
+++ b/code/model/VirtualPage.php
@@ -483,4 +483,4 @@ class VirtualPage_Controller extends Page_Controller {
 	}
 }
 
-?>
+
diff --git a/code/reports/Report.php b/code/reports/Report.php
index ed466c85..3592869f 100644
--- a/code/reports/Report.php
+++ b/code/reports/Report.php
@@ -517,4 +517,4 @@ abstract class SS_ReportWrapper extends SS_Report {
 	
 }
 
-?>
+
diff --git a/code/search/AdvancedSearchForm.php b/code/search/AdvancedSearchForm.php
index faa473ed..2759a46e 100644
--- a/code/search/AdvancedSearchForm.php
+++ b/code/search/AdvancedSearchForm.php
@@ -134,4 +134,3 @@ class AdvancedSearchForm extends SearchForm {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/code/search/SearchForm.php b/code/search/SearchForm.php
index d42b40db..1b91f28b 100644
--- a/code/search/SearchForm.php
+++ b/code/search/SearchForm.php
@@ -193,4 +193,4 @@ class SearchForm extends Form {
 
 }
 
-?>
+
diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index 68a17705..2f1809f9 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -320,4 +320,3 @@ class FilesystemPublisher extends StaticPublisher {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php
index b557bf47..64315340 100644
--- a/code/staticpublisher/StaticPublisher.php
+++ b/code/staticpublisher/StaticPublisher.php
@@ -154,4 +154,3 @@ abstract class StaticPublisher extends DataExtension {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/code/widgets/Widget.php b/code/widgets/Widget.php
index 6d632bc7..e564b6f0 100644
--- a/code/widgets/Widget.php
+++ b/code/widgets/Widget.php
@@ -230,4 +230,3 @@ class Widget_TreeDropdownField extends TreeDropdownField {
 	function Field() {}
 }
 
-?>
\ No newline at end of file
diff --git a/code/widgets/WidgetArea.php b/code/widgets/WidgetArea.php
index 89b34253..a3f1d9ea 100644
--- a/code/widgets/WidgetArea.php
+++ b/code/widgets/WidgetArea.php
@@ -70,4 +70,3 @@ class WidgetArea extends DataObject {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/tasks/RemoveOrphanedPagesTask.php b/tasks/RemoveOrphanedPagesTask.php
index 848900bc..5790032b 100644
--- a/tasks/RemoveOrphanedPagesTask.php
+++ b/tasks/RemoveOrphanedPagesTask.php
@@ -346,4 +346,3 @@ in the other stage:<br />
 		return $orphans;
 	}
 }
-?>
\ No newline at end of file
diff --git a/tasks/SiteTreeMaintenanceTask.php b/tasks/SiteTreeMaintenanceTask.php
index 4ffd4644..5753c313 100644
--- a/tasks/SiteTreeMaintenanceTask.php
+++ b/tasks/SiteTreeMaintenanceTask.php
@@ -26,4 +26,3 @@ class SiteTreeMaintenanceTask extends Controller {
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/tasks/UpgradeSiteTreePermissionSchemaTask.php b/tasks/UpgradeSiteTreePermissionSchemaTask.php
index 3e024b1a..192f59ff 100644
--- a/tasks/UpgradeSiteTreePermissionSchemaTask.php
+++ b/tasks/UpgradeSiteTreePermissionSchemaTask.php
@@ -48,4 +48,3 @@ class UpgradeSiteTreePermissionSchemaTask extends BuildTask {
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/model/ErrorPageTest.php b/tests/model/ErrorPageTest.php
index c4a6c097..c25c80aa 100644
--- a/tests/model/ErrorPageTest.php
+++ b/tests/model/ErrorPageTest.php
@@ -61,4 +61,3 @@ class ErrorPageTest extends FunctionalTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/model/FileLinkTrackingTest.php b/tests/model/FileLinkTrackingTest.php
index f0357dd9..2386ba6f 100644
--- a/tests/model/FileLinkTrackingTest.php
+++ b/tests/model/FileLinkTrackingTest.php
@@ -111,4 +111,4 @@ class FileLinkTrackingTest extends SapphireTest {
 	}
 }
 
-?>
+
diff --git a/tests/model/SiteConfigTest.php b/tests/model/SiteConfigTest.php
index 25858694..3bf10f1b 100644
--- a/tests/model/SiteConfigTest.php
+++ b/tests/model/SiteConfigTest.php
@@ -36,4 +36,3 @@ class SiteConfigTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/model/SiteTreeBacklinksTest.php b/tests/model/SiteTreeBacklinksTest.php
index 8eb72b6a..69c3a1d9 100644
--- a/tests/model/SiteTreeBacklinksTest.php
+++ b/tests/model/SiteTreeBacklinksTest.php
@@ -255,4 +255,4 @@ class SiteTreeBacklinksTest_DOD extends DataExtension implements TestOnly {
 		$fields->addFieldToTab("Root.Content", new HTMLEditorField("ExtraContent"));
 	}
 }
-?>
+
diff --git a/tests/model/SiteTreeBrokenLinksTest.php b/tests/model/SiteTreeBrokenLinksTest.php
index 45cd73c5..34a26add 100644
--- a/tests/model/SiteTreeBrokenLinksTest.php
+++ b/tests/model/SiteTreeBrokenLinksTest.php
@@ -310,4 +310,3 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/tests/model/SiteTreePermissionsTest.php b/tests/model/SiteTreePermissionsTest.php
index 1cac6862..a2c19836 100644
--- a/tests/model/SiteTreePermissionsTest.php
+++ b/tests/model/SiteTreePermissionsTest.php
@@ -441,4 +441,3 @@ class SiteTreePermissionsTest extends FunctionalTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/search/SearchFormTest.php b/tests/search/SearchFormTest.php
index 75c970e8..481e1bb4 100644
--- a/tests/search/SearchFormTest.php
+++ b/tests/search/SearchFormTest.php
@@ -214,4 +214,3 @@ class ZZZSearchFormTest extends FunctionalTest {
 		);
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.php b/tests/tasks/RemoveOrphanedPagesTaskTest.php
index f608ed28..8f30c282 100644
--- a/tests/tasks/RemoveOrphanedPagesTaskTest.php
+++ b/tests/tasks/RemoveOrphanedPagesTaskTest.php
@@ -102,4 +102,3 @@ class RemoveOrphanedPagesTaskTest extends FunctionalTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/widgets/WidgetControllerTest.php b/tests/widgets/WidgetControllerTest.php
index 3d2b03fc..a254cb95 100644
--- a/tests/widgets/WidgetControllerTest.php
+++ b/tests/widgets/WidgetControllerTest.php
@@ -86,4 +86,3 @@ class WidgetControllerTest_Widget_Controller extends Widget_Controller implement
 		);
 	}
 }
-?>
\ No newline at end of file