diff --git a/includes/html/pages/device/edit/alert-rules.inc.php b/includes/html/pages/device/edit/alert-rules.inc.php
index 39513db3ae..51f76e31a2 100644
--- a/includes/html/pages/device/edit/alert-rules.inc.php
+++ b/includes/html/pages/device/edit/alert-rules.inc.php
@@ -1,4 +1,3 @@
-<h3> Alert Rules </h3>
 <?php
 
 /*
diff --git a/includes/html/pages/device/edit/apps.inc.php b/includes/html/pages/device/edit/apps.inc.php
index f0a3a85418..f482279f92 100644
--- a/includes/html/pages/device/edit/apps.inc.php
+++ b/includes/html/pages/device/edit/apps.inc.php
@@ -1,4 +1,3 @@
-<h3> Applications </h3>
 <?php
 
 use LibreNMS\Config;
diff --git a/includes/html/pages/device/edit/customoid.inc.php b/includes/html/pages/device/edit/customoid.inc.php
index 52b777706f..887889d17f 100644
--- a/includes/html/pages/device/edit/customoid.inc.php
+++ b/includes/html/pages/device/edit/customoid.inc.php
@@ -1,4 +1,3 @@
-<h3> Custom OIDs </h3>
 <?php
 
 require_once 'includes/html/print-customoid.php';
diff --git a/includes/html/pages/device/edit/device.inc.php b/includes/html/pages/device/edit/device.inc.php
index d58e3cbd01..5a4bca356b 100644
--- a/includes/html/pages/device/edit/device.inc.php
+++ b/includes/html/pages/device/edit/device.inc.php
@@ -97,7 +97,6 @@ $disable_notify = get_dev_attrib($device, 'disable_notify');
 
 ?>
 
-<h3> Device Settings </h3>
 <div class="row">
     <!-- Bootstrap 3 doesn't support mediaqueries for text aligns (e.g. text-md-left), which makes these buttons stagger on sm or xs screens -->
     <div class="col-md-2 col-md-offset-2">
diff --git a/includes/html/pages/device/edit/ipmi.inc.php b/includes/html/pages/device/edit/ipmi.inc.php
index aca710ce43..4db7726659 100644
--- a/includes/html/pages/device/edit/ipmi.inc.php
+++ b/includes/html/pages/device/edit/ipmi.inc.php
@@ -46,8 +46,6 @@ if ($updated && $update_message) {
 
 ?>
 
-<h3>IPMI settings</h3>
-
 <form id="edit" name="edit" method="post" action="" role="form" class="form-horizontal">
 <?php echo csrf_field() ?>
 <input type="hidden" name="editing" value="yes">
diff --git a/includes/html/pages/device/edit/mempools.inc.php b/includes/html/pages/device/edit/mempools.inc.php
index 44ece5b77c..d1527f551d 100755
--- a/includes/html/pages/device/edit/mempools.inc.php
+++ b/includes/html/pages/device/edit/mempools.inc.php
@@ -14,8 +14,6 @@
 
 ?>
 
-<h3>Memory settings</h3>
-
 <div class="table-responsive">
     <table id="mempool" class="table table-hover table-condensed mempool">
         <thead>
diff --git a/includes/html/pages/device/edit/modules.inc.php b/includes/html/pages/device/edit/modules.inc.php
index b620c56e18..8a748eb069 100644
--- a/includes/html/pages/device/edit/modules.inc.php
+++ b/includes/html/pages/device/edit/modules.inc.php
@@ -1,4 +1,3 @@
-<h3> Modules </h3>
 <div class="row">
   <div class="col-sm-6">
     <strong>Poller Modules</strong>
diff --git a/includes/html/pages/device/edit/ports.inc.php b/includes/html/pages/device/edit/ports.inc.php
index d165759e73..bf644b5aca 100644
--- a/includes/html/pages/device/edit/ports.inc.php
+++ b/includes/html/pages/device/edit/ports.inc.php
@@ -1,5 +1,4 @@
 </form>
-<h3> Port Settings </h3>
 <span id="message"></span>
 
 <form id='ignoreport' name='ignoreport' method='post' action='' role='form' class='form-inline'>
diff --git a/includes/html/pages/device/edit/processors.inc.php b/includes/html/pages/device/edit/processors.inc.php
index f0b0b05517..bbe70ae049 100644
--- a/includes/html/pages/device/edit/processors.inc.php
+++ b/includes/html/pages/device/edit/processors.inc.php
@@ -13,9 +13,6 @@
  */
 
 ?>
-
-<h3>Processor settings</h3>
-
 <div class="table-responsive">
     <table id="processor" class="table table-hover table-condensed processor">
         <thead>
diff --git a/includes/html/pages/device/edit/routing.inc.php b/includes/html/pages/device/edit/routing.inc.php
index e4397b7185..3fa973c1a6 100644
--- a/includes/html/pages/device/edit/routing.inc.php
+++ b/includes/html/pages/device/edit/routing.inc.php
@@ -13,8 +13,6 @@
  */
 
 ?>
-<h3>Routing settings</h3>
-
 <div class="table-responsive">
     <table id="routing" class="table table-hover table-condensed routing">
         <thead>
diff --git a/includes/html/pages/device/edit/sensors-common.php b/includes/html/pages/device/edit/sensors-common.php
index 721e821c9c..309674c1ac 100644
--- a/includes/html/pages/device/edit/sensors-common.php
+++ b/includes/html/pages/device/edit/sensors-common.php
@@ -15,9 +15,7 @@
  */
 
 // FUA
-echo "<h3>$title</h3>";
 ?>
-
 <form class="form-inline">
 <?php echo csrf_field() ?>
 <table class="table table-striped table-condensed table-bordered">
diff --git a/includes/html/pages/device/edit/snmp.inc.php b/includes/html/pages/device/edit/snmp.inc.php
index cbf5d439c0..e755f310c0 100644
--- a/includes/html/pages/device/edit/snmp.inc.php
+++ b/includes/html/pages/device/edit/snmp.inc.php
@@ -178,8 +178,6 @@ $device = dbFetchRow('SELECT * FROM `devices` WHERE `device_id` = ?', [$device['
 $max_oid = get_dev_attrib($device, 'snmp_max_oid');
 $max_repeaters = get_dev_attrib($device, 'snmp_max_repeaters');
 
-echo '<h3> SNMP Settings </h3>';
-
 // use PHP Flasher to print normal (success) messages, similar to Device Settings
 if (isset($update_message)) {
     if (is_array($update_message)) {
diff --git a/includes/html/pages/device/edit/storage.inc.php b/includes/html/pages/device/edit/storage.inc.php
index eb1c649601..75cde3972e 100644
--- a/includes/html/pages/device/edit/storage.inc.php
+++ b/includes/html/pages/device/edit/storage.inc.php
@@ -13,9 +13,6 @@
  */
 
 ?>
-
-<h3>Storage Settings</h3>
-
 <div class="table-responsive">
     <table id="storage" class="table table-hover table-condensed storage">
         <thead>