diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index de9e93a5c..89d3ab7c1 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -147,4 +147,3 @@ if($settings->_cookieLifetime) {
 	/* Turn off http only cookies if jumploader is enabled */
 	setcookie("mydms_session", $dms_session, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
 }
-?>
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index af9dff37b..cbf170a34 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -301,4 +301,3 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.ClassCalendar.php b/inc/inc.ClassCalendar.php
index e50aafc7f..f7e87aab4 100644
--- a/inc/inc.ClassCalendar.php
+++ b/inc/inc.ClassCalendar.php
@@ -90,4 +90,3 @@ class SeedDMS_Calendar {
 		return $ret;
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php
index 4c3749f54..dab542824 100644
--- a/inc/inc.ClassControllerCommon.php
+++ b/inc/inc.ClassControllerCommon.php
@@ -248,5 +248,4 @@ class SeedDMS_Controller_Common {
 		}
 		return false;
 	} /* }}} */
-
 }
diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index b6651b460..5980b6159 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -215,4 +215,3 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		return true;
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php
index e1882290b..28d32cc9c 100644
--- a/inc/inc.ClassEmailUtils.php
+++ b/inc/inc.ClassEmailUtils.php
@@ -47,4 +47,3 @@ class SeedDMS_EmailUtils {
 	} /* }}} */
 
 }
-?>
diff --git a/inc/inc.ClassExtBase.php b/inc/inc.ClassExtBase.php
index fa7135803..d9cd0602c 100644
--- a/inc/inc.ClassExtBase.php
+++ b/inc/inc.ClassExtBase.php
@@ -30,5 +30,3 @@
  */
 class SeedDMS_ExtBase {
 }
-
-?>
diff --git a/inc/inc.ClassNotify.php b/inc/inc.ClassNotify.php
index a0c1fa861..6655daa39 100644
--- a/inc/inc.ClassNotify.php
+++ b/inc/inc.ClassNotify.php
@@ -29,4 +29,3 @@ abstract class SeedDMS_Notify {
 	abstract function toGroup($sender, $groupRecipient, $subject, $message, $params=array());
 	abstract function toList($sender, $recipients, $subject, $message, $params=array());
 }
-?>
diff --git a/inc/inc.ClassPasswordStrength.php b/inc/inc.ClassPasswordStrength.php
index b71e7b4c5..ef45d6da8 100644
--- a/inc/inc.ClassPasswordStrength.php
+++ b/inc/inc.ClassPasswordStrength.php
@@ -274,4 +274,3 @@ class Password_Strength {
 		return $score_info;
 	}
 }
-?>
diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 1bc98a1b3..8dcc92283 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -510,4 +510,3 @@ class SeedDMS_SessionMgr {
 
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 897e42689..7965fc619 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -1575,4 +1575,3 @@ class Settings { /* {{{ */
 
 } /* }}} */
 
-?>
diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 8f8ee5047..00422e869 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -181,5 +181,3 @@ class UI extends UI_Default {
 		exit;
 	}
 }
-
-?>
diff --git a/inc/inc.ClassUI_Default.php b/inc/inc.ClassUI_Default.php
index 581655425..4bbab1a4b 100644
--- a/inc/inc.ClassUI_Default.php
+++ b/inc/inc.ClassUI_Default.php
@@ -1113,4 +1113,3 @@ mayscript>
 <?php
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 8ec9f69bf..9979e1383 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -209,4 +209,3 @@ class SeedDMS_View_Common {
 		echo "};\n";
 	} /* }}} */
 }
-?>
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 1519dd4e0..1b8d31ab4 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -64,5 +64,3 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		}
 	}
 }
-
-?>
diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 5c5624c8c..ef9950862 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -306,4 +306,3 @@ function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex
 	}
 } /* }}} */
 
-?>
diff --git a/inc/inc.LogInit.php b/inc/inc.LogInit.php
index 6bf238773..d75101f9e 100644
--- a/inc/inc.LogInit.php
+++ b/inc/inc.LogInit.php
@@ -34,5 +34,3 @@ if ($settings->_logFileEnable) {
 } else {
 	$logger = null;
 }
-
-?>
diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 9e4479424..75f124709 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -80,5 +80,3 @@ if($settings->_enableFullSearch) {
  * relative to it.
  */
 ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path'));
-
-?>
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 3173c93e4..547370723 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -663,4 +663,3 @@ class SeedDMS_CSRF {
 //$kkk = $CSRF->create_api_key();
 //echo $kkk;
 //echo $CSRF->check_api_key($kkk) ? 'valid' : 'invalid';
-?>