diff --git a/ajax/addbook.php b/ajax/addbook.php
index 70f47cc8..751185b4 100644
--- a/ajax/addbook.php
+++ b/ajax/addbook.php
@@ -17,4 +17,3 @@ $tmpl = new OCP\Template('contacts', 'part.editaddressbook');
 $tmpl->assign('new', true);
 $tmpl->assign('addressbook', $book);
 $tmpl->printPage();
-?>
diff --git a/ajax/categories/categoriesfor.php b/ajax/categories/categoriesfor.php
index 846af300..6b6fcad0 100644
--- a/ajax/categories/categoriesfor.php
+++ b/ajax/categories/categoriesfor.php
@@ -25,4 +25,3 @@ foreach($vcard->children as $property){
 	}
 }
 OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
-?>
diff --git a/ajax/categories/delete.php b/ajax/categories/delete.php
index 76c23d64..7c326144 100644
--- a/ajax/categories/delete.php
+++ b/ajax/categories/delete.php
@@ -45,5 +45,3 @@ $catman->delete($categories, $cards);
 debug('After delete: '.print_r($catman->categories(), true));
 OC_Contacts_VCard::updateDataByID($cards);
 OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
-
-?>
diff --git a/ajax/categories/list.php b/ajax/categories/list.php
index 3ae76353..f234116b 100644
--- a/ajax/categories/list.php
+++ b/ajax/categories/list.php
@@ -13,5 +13,3 @@ OCP\JSON::checkAppEnabled('contacts');
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>
diff --git a/ajax/categories/rescan.php b/ajax/categories/rescan.php
index 0d8464a2..fd875a96 100644
--- a/ajax/categories/rescan.php
+++ b/ajax/categories/rescan.php
@@ -14,5 +14,3 @@ OC_Contacts_App::scanCategories();
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>
diff --git a/ajax/currentphoto.php b/ajax/currentphoto.php
index b10e752c..8f60eca0 100644
--- a/ajax/currentphoto.php
+++ b/ajax/currentphoto.php
@@ -51,5 +51,3 @@ if( is_null($contact)) {
 		bailOut(OC_Contacts_App::$l10n->t('The loading photo is not valid.'));
 	}
 }
-
-?>
diff --git a/ajax/editaddress.php b/ajax/editaddress.php
index 2d7aba11..1eb9429d 100644
--- a/ajax/editaddress.php
+++ b/ajax/editaddress.php
@@ -39,5 +39,3 @@ $tmpl->assign('adr_types',$adr_types);
 
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
-
-?>
diff --git a/ajax/editaddressbook.php b/ajax/editaddressbook.php
index 7a9b757a..4bc77302 100644
--- a/ajax/editaddressbook.php
+++ b/ajax/editaddressbook.php
@@ -14,4 +14,3 @@ $tmpl = new OCP\Template("contacts", "part.editaddressbook");
 $tmpl->assign('new', false);
 $tmpl->assign('addressbook', $addressbook);
 $tmpl->printPage();
-?>
diff --git a/ajax/editname.php b/ajax/editname.php
index 868ca222..9e7c090e 100644
--- a/ajax/editname.php
+++ b/ajax/editname.php
@@ -32,5 +32,3 @@ if($id) {
 }
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page)));
-
-?>
diff --git a/ajax/importaddressbook.php b/ajax/importaddressbook.php
index 3c01e24a..6b5b0668 100644
--- a/ajax/importaddressbook.php
+++ b/ajax/importaddressbook.php
@@ -21,4 +21,3 @@ $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->printpage();
-?>
diff --git a/ajax/importdialog.php b/ajax/importdialog.php
index 5f8805a6..69152253 100644
--- a/ajax/importdialog.php
+++ b/ajax/importdialog.php
@@ -13,4 +13,3 @@ $tmpl = new OCP\Template('contacts', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
-?>
diff --git a/ajax/oc_photo.php b/ajax/oc_photo.php
index 5c50ba92..710179ff 100644
--- a/ajax/oc_photo.php
+++ b/ajax/oc_photo.php
@@ -58,5 +58,3 @@ if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 } else {
 	bailOut('Couldn\'t save temporary image: '.$tmpkey);
 }
-
-?>
diff --git a/ajax/uploadimport.php b/ajax/uploadimport.php
index 95115208..80b282f3 100644
--- a/ajax/uploadimport.php
+++ b/ajax/uploadimport.php
@@ -70,6 +70,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-
-
-?>
diff --git a/ajax/uploadphoto.php b/ajax/uploadphoto.php
index 8545ca84..6bb3fe8a 100644
--- a/ajax/uploadphoto.php
+++ b/ajax/uploadphoto.php
@@ -102,4 +102,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-?>
diff --git a/export.php b/export.php
index 58fdb040..eb506506 100644
--- a/export.php
+++ b/export.php
@@ -32,4 +32,3 @@ if(isset($bookid)){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }
-?>
diff --git a/index.php b/index.php
index 0b4f89b3..a89ffffa 100644
--- a/index.php
+++ b/index.php
@@ -73,5 +73,3 @@ $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();
-
-?>
diff --git a/settings.php b/settings.php
index bc57f4a1..a0794993 100644
--- a/settings.php
+++ b/settings.php
@@ -4,4 +4,3 @@ $tmpl = new OCP\Template( 'contacts', 'settings');
 $tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
 
 return $tmpl->fetchPage();
-?>