diff --git a/html/forms/alert-templates.inc.php b/html/forms/alert-templates.inc.php
index 0dc3ff58cd..67182b1f2e 100644
--- a/html/forms/alert-templates.inc.php
+++ b/html/forms/alert-templates.inc.php
@@ -83,4 +83,3 @@ if(!empty( $ok )) {
 else {
     die("ERROR: $error");
 }
-?>
diff --git a/html/includes/authentication/twofactor.lib.php b/html/includes/authentication/twofactor.lib.php
index 92f2aea2f8..70cfed8acf 100644
--- a/html/includes/authentication/twofactor.lib.php
+++ b/html/includes/authentication/twofactor.lib.php
@@ -237,4 +237,3 @@ function twofactor_auth() {
 		}
 	}
 }
-?>
diff --git a/html/includes/collectd/definitions.local.php b/html/includes/collectd/definitions.local.php
index 4218ae4fa2..5714e64b49 100644
--- a/html/includes/collectd/definitions.local.php
+++ b/html/includes/collectd/definitions.local.php
@@ -75,5 +75,3 @@ function meta_graph_local($host, $plugin, $plugin_instance, $type, $type_instanc
 //	return collectd_draw_meta_stack($opts, $sources);
 	return collectd_draw_meta_line($opts, $sources);
 }
-
-?>
diff --git a/html/includes/collectd/definitions.php b/html/includes/collectd/definitions.php
index e93e35cfdf..932524da10 100644
--- a/html/includes/collectd/definitions.php
+++ b/html/includes/collectd/definitions.php
@@ -2091,5 +2091,3 @@ function meta_graph_tcp_connections($host, $plugin, $plugin_instance, $type, $ty
 
 	return collectd_draw_meta_stack($opts, $sources);
 }
-
-?>
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index deaa1b0843..7448b20218 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -67,5 +67,3 @@ else {
 }
 
 $pagetitle[] = "Settings";
-
-?>
diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index 13227e0136..78356de173 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -71,5 +71,3 @@ require 'overview/syslog.inc.php';
 echo('</div></div></div>');
 
 #require 'overview/current.inc.php");
-
-?>
diff --git a/html/pages/device/overview/sensors/current.inc.php b/html/pages/device/overview/sensors/current.inc.php
index 26cb5e70a7..3013b14f03 100644
--- a/html/pages/device/overview/sensors/current.inc.php
+++ b/html/pages/device/overview/sensors/current.inc.php
@@ -6,5 +6,3 @@ $sensor_unit = "A";
 $sensor_type = "Current";
 
 include('pages/device/overview/generic/sensor.inc.php');
-
-?>
diff --git a/html/pages/device/overview/sensors/humidity.inc.php b/html/pages/device/overview/sensors/humidity.inc.php
index b5f0e14e9f..96e8af1580 100644
--- a/html/pages/device/overview/sensors/humidity.inc.php
+++ b/html/pages/device/overview/sensors/humidity.inc.php
@@ -6,5 +6,3 @@ $sensor_unit = "%";
 $sensor_type = "Humidity";
 
 include('pages/device/overview/generic/sensor.inc.php');
-
-?>
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index eb13def9b7..49f3032b09 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -100,5 +100,3 @@ if (in_array($vars['metric'],array_keys($used_sensors))
 else {
     echo("No sensors of type " . $vars['metric'] . " found.");
 }
-
-?>
diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php
index b017461cdb..f223b5991b 100644
--- a/includes/alerts.inc.php
+++ b/includes/alerts.inc.php
@@ -349,4 +349,3 @@ function GetContacts($results) {
     }
     return $contacts;
 }
-?>
diff --git a/includes/snmptrap/linkUp.inc.php b/includes/snmptrap/linkUp.inc.php
index 852afd48ac..fadee6a27a 100644
--- a/includes/snmptrap/linkUp.inc.php
+++ b/includes/snmptrap/linkUp.inc.php
@@ -20,5 +20,3 @@ if ($ifOperStatus != $interface['ifOperStatus']) {
   log_event("Interface went Up : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['port_id']);
   dbUpdate(array('ifOperStatus' => 'up'), 'ports', 'port_id=?',array($interface['port_id']));
 }
-
-?>