diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 1aa40bd8aa48cd3925dc77714a660e2257501f62..a8719fc7a3d3454aaadd9b963ca7af03e1e0b5f0 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -25,4 +25,3 @@ OC_Mount_Config::createCertificateBundle();
 
 header("Location: settings/personal.php");
 exit;
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index 5f2ff17e6259bb6e7ec896d3a025f22d7257a824..f5923940dc90ddd055f5ed48190e29ae5c96793b 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -37,5 +37,3 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 } else {
 	OCP\JSON::error(array('data' => array('message' => 'Please provide a valid Dropbox app key and secret.')));
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index 23ecfc3708dc20498369d24f538e0ce373d20dbe..4cd01c06cc9d9f81c90e05bb014f91707cd5a55a 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -47,5 +47,3 @@ if (isset($_POST['step'])) {
 			break;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index f78f85b8fe4dfee31f95b8ad028b25aa0bc97fbe..9b78e180d9ea01596e8efff0c2223a74b1ac85e7 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -9,4 +9,3 @@ $cert = $_POST['cert'];
 $file = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/'.$cert;
 unlink($file);
 OC_Mount_Config::createCertificateBundle();
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 34f8ba25574ed9fe2a994128cafd04eca78c96ef..41ec3c70b45ed00471c4b5560846d104da11d72e 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -232,5 +232,3 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index b90563a5065ce655495a29d92f84d8c8e8bd1a2e..bb86894e55ea75dcf9bc71ed385125d3f0513a22 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -251,5 +251,3 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index dec501741b608736d48814950f7afc56e394fdd2..f0d76460f546056af83e35ce69c3ac8b56000a40 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -31,5 +31,3 @@ $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index acc9036b299822f894cc40f713b93afa8fa4a658..b586ce1e8cd0914309793397ba85219a9cf36bce 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,5 +30,3 @@ $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/tests/test.php b/apps/files_external/tests/test.php
index bd24404f3b9853d1a01e01f05ea5aa50f1a3ea67..5387279fb07dc82d521f8accb820c5cd3df647d6 100644
--- a/apps/files_external/tests/test.php
+++ b/apps/files_external/tests/test.php
@@ -4,4 +4,3 @@ echo "<pre>";
 print_r(OC_Mount_Config::getSystemMountPoints());
 echo "</pre>";
 // OC_Mount_Config::addMountPoint('Photos', 'OC_Filestorage_SWIFT', array('host' => 'gapinthecloud.com', 'user' => 'Gap', 'token' => '23423afdasFJEW22', 'secure' => 'true', 'root' => ''), OC_Mount_Config::MOUNT_TYPE_GROUP, 'admin', false);
-?>
diff --git a/apps/files_versions/appinfo/api.php b/apps/files_versions/appinfo/api.php
index a7386bc2c9f2a21953ce25c6ba8a59d201fc2dc0..3c45ff52457c0b70fea67a69d84c8b76c57ba35d 100644
--- a/apps/files_versions/appinfo/api.php
+++ b/apps/files_versions/appinfo/api.php
@@ -32,5 +32,3 @@ return array(
 		)
 	)
 );
-
-?>
\ No newline at end of file
diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php
index db80172979dd3fbd6bc0478c5b89e714841f73e5..4fb866bd999462979b7c1be5c2e40f65ebe13982 100644
--- a/apps/files_versions/settings-personal.php
+++ b/apps/files_versions/settings-personal.php
@@ -5,4 +5,3 @@ $tmpl = new OCP\Template( 'files_versions', 'settings-personal');
 OCP\Util::addscript('files_versions','settings-personal');
 
 return $tmpl->fetchPage();
-?>
\ No newline at end of file
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index db1087449a5574f01c996f2f49437f08af28f4db..ebadcf30b6ce973935908857605730c07c98cc59 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -35,4 +35,3 @@ $entry = array(
 	'href' => OC_Helper::linkTo( "user_webdavauth", "settings.php" ),
 	'name' => 'WEBDAVAUTH'
 );
-?>
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 5bd1af53c924c1f98dcc3e890420723170cad2c6..1b80b1bba34e9aacc697bbf0829dbacbefc9b850 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -34,7 +34,3 @@ $tmpl = new OC_Template( 'user_webdavauth', 'settings');
 $tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
 
 return $tmpl->fetchPage();
-
-
-
-?>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 4490b1e451942a12d261c071ddb20ecaba75666e..571aca2f70ff8b28c9fdeccc2469af8620fb6f0e 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -81,5 +81,3 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		return $returnArray;
 	}
 }
-
-?>
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index d74badbe4f1d998554ccdbb939529a82e78f77e4..66c68b93778c936048fff36a7d48166d4744aeb6 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -383,5 +383,3 @@ class MDB2_Driver_Datatype_sqlite3 extends MDB2_Driver_Datatype_Common
 
     // }}}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Native/sqlite3.php b/lib/MDB2/Driver/Native/sqlite3.php
index de650107238f27cef8bf4cfa979f08562825c409..344d523bdf3285b38e12789f1959f9a8a41199b6 100644
--- a/lib/MDB2/Driver/Native/sqlite3.php
+++ b/lib/MDB2/Driver/Native/sqlite3.php
@@ -31,4 +31,3 @@ require_once 'MDB2/Driver/Native/Common.php';
 class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
 {
 }
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index 33e5b59026895181e1c029e4264d2e6b3984fc6f..e5c758e3503a4cbbd11e440aeb116d9aaf396403 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -584,5 +584,3 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
            'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index 91b1bffc2d725d8ad044c27aec476cf2bd4794de..9ad0f0f68f6d15c8d1154df6c6221e7a1817516a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1119,5 +1119,3 @@ interface Share_Backend_Collection extends Share_Backend {
 	public function getChildren($itemSource);
 
 }
-
-?>