diff --git a/modules/aggregator/templates/list.php b/modules/aggregator/templates/list.php
index 476132c030b1944a656e42a98fdccded53a16d90..27758af852c120f7e72ca91f27f246b1705c0996 100644
--- a/modules/aggregator/templates/list.php
+++ b/modules/aggregator/templates/list.php
@@ -2,7 +2,6 @@
 $this->data['header'] = $this->t('{aggregator:dict:aggregator_header}');
 $this->includeAtTemplateBase('includes/header.php');
 
-echo('<div id="content">');
 echo('<h1>'. $this->data['header'] . '</h1>');
 
 if (count($this->data['sources']) === 0) {
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index 6632a19b621eacf95e351e7c7211c4e79e360ef4..c9e8d7a07a5a8a52e56caa36c55e62990d359f74 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -6,7 +6,6 @@ $this->data['autofocus'] = 'otp';
 $this->includeAtTemplateBase('includes/header.php');
 
 ?>
-<div id="content">
 
 <?php
 if ($this->data['errorcode'] !== NULL) {
diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php
index b7bdc3ed336b37bc10c81fc5b4a9144d402044c7..de96ab211d874edcba18059291a3b5a02f4b8109 100755
--- a/modules/consentAdmin/templates/consentadmin.php
+++ b/modules/consentAdmin/templates/consentadmin.php
@@ -53,7 +53,6 @@ span.showhide {
 }
 </style>
 	
-	<div id="content">
 
 		<!-- <h2><?php if (isset($this->data['header'])) { echo $this->t($this->data['header']); } else { echo "Some error occured"; } ?></h2> -->
 	    <h2><?php echo $this->t('consentadmin_header') ?></h2>	
diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 6beedd4a0501174757f142c595674902a64be6f2..771c4134f7fd7acecf04aec385f78d32088bf031 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -10,7 +10,6 @@ if (strlen($this->data['username']) > 0) {
 $this->includeAtTemplateBase('includes/header.php');
 
 ?>
-<div id="content">
 
 <?php
 if ($this->data['errorcode'] !== NULL) {
diff --git a/modules/cron/templates/croninfo-tpl.php b/modules/cron/templates/croninfo-tpl.php
index d0a6b6223bbdb7c7176cb48b1671e291aacc444c..41843c12258631da0469821b392d49848926ccd8 100644
--- a/modules/cron/templates/croninfo-tpl.php
+++ b/modules/cron/templates/croninfo-tpl.php
@@ -4,7 +4,6 @@ $this->data['header'] = 'Cron information page';
 $this->includeAtTemplateBase('includes/header.php');
 
 ?>
-<div id="content">
 
 	<p>Cron is a way to run things regularly on unix systems.</p>
 	
diff --git a/modules/logpeek/templates/logpeek.php b/modules/logpeek/templates/logpeek.php
index c89f80a70ced42ac2797b2136b5f21a01c4eec58..b85e678382e38e08e9a38123e895413e5582130b 100644
--- a/modules/logpeek/templates/logpeek.php
+++ b/modules/logpeek/templates/logpeek.php
@@ -4,7 +4,6 @@ $this->includeAtTemplateBase('includes/header.php');
 
 
 ?>
-<div id="content">
 
 <h2>SimpleSAMLphp logs (admin utility)</h2>
 
diff --git a/modules/modinfo/templates/modlist.php b/modules/modinfo/templates/modlist.php
index 09a4717947cd1d61a876a4301ae7abb9fdcee36f..e9ed80d8a81291c9bc75cc3990f99970dccb5a9d 100644
--- a/modules/modinfo/templates/modlist.php
+++ b/modules/modinfo/templates/modlist.php
@@ -7,7 +7,6 @@ $this->includeAtTemplateBase('includes/header.php');
 #$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />';
 
 ?>
-<div id="content">
 
 <h2><?php echo($this->data['header']); ?></h2>
 
diff --git a/modules/openid/templates/consumer.php b/modules/openid/templates/consumer.php
index e056d045a04b610ec3db26f21c3e830e1b7b4e24..8471693c6f215679a95f0ec9b488f472dc09bbc5 100644
--- a/modules/openid/templates/consumer.php
+++ b/modules/openid/templates/consumer.php
@@ -38,7 +38,6 @@ div.error {
 	border: 1px solid #600;
 }
 </style>
-<div id="content">
 
 
     <?php if (isset($this->data['error'])) { print "<div class=\"error\">" . $this->data['error'] . "</div>"; } ?>
diff --git a/modules/sanitycheck/templates/check-tpl.php b/modules/sanitycheck/templates/check-tpl.php
index ce27f624a7dac5e81175c46dd43f8864bf9b2f7a..6c745004229e61b9841a4765ef59b15fb8582065 100644
--- a/modules/sanitycheck/templates/check-tpl.php
+++ b/modules/sanitycheck/templates/check-tpl.php
@@ -3,7 +3,6 @@ $this->data['header'] = 'Sanity check';
 $this->includeAtTemplateBase('includes/header.php');
 
 ?>
-<div id="content">
 
 <h2><?php echo($this->data['header']); ?></h2>