From b918f8f5d34841596e1db58488af740261478240 Mon Sep 17 00:00:00 2001
From: Stig Sandbeck Mathisen <ssm@fnord.no>
Date: Tue, 17 Mar 2015 01:01:17 +0100
Subject: [PATCH] Remove emacs mode hints

---
 ChangeLog                                         | 1 -
 Makefile                                          | 1 -
 Makefile.config                                   | 1 -
 Makefile.config-maint                             | 1 -
 Makefile.javaplugin                               | 1 -
 contrib/munin-mergedb.pl                          | 1 -
 contrib/plugin-gallery/static/gallery-header.html | 1 -
 doc/conf.py                                       | 2 +-
 lib/Munin.pm.PL                                   | 1 -
 lib/Munin/Master/Graph.pm                         | 1 -
 lib/Munin/Master/GraphOld.pm                      | 1 -
 lib/Munin/Master/HTMLOld.pm                       | 1 -
 lib/Munin/Master/LimitsOld.pm                     | 1 -
 lib/Munin/Master/Utils.pm                         | 1 -
 lib/Munin/Plugin.pm                               | 1 -
 lib/Munin/Plugin/Framework.pm                     | 1 -
 lib/Munin/Plugin/HTTP.pm                          | 1 -
 lib/Munin/Plugin/Pgsql.pm                         | 1 -
 lib/Munin/Plugin/SNMP.pm                          | 1 -
 master/extras/munin-update_old.in                 | 1 -
 master/www/munin-dynazoom.tmpl                    | 1 -
 master/www/munin-overview.tmpl                    | 2 +-
 node/t/munin-node-configure.t                     | 1 -
 plugins/node.d.aix/cpu                            | 1 -
 plugins/node.d.aix/df                             | 1 -
 plugins/node.d.aix/iostat                         | 1 -
 plugins/node.d.aix/iostat.hd_only                 | 1 -
 plugins/node.d.aix/iostat.vp_only                 | 1 -
 plugins/node.d.aix/load                           | 1 -
 plugins/node.d.aix/memory                         | 1 -
 plugins/node.d.aix/netstat                        | 1 -
 plugins/node.d.aix/processes                      | 1 -
 plugins/node.d.aix/swap                           | 1 -
 plugins/node.d.cygwin/df                          | 1 -
 plugins/node.d.cygwin/netstat                     | 1 -
 plugins/node.d.darwin/if_                         | 1 -
 plugins/node.d.darwin/if_err_                     | 1 -
 plugins/node.d.darwin/load                        | 1 -
 plugins/node.d.darwin/uptime                      | 1 -
 plugins/node.d.debug/colour_tester                | 1 -
 plugins/node.d.debug/env                          | 1 -
 plugins/node.d.debug/extinfo_tester               | 1 -
 plugins/node.d.debug/id                           | 1 -
 plugins/node.d.debug/if                           | 1 -
 plugins/node.d.debug/rrdcached                    | 1 -
 plugins/node.d.debug/sum_cdef_tester              | 1 -
 plugins/node.d.debug/tc                           | 1 -
 plugins/node.d.debug/warning_tester               | 1 -
 plugins/node.d.freebsd/coretemp                   | 1 -
 plugins/node.d.freebsd/dev_cpu_                   | 1 -
 plugins/node.d.freebsd/if_                        | 1 -
 plugins/node.d.freebsd/if_errcoll_                | 1 -
 plugins/node.d.freebsd/iostat                     | 1 -
 plugins/node.d.freebsd/load                       | 1 -
 plugins/node.d.freebsd/netstat                    | 1 -
 plugins/node.d.freebsd/open_files                 | 1 -
 plugins/node.d.freebsd/swap                       | 1 -
 plugins/node.d.freebsd/uptime                     | 1 -
 plugins/node.d.freebsd/vmstat                     | 1 -
 plugins/node.d.hp-ux/df                           | 1 -
 plugins/node.d.hp-ux/df_inode                     | 1 -
 plugins/node.d.hp-ux/mw_cpu                       | 1 -
 plugins/node.d.hp-ux/mw_globalutilization         | 1 -
 plugins/node.d.hp-ux/mw_memory                    | 1 -
 plugins/node.d.java/jmx_                          | 1 -
 plugins/node.d.java/jmx_tomcat_dbpools            | 1 -
 plugins/node.d.linux/apt                          | 1 -
 plugins/node.d.linux/apt_all                      | 1 -
 plugins/node.d.linux/bonding_err_                 | 1 -
 plugins/node.d.linux/buddyinfo                    | 1 -
 plugins/node.d.linux/cpuspeed                     | 1 -
 plugins/node.d.linux/df                           | 1 -
 plugins/node.d.linux/df_abs                       | 1 -
 plugins/node.d.linux/diskstat_                    | 1 -
 plugins/node.d.linux/diskstats                    | 1 -
 plugins/node.d.linux/fw_packets                   | 1 -
 plugins/node.d.linux/hwmon                        | 1 -
 plugins/node.d.linux/if_                          | 1 -
 plugins/node.d.linux/if_err_                      | 1 -
 plugins/node.d.linux/iostat                       | 1 -
 plugins/node.d.linux/iostat_ios                   | 1 -
 plugins/node.d.linux/ip_                          | 1 -
 plugins/node.d.linux/irqstats                     | 1 -
 plugins/node.d.linux/meminfo                      | 1 -
 plugins/node.d.linux/memory                       | 1 -
 plugins/node.d.linux/netstat                      | 1 -
 plugins/node.d.linux/netstat_multi                | 1 -
 plugins/node.d.linux/nfs4_client                  | 1 -
 plugins/node.d.linux/nfs_client                   | 1 -
 plugins/node.d.linux/nfsd                         | 1 -
 plugins/node.d.linux/nfsd4                        | 1 -
 plugins/node.d.linux/numa_                        | 1 -
 plugins/node.d.linux/port_                        | 1 -
 plugins/node.d.linux/proc                         | 1 -
 plugins/node.d.linux/proc_pri                     | 1 -
 plugins/node.d.linux/procfs                       | 1 -
 plugins/node.d.linux/procsys                      | 1 -
 plugins/node.d.linux/selinux_avcstat              | 1 -
 plugins/node.d.linux/threads                      | 1 -
 plugins/node.d.linux/vserver_cpu_                 | 1 -
 plugins/node.d.linux/vserver_loadavg              | 1 -
 plugins/node.d.linux/vserver_resources            | 1 -
 plugins/node.d.linux/yum                          | 1 -
 plugins/node.d.netbsd/iostat                      | 1 -
 plugins/node.d.netbsd/iostat_ops                  | 1 -
 plugins/node.d.openbsd/if_                        | 1 -
 plugins/node.d.openbsd/if_errcoll_                | 1 -
 plugins/node.d.openbsd/load                       | 1 -
 plugins/node.d.openbsd/netstat                    | 1 -
 plugins/node.d.openbsd/open_files                 | 1 -
 plugins/node.d.openbsd/swap                       | 1 -
 plugins/node.d.sunos/cpu                          | 1 -
 plugins/node.d.sunos/df                           | 1 -
 plugins/node.d.sunos/df_inode                     | 1 -
 plugins/node.d.sunos/if_                          | 1 -
 plugins/node.d.sunos/if_err_                      | 1 -
 plugins/node.d.sunos/iostat                       | 1 -
 plugins/node.d.sunos/load                         | 1 -
 plugins/node.d.sunos/memory                       | 1 -
 plugins/node.d.sunos/netstat                      | 1 -
 plugins/node.d.sunos/paging_in                    | 1 -
 plugins/node.d.sunos/paging_out                   | 1 -
 plugins/node.d.sunos/temperature                  | 1 -
 plugins/node.d.sunos/uptime                       | 1 -
 plugins/node.d/amavis                             | 1 -
 plugins/node.d/apache                             | 1 -
 plugins/node.d/apc_envunit_                       | 1 -
 plugins/node.d/apc_nis                            | 1 -
 plugins/node.d/asterisk                           | 1 -
 plugins/node.d/bind9                              | 1 -
 plugins/node.d/bind9_rndc                         | 1 -
 plugins/node.d/cmc_tc_sensor_                     | 1 -
 plugins/node.d/courier_                           | 1 -
 plugins/node.d/courier_mta_mailqueue              | 1 -
 plugins/node.d/courier_mta_mailstats              | 1 -
 plugins/node.d/courier_mta_mailvolume             | 1 -
 plugins/node.d/cupsys_pages                       | 1 -
 plugins/node.d/df                                 | 1 -
 plugins/node.d/df_inode                           | 1 -
 plugins/node.d/dhcpd3                             | 1 -
 plugins/node.d/digitemp_                          | 1 -
 plugins/node.d/ejabberd_                          | 1 -
 plugins/node.d/exim_mailqueue                     | 1 -
 plugins/node.d/exim_mailqueue_alt                 | 1 -
 plugins/node.d/exim_mailstats                     | 1 -
 plugins/node.d/external_                          | 1 -
 plugins/node.d/fail2ban                           | 1 -
 plugins/node.d/foldingathome                      | 1 -
 plugins/node.d/foldingathome_rank                 | 1 -
 plugins/node.d/foldingathome_wu                   | 1 -
 plugins/node.d/haproxy_                           | 1 -
 plugins/node.d/hddtemp                            | 1 -
 plugins/node.d/hddtemp2                           | 1 -
 plugins/node.d/hddtemp_smartctl                   | 1 -
 plugins/node.d/hddtempd                           | 1 -
 plugins/node.d/http_loadtime                      | 1 -
 plugins/node.d/ifx_concurrent_sessions_           | 1 -
 plugins/node.d/ipac-ng                            | 1 -
 plugins/node.d/ipmi_                              | 1 -
 plugins/node.d/ipmi_sensor_                       | 1 -
 plugins/node.d/ircu                               | 1 -
 plugins/node.d/jenkins_builds                     | 1 -
 plugins/node.d/jenkins_builds_results             | 1 -
 plugins/node.d/jenkins_builds_results_summary     | 1 -
 plugins/node.d/jenkins_builds_running             | 1 -
 plugins/node.d/jenkins_jobs                       | 1 -
 plugins/node.d/loggrep                            | 1 -
 plugins/node.d/lpstat                             | 1 -
 plugins/node.d/mailman                            | 1 -
 plugins/node.d/mailscanner                        | 1 -
 plugins/node.d/mbmon_                             | 1 -
 plugins/node.d/memcached_                         | 1 -
 plugins/node.d/mhttping                           | 1 -
 plugins/node.d/multiping                          | 1 -
 plugins/node.d/multips                            | 1 -
 plugins/node.d/multips_memory                     | 1 -
 plugins/node.d/munin_stats                        | 1 -
 plugins/node.d/munin_update                       | 1 -
 plugins/node.d/mysql_                             | 1 -
 plugins/node.d/mysql_bytes                        | 1 -
 plugins/node.d/mysql_isam_space_                  | 1 -
 plugins/node.d/mysql_queries                      | 1 -
 plugins/node.d/mysql_slowqueries                  | 1 -
 plugins/node.d/mysql_threads                      | 1 -
 plugins/node.d/named                              | 1 -
 plugins/node.d/netopia                            | 1 -
 plugins/node.d/netstat                            | 1 -
 plugins/node.d/nginx_request                      | 1 -
 plugins/node.d/nginx_status                       | 1 -
 plugins/node.d/ntp_                               | 1 -
 plugins/node.d/ntp_kernel_err                     | 1 -
 plugins/node.d/ntp_kernel_pll_freq                | 1 -
 plugins/node.d/ntp_kernel_pll_off                 | 1 -
 plugins/node.d/ntp_offset                         | 1 -
 plugins/node.d/ntp_states                         | 1 -
 plugins/node.d/nut_misc                           | 1 -
 plugins/node.d/nut_volts                          | 1 -
 plugins/node.d/nutups_                            | 1 -
 plugins/node.d/nvidia_                            | 1 -
 plugins/node.d/openvpn                            | 1 -
 plugins/node.d/perdition                          | 1 -
 plugins/node.d/pgbouncer_connections              | 1 -
 plugins/node.d/pgbouncer_requests                 | 1 -
 plugins/node.d/ping_                              | 1 -
 plugins/node.d/pop_stats                          | 1 -
 plugins/node.d/postfix_mailqueue                  | 1 -
 plugins/node.d/postfix_mailstats                  | 1 -
 plugins/node.d/postfix_mailvolume                 | 1 -
 plugins/node.d/postgres_autovacuum                | 1 -
 plugins/node.d/postgres_bgwriter                  | 1 -
 plugins/node.d/postgres_cache_                    | 1 -
 plugins/node.d/postgres_checkpoints               | 1 -
 plugins/node.d/postgres_connections_              | 1 -
 plugins/node.d/postgres_connections_db            | 1 -
 plugins/node.d/postgres_locks_                    | 1 -
 plugins/node.d/postgres_oldest_prepared_xact_     | 1 -
 plugins/node.d/postgres_prepared_xacts_           | 1 -
 plugins/node.d/postgres_querylength_              | 1 -
 plugins/node.d/postgres_scans_                    | 1 -
 plugins/node.d/postgres_size_                     | 1 -
 plugins/node.d/postgres_streaming_                | 1 -
 plugins/node.d/postgres_transactions_             | 1 -
 plugins/node.d/postgres_tuples_                   | 1 -
 plugins/node.d/postgres_users                     | 1 -
 plugins/node.d/postgres_xlog                      | 1 -
 plugins/node.d/processes                          | 1 -
 plugins/node.d/proxy_plugin                       | 1 -
 plugins/node.d/ps_                                | 1 -
 plugins/node.d/psu_                               | 1 -
 plugins/node.d/qmailqstat                         | 1 -
 plugins/node.d/qmailscan                          | 1 -
 plugins/node.d/qmailscan-simple                   | 1 -
 plugins/node.d/samba                              | 1 -
 plugins/node.d/sendmail_mailqueue                 | 1 -
 plugins/node.d/sendmail_mailstats                 | 1 -
 plugins/node.d/sendmail_mailtraffic               | 1 -
 plugins/node.d/slapd_                             | 1 -
 plugins/node.d/slapd_bdb_cache_                   | 1 -
 plugins/node.d/slony_lag_                         | 1 -
 plugins/node.d/smart_                             | 1 -
 plugins/node.d/snmp__cpuload                      | 1 -
 plugins/node.d/snmp__df                           | 1 -
 plugins/node.d/snmp__df_ram                       | 1 -
 plugins/node.d/snmp__fc_if_                       | 1 -
 plugins/node.d/snmp__fc_if_err_                   | 1 -
 plugins/node.d/snmp__if_                          | 1 -
 plugins/node.d/snmp__if_err_                      | 1 -
 plugins/node.d/snmp__if_multi                     | 1 -
 plugins/node.d/snmp__load                         | 1 -
 plugins/node.d/snmp__memory                       | 1 -
 plugins/node.d/snmp__netapp_diskusage_            | 1 -
 plugins/node.d/snmp__netapp_inodeusage_           | 1 -
 plugins/node.d/snmp__netstat                      | 1 -
 plugins/node.d/snmp__print_pages                  | 1 -
 plugins/node.d/snmp__print_supplies               | 1 -
 plugins/node.d/snmp__processes                    | 1 -
 plugins/node.d/snmp__rdp_users                    | 1 -
 plugins/node.d/snmp__sensors_fsc_bx_fan           | 1 -
 plugins/node.d/snmp__sensors_fsc_bx_temp          | 1 -
 plugins/node.d/snmp__sensors_fsc_fan              | 1 -
 plugins/node.d/snmp__sensors_fsc_temp             | 1 -
 plugins/node.d/snmp__sensors_mbm_fan              | 1 -
 plugins/node.d/snmp__sensors_mbm_temp             | 1 -
 plugins/node.d/snmp__sensors_mbm_volt             | 1 -
 plugins/node.d/snmp__swap                         | 1 -
 plugins/node.d/snmp__uptime                       | 1 -
 plugins/node.d/snmp__users                        | 1 -
 plugins/node.d/snmp__winload                      | 1 -
 plugins/node.d/snmp__winmem                       | 1 -
 plugins/node.d/snort_alerts                       | 1 -
 plugins/node.d/snort_bytes_pkt                    | 1 -
 plugins/node.d/snort_drop_rate                    | 1 -
 plugins/node.d/snort_pattern_match                | 1 -
 plugins/node.d/snort_pkts                         | 1 -
 plugins/node.d/snort_traffic                      | 1 -
 plugins/node.d/spamstats                          | 1 -
 plugins/node.d/squeezebox_                        | 1 -
 plugins/node.d/squid                              | 1 -
 plugins/node.d/surfboard                          | 1 -
 plugins/node.d/tomcat_access                      | 1 -
 plugins/node.d/tomcat_jvm                         | 1 -
 plugins/node.d/tomcat_threads                     | 1 -
 plugins/node.d/tomcat_volume                      | 1 -
 plugins/node.d/users                              | 1 -
 plugins/node.d/varnish_                           | 1 -
 plugins/node.d/vmstat                             | 1 -
 plugins/node.d/zimbra_                            | 1 -
 plugins/plugin.sh                                 | 1 -
 script/munin-async                                | 1 -
 script/munin-asyncd                               | 1 -
 script/munin-check                                | 1 -
 script/munin-doc                                  | 1 -
 script/munin-graph                                | 1 -
 script/munin-html                                 | 1 -
 script/munin-limits                               | 1 -
 script/munin-node                                 | 1 -
 script/munin-node-configure                       | 1 -
 script/munin-run                                  | 1 -
 script/munin-sched                                | 1 -
 script/munin-update                               | 1 -
 t/munin_master_config.t                           | 1 -
 t/munin_master_config_concat.t                    | 1 -
 t/munin_master_config_split.t                     | 1 -
 t/munin_master_graphold_sum_cdef.t                | 1 -
 t/munin_master_limitsold.t                        | 1 -
 t/munin_master_node.t                             | 1 -
 t/munin_master_plugin_config.t                    | 1 -
 t/munin_master_plugin_fetch.t                     | 1 -
 t/munin_master_plugin_multigraph_config.t         | 1 -
 t/munin_master_plugin_multigraph_fetch.t          | 1 -
 t/plugins.t                                       | 1 -
 311 files changed, 2 insertions(+), 311 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 877e403abc..214bff39f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
--*- text -*-
 
 munin-2.1.10, 2014-12-07
 
diff --git a/Makefile b/Makefile
index d351323b0e..152ccf7dae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# -*- makefile -*-
 
 # This Makefile provides convenience targets for common build/test/install cases, as well as rules
 # for the release manager.
diff --git a/Makefile.config b/Makefile.config
index 8fdbde3b53..5f944468e8 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,4 +1,3 @@
-# -*- makefile -*-
 #
 # This is the Makefile.config file to use for a "clean" distribution.
 #
diff --git a/Makefile.config-maint b/Makefile.config-maint
index 7cdf9aef7c..e0d0e7c4e0 100644
--- a/Makefile.config-maint
+++ b/Makefile.config-maint
@@ -1,4 +1,3 @@
-# -*- makefile -*-
 #
 # MAINTAINER VERSION OF Makefile.config
 #
diff --git a/Makefile.javaplugin b/Makefile.javaplugin
index b2df16bd53..e1bc017e26 100644
--- a/Makefile.javaplugin
+++ b/Makefile.javaplugin
@@ -1,4 +1,3 @@
-# -*- makefile -*-
 #
 # Makefile fragment to build and install the java plugin
 
diff --git a/contrib/munin-mergedb.pl b/contrib/munin-mergedb.pl
index 463c9a1010..9a4e6a8709 100644
--- a/contrib/munin-mergedb.pl
+++ b/contrib/munin-mergedb.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl  -*-
 #
 # Merge munin db (datafile{,.storable} / limits) for multi-update masters
 # environment
diff --git a/contrib/plugin-gallery/static/gallery-header.html b/contrib/plugin-gallery/static/gallery-header.html
index e9a63bd12d..ff41fd9136 100644
--- a/contrib/plugin-gallery/static/gallery-header.html
+++ b/contrib/plugin-gallery/static/gallery-header.html
@@ -12,7 +12,6 @@
   <link rel="SHORTCUT ICON" href="/static/favicon.ico"/>
 
 </head>
-<!-- -*- HTML -*- -->
 <body>
  <div id="header">
 	<h1><a href="."><span class="logo"></span></a> <span class="currentpage">Plugin Gallery</span></h1>
diff --git a/doc/conf.py b/doc/conf.py
index 5dab9994f3..46bd49ea9e 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# coding=utf-8
 #
 # Munin documentation build configuration file, created by
 # sphinx-quickstart on Sat Jun  9 11:12:29 2012.
diff --git a/lib/Munin.pm.PL b/lib/Munin.pm.PL
index 10e47a9a14..1dbcb036dc 100644
--- a/lib/Munin.pm.PL
+++ b/lib/Munin.pm.PL
@@ -8,7 +8,6 @@ open my $fh, ">", $output_file or die "Can't open $output_file: $!";
 
 
 print $fh <<'EOF_HEADER';
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/lib/Munin/Master/Graph.pm b/lib/Munin/Master/Graph.pm
index 3534150f8f..0ae7951927 100755
--- a/lib/Munin/Master/Graph.pm
+++ b/lib/Munin/Master/Graph.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -T
-# -*- cperl -*-
 
 =begin comment
 
diff --git a/lib/Munin/Master/GraphOld.pm b/lib/Munin/Master/GraphOld.pm
index 70560b05f2..85b861f43a 100644
--- a/lib/Munin/Master/GraphOld.pm
+++ b/lib/Munin/Master/GraphOld.pm
@@ -1,6 +1,5 @@
 package Munin::Master::GraphOld;
 
-# -*- cperl -*-
 
 =encoding utf-8
 
diff --git a/lib/Munin/Master/HTMLOld.pm b/lib/Munin/Master/HTMLOld.pm
index 211c6276c4..c1f7a0702b 100644
--- a/lib/Munin/Master/HTMLOld.pm
+++ b/lib/Munin/Master/HTMLOld.pm
@@ -3,7 +3,6 @@ package Munin::Master::HTMLOld;
 =encoding utf-8
 
 =begin comment
--*- perl -*-
 
 This is Munin::Master::HTMLOld, a minimal package shell to make
 munin-html modular (so it can loaded persistently in
diff --git a/lib/Munin/Master/LimitsOld.pm b/lib/Munin/Master/LimitsOld.pm
index d778720108..462eb7e3ff 100644
--- a/lib/Munin/Master/LimitsOld.pm
+++ b/lib/Munin/Master/LimitsOld.pm
@@ -1,5 +1,4 @@
 package Munin::Master::LimitsOld;
-# -*- perl  -*-
 
 =begin comment
 
diff --git a/lib/Munin/Master/Utils.pm b/lib/Munin/Master/Utils.pm
index d41936c997..47d589e0ba 100644
--- a/lib/Munin/Master/Utils.pm
+++ b/lib/Munin/Master/Utils.pm
@@ -1,5 +1,4 @@
 package Munin::Master::Utils;
-# -*- cperl -*-
 
 
 use strict;
diff --git a/lib/Munin/Plugin.pm b/lib/Munin/Plugin.pm
index 739ad6a94f..cb2418bfbc 100644
--- a/lib/Munin/Plugin.pm
+++ b/lib/Munin/Plugin.pm
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 #
 # Copyright (C) 2007-2008 Nicolai Langfeldt
 #
diff --git a/lib/Munin/Plugin/Framework.pm b/lib/Munin/Plugin/Framework.pm
index 0ce914b2e6..7cf3c8960d 100644
--- a/lib/Munin/Plugin/Framework.pm
+++ b/lib/Munin/Plugin/Framework.pm
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 #
 # Copyright (C) 2013 Diego Elio Pettenò
 #
diff --git a/lib/Munin/Plugin/HTTP.pm b/lib/Munin/Plugin/HTTP.pm
index 49d8a577e9..90d7f52d9e 100644
--- a/lib/Munin/Plugin/HTTP.pm
+++ b/lib/Munin/Plugin/HTTP.pm
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 #
 # Copyright (C) 2012 Diego Elio Pettenò
 #
diff --git a/lib/Munin/Plugin/Pgsql.pm b/lib/Munin/Plugin/Pgsql.pm
index 5d984e2e6e..a3da066745 100644
--- a/lib/Munin/Plugin/Pgsql.pm
+++ b/lib/Munin/Plugin/Pgsql.pm
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/lib/Munin/Plugin/SNMP.pm b/lib/Munin/Plugin/SNMP.pm
index bbf42861fb..31a14a6dab 100644
--- a/lib/Munin/Plugin/SNMP.pm
+++ b/lib/Munin/Plugin/SNMP.pm
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 # vim: ts=4 : sw=4 : et
 #
 # Copyright (C) 2004-2009 Dagfinn Ilmari Mannsaaker, Nicolai Langfeldt,
diff --git a/master/extras/munin-update_old.in b/master/extras/munin-update_old.in
index fea7d5711d..e37c67e088 100755
--- a/master/extras/munin-update_old.in
+++ b/master/extras/munin-update_old.in
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 #
 # Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal
 #
diff --git a/master/www/munin-dynazoom.tmpl b/master/www/munin-dynazoom.tmpl
index 20054dd13f..36dbbc490e 100644
--- a/master/www/munin-dynazoom.tmpl
+++ b/master/www/munin-dynazoom.tmpl
@@ -1,4 +1,3 @@
-<!-- -*- HTML -*- -->
 <TMPL_INCLUDE NAME="partial/head.tmpl">
 <body>
 <TMPL_INCLUDE NAME="partial/logo_navigation.tmpl">
diff --git a/master/www/munin-overview.tmpl b/master/www/munin-overview.tmpl
index e48fb4ecce..4765ba7287 100644
--- a/master/www/munin-overview.tmpl
+++ b/master/www/munin-overview.tmpl
@@ -1,4 +1,4 @@
-<TMPL_INCLUDE NAME="partial/head.tmpl"><!-- -*- HTML -*- -->
+<TMPL_INCLUDE NAME="partial/head.tmpl">
 <body>
  <div id="header">
 	<h1><a href="<TMPL_VAR NAME="R_PATH">"><span class="logo"></span></a> <span class="currentpage">Overview</span></h1>
diff --git a/node/t/munin-node-configure.t b/node/t/munin-node-configure.t
index ad6343b707..6e81ff2b2a 100644
--- a/node/t/munin-node-configure.t
+++ b/node/t/munin-node-configure.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/plugins/node.d.aix/cpu b/plugins/node.d.aix/cpu
index 2a585e7112..da97776ec4 100755
--- a/plugins/node.d.aix/cpu
+++ b/plugins/node.d.aix/cpu
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/df b/plugins/node.d.aix/df
index b3c0dd0e5f..d61ad86ca3 100755
--- a/plugins/node.d.aix/df
+++ b/plugins/node.d.aix/df
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.aix/iostat b/plugins/node.d.aix/iostat
index 8e163f1208..ed7656b4dd 100755
--- a/plugins/node.d.aix/iostat
+++ b/plugins/node.d.aix/iostat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/iostat.hd_only b/plugins/node.d.aix/iostat.hd_only
index e1bb59f37c..a51b3da573 100755
--- a/plugins/node.d.aix/iostat.hd_only
+++ b/plugins/node.d.aix/iostat.hd_only
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/iostat.vp_only b/plugins/node.d.aix/iostat.vp_only
index 7dce8efedd..625e66fba3 100755
--- a/plugins/node.d.aix/iostat.vp_only
+++ b/plugins/node.d.aix/iostat.vp_only
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/load b/plugins/node.d.aix/load
index 47ed22ac48..46fbbc4f75 100755
--- a/plugins/node.d.aix/load
+++ b/plugins/node.d.aix/load
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.aix/memory b/plugins/node.d.aix/memory
index 9f30ecf0ee..e8f7efbec3 100755
--- a/plugins/node.d.aix/memory
+++ b/plugins/node.d.aix/memory
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/netstat b/plugins/node.d.aix/netstat
index 2ce5d71f11..7b8b26d25b 100755
--- a/plugins/node.d.aix/netstat
+++ b/plugins/node.d.aix/netstat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/processes b/plugins/node.d.aix/processes
index 19574cdd38..17ece2b5ed 100755
--- a/plugins/node.d.aix/processes
+++ b/plugins/node.d.aix/processes
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.aix/swap b/plugins/node.d.aix/swap
index 76eb15399e..07deccd47c 100755
--- a/plugins/node.d.aix/swap
+++ b/plugins/node.d.aix/swap
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.cygwin/df b/plugins/node.d.cygwin/df
index 68427009d8..fff3da23d4 100755
--- a/plugins/node.d.cygwin/df
+++ b/plugins/node.d.cygwin/df
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.cygwin/netstat b/plugins/node.d.cygwin/netstat
index 8a80dc11d7..d4787901bd 100755
--- a/plugins/node.d.cygwin/netstat
+++ b/plugins/node.d.cygwin/netstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.darwin/if_ b/plugins/node.d.darwin/if_
index f3e01f6a56..f6c0ebd5c9 100755
--- a/plugins/node.d.darwin/if_
+++ b/plugins/node.d.darwin/if_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.darwin/if_err_ b/plugins/node.d.darwin/if_err_
index 2fcb233ff2..cab932efb5 100755
--- a/plugins/node.d.darwin/if_err_
+++ b/plugins/node.d.darwin/if_err_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.darwin/load b/plugins/node.d.darwin/load
index a00e17e263..0c9a274f88 100755
--- a/plugins/node.d.darwin/load
+++ b/plugins/node.d.darwin/load
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.darwin/uptime b/plugins/node.d.darwin/uptime
index d431dbc6bb..a040ab4d58 100755
--- a/plugins/node.d.darwin/uptime
+++ b/plugins/node.d.darwin/uptime
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 #
 # Plugin to monitor uptime in Darwin hosts.
 #
diff --git a/plugins/node.d.debug/colour_tester b/plugins/node.d.debug/colour_tester
index 7cb8eedc67..3ddf54164c 100755
--- a/plugins/node.d.debug/colour_tester
+++ b/plugins/node.d.debug/colour_tester
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 #%# family=test
 
diff --git a/plugins/node.d.debug/env b/plugins/node.d.debug/env
index 6594124dda..e7b7a57cd0 100755
--- a/plugins/node.d.debug/env
+++ b/plugins/node.d.debug/env
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.debug/extinfo_tester b/plugins/node.d.debug/extinfo_tester
index 5399515b25..274f69cfc3 100755
--- a/plugins/node.d.debug/extinfo_tester
+++ b/plugins/node.d.debug/extinfo_tester
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 #%# family=test
 
diff --git a/plugins/node.d.debug/id b/plugins/node.d.debug/id
index 45ee885bb8..e7c73d9deb 100755
--- a/plugins/node.d.debug/id
+++ b/plugins/node.d.debug/id
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.debug/if b/plugins/node.d.debug/if
index abb81d3903..40fe3d9fac 100755
--- a/plugins/node.d.debug/if
+++ b/plugins/node.d.debug/if
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*-  perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.debug/rrdcached b/plugins/node.d.debug/rrdcached
index 7366f17b35..2147af9b49 100755
--- a/plugins/node.d.debug/rrdcached
+++ b/plugins/node.d.debug/rrdcached
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 use strict;
 use warnings;
diff --git a/plugins/node.d.debug/sum_cdef_tester b/plugins/node.d.debug/sum_cdef_tester
index 40db0263ed..5d644709ef 100755
--- a/plugins/node.d.debug/sum_cdef_tester
+++ b/plugins/node.d.debug/sum_cdef_tester
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 #%# family=test
 
diff --git a/plugins/node.d.debug/tc b/plugins/node.d.debug/tc
index 52a1a1b158..e4ea14fda5 100755
--- a/plugins/node.d.debug/tc
+++ b/plugins/node.d.debug/tc
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*-  perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.debug/warning_tester b/plugins/node.d.debug/warning_tester
index 2042e30cac..1295df9f65 100755
--- a/plugins/node.d.debug/warning_tester
+++ b/plugins/node.d.debug/warning_tester
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 #%# family=test
 
diff --git a/plugins/node.d.freebsd/coretemp b/plugins/node.d.freebsd/coretemp
index 440375fb7b..9b9321215c 100755
--- a/plugins/node.d.freebsd/coretemp
+++ b/plugins/node.d.freebsd/coretemp
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
 # All rights reserved.
diff --git a/plugins/node.d.freebsd/dev_cpu_ b/plugins/node.d.freebsd/dev_cpu_
index e3934a5e21..7947367dc2 100755
--- a/plugins/node.d.freebsd/dev_cpu_
+++ b/plugins/node.d.freebsd/dev_cpu_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
 # All rights reserved.
diff --git a/plugins/node.d.freebsd/if_ b/plugins/node.d.freebsd/if_
index 2227de2834..4be44bb872 100755
--- a/plugins/node.d.freebsd/if_
+++ b/plugins/node.d.freebsd/if_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Wildcard-plugin to monitor network interfaces. To monitor an
 # interface, link if_<interface> to this file. E.g.
diff --git a/plugins/node.d.freebsd/if_errcoll_ b/plugins/node.d.freebsd/if_errcoll_
index ff800ab5c3..120a88cb00 100755
--- a/plugins/node.d.freebsd/if_errcoll_
+++ b/plugins/node.d.freebsd/if_errcoll_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Wildcard-plugin to monitor network interfaces. To monitor an
 # interface, link if_<interface> to this file. E.g.
diff --git a/plugins/node.d.freebsd/iostat b/plugins/node.d.freebsd/iostat
index 0aa86afca6..558afa15c4 100755
--- a/plugins/node.d.freebsd/iostat
+++ b/plugins/node.d.freebsd/iostat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Original script (NetBSD) by he
 # 
diff --git a/plugins/node.d.freebsd/load b/plugins/node.d.freebsd/load
index b5f109f373..93d1328c52 100755
--- a/plugins/node.d.freebsd/load
+++ b/plugins/node.d.freebsd/load
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor the load average on a system.
 #
diff --git a/plugins/node.d.freebsd/netstat b/plugins/node.d.freebsd/netstat
index c93b04d33a..bf4e6e38a5 100755
--- a/plugins/node.d.freebsd/netstat
+++ b/plugins/node.d.freebsd/netstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 : << =cut
 
 =head1 NAME
diff --git a/plugins/node.d.freebsd/open_files b/plugins/node.d.freebsd/open_files
index 637844ebeb..88ca3ba395 100755
--- a/plugins/node.d.freebsd/open_files
+++ b/plugins/node.d.freebsd/open_files
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 # 
 # Plugin to monitor the number of open files in the system.
 #
diff --git a/plugins/node.d.freebsd/swap b/plugins/node.d.freebsd/swap
index f5be90bf3a..7481f09154 100755
--- a/plugins/node.d.freebsd/swap
+++ b/plugins/node.d.freebsd/swap
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor swap IO in number of blocks per second.
 #
diff --git a/plugins/node.d.freebsd/uptime b/plugins/node.d.freebsd/uptime
index 0d8c94cc5a..8996ab7126 100755
--- a/plugins/node.d.freebsd/uptime
+++ b/plugins/node.d.freebsd/uptime
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 #
 # Plugin to monitor uptime in FreeBSD hosts.
 #
diff --git a/plugins/node.d.freebsd/vmstat b/plugins/node.d.freebsd/vmstat
index 299643197d..a7030c50ac 100755
--- a/plugins/node.d.freebsd/vmstat
+++ b/plugins/node.d.freebsd/vmstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor the number of procs in io-sleep and other wait
 # states. Uses `vmstat`.
diff --git a/plugins/node.d.hp-ux/df b/plugins/node.d.hp-ux/df
index 2d7434a6df..090c3a25f4 100755
--- a/plugins/node.d.hp-ux/df
+++ b/plugins/node.d.hp-ux/df
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.hp-ux/df_inode b/plugins/node.d.hp-ux/df_inode
index 4e47c4b99c..953e43c7a2 100755
--- a/plugins/node.d.hp-ux/df_inode
+++ b/plugins/node.d.hp-ux/df_inode
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.hp-ux/mw_cpu b/plugins/node.d.hp-ux/mw_cpu
index e1e2b5153d..e817bcff86 100755
--- a/plugins/node.d.hp-ux/mw_cpu
+++ b/plugins/node.d.hp-ux/mw_cpu
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*- 
 #
 # this is public domain copy and share at will
 # quick n dirty hack to read specific performance data on HP-UX thru
diff --git a/plugins/node.d.hp-ux/mw_globalutilization b/plugins/node.d.hp-ux/mw_globalutilization
index a837811078..04a19a94b7 100755
--- a/plugins/node.d.hp-ux/mw_globalutilization
+++ b/plugins/node.d.hp-ux/mw_globalutilization
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 # this is public domain copy and share at will
 # quick n dirty hack to read specific performance data on HP-UX thru
 # measureware (perfview)
diff --git a/plugins/node.d.hp-ux/mw_memory b/plugins/node.d.hp-ux/mw_memory
index 4a4b5fa9c6..9576a7b4fe 100755
--- a/plugins/node.d.hp-ux/mw_memory
+++ b/plugins/node.d.hp-ux/mw_memory
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # this is public domain copy and share at will
 # quick n dirty hack to read specific performance data on HP-UX thru
diff --git a/plugins/node.d.java/jmx_ b/plugins/node.d.java/jmx_
index d6033762ae..040e658a3b 100755
--- a/plugins/node.d.java/jmx_
+++ b/plugins/node.d.java/jmx_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 : << =cut
 
 =head1 NAME
diff --git a/plugins/node.d.java/jmx_tomcat_dbpools b/plugins/node.d.java/jmx_tomcat_dbpools
index 8a4c4c09f9..0c43348e30 100755
--- a/plugins/node.d.java/jmx_tomcat_dbpools
+++ b/plugins/node.d.java/jmx_tomcat_dbpools
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/apt b/plugins/node.d.linux/apt
index 383cb89a31..256af3084e 100755
--- a/plugins/node.d.linux/apt
+++ b/plugins/node.d.linux/apt
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 #
 # Plugin to monitor packages that should be installed on systems using
 # apt-get (mostly Debian, but also RedHat)
diff --git a/plugins/node.d.linux/apt_all b/plugins/node.d.linux/apt_all
index 6d703c0bba..e93341d20b 100755
--- a/plugins/node.d.linux/apt_all
+++ b/plugins/node.d.linux/apt_all
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/bonding_err_ b/plugins/node.d.linux/bonding_err_
index 1482be223c..4fdde209f9 100755
--- a/plugins/node.d.linux/bonding_err_
+++ b/plugins/node.d.linux/bonding_err_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d.linux/buddyinfo b/plugins/node.d.linux/buddyinfo
index 4ca97e3c4b..9cbdffc8e6 100755
--- a/plugins/node.d.linux/buddyinfo
+++ b/plugins/node.d.linux/buddyinfo
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 
 =pod
 
diff --git a/plugins/node.d.linux/cpuspeed b/plugins/node.d.linux/cpuspeed
index 170dfff7ca..824efa4e19 100755
--- a/plugins/node.d.linux/cpuspeed
+++ b/plugins/node.d.linux/cpuspeed
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/df b/plugins/node.d.linux/df
index a647068eff..ba08249cab 100755
--- a/plugins/node.d.linux/df
+++ b/plugins/node.d.linux/df
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/df_abs b/plugins/node.d.linux/df_abs
index fca5611c2a..b8f77381d6 100755
--- a/plugins/node.d.linux/df_abs
+++ b/plugins/node.d.linux/df_abs
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d.linux/diskstat_ b/plugins/node.d.linux/diskstat_
index 2d758d3e66..8b08cbe5b7 100755
--- a/plugins/node.d.linux/diskstat_
+++ b/plugins/node.d.linux/diskstat_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: sts=4 sw=4 ts=8
 
 =head1 NAME
diff --git a/plugins/node.d.linux/diskstats b/plugins/node.d.linux/diskstats
index 4f9b3ae83c..1979b37560 100755
--- a/plugins/node.d.linux/diskstats
+++ b/plugins/node.d.linux/diskstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 # vim: sts=4 sw=4 ts=8
 
 # Docs at the bottom
diff --git a/plugins/node.d.linux/fw_packets b/plugins/node.d.linux/fw_packets
index 557956ae0b..403101624b 100755
--- a/plugins/node.d.linux/fw_packets
+++ b/plugins/node.d.linux/fw_packets
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/hwmon b/plugins/node.d.linux/hwmon
index e5a8a37a50..2cc6c77c2f 100755
--- a/plugins/node.d.linux/hwmon
+++ b/plugins/node.d.linux/hwmon
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/if_ b/plugins/node.d.linux/if_
index ba25a4b1c3..84d33d231e 100755
--- a/plugins/node.d.linux/if_
+++ b/plugins/node.d.linux/if_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/if_err_ b/plugins/node.d.linux/if_err_
index 9d6794fcf6..f9b3296939 100755
--- a/plugins/node.d.linux/if_err_
+++ b/plugins/node.d.linux/if_err_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/iostat b/plugins/node.d.linux/iostat
index c4c71300fc..d74a8508e5 100755
--- a/plugins/node.d.linux/iostat
+++ b/plugins/node.d.linux/iostat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 =head1 NAME
 
 iostat - Munin plugin to monitor io-bound traffic (in blocks) on disks
diff --git a/plugins/node.d.linux/iostat_ios b/plugins/node.d.linux/iostat_ios
index e54cabb188..c0f454138a 100755
--- a/plugins/node.d.linux/iostat_ios
+++ b/plugins/node.d.linux/iostat_ios
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/ip_ b/plugins/node.d.linux/ip_
index 85e5bbca44..74dbcc926d 100755
--- a/plugins/node.d.linux/ip_
+++ b/plugins/node.d.linux/ip_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/irqstats b/plugins/node.d.linux/irqstats
index e5432bfb36..cd43ba748e 100755
--- a/plugins/node.d.linux/irqstats
+++ b/plugins/node.d.linux/irqstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/meminfo b/plugins/node.d.linux/meminfo
index 886767883e..c50c282bc7 100755
--- a/plugins/node.d.linux/meminfo
+++ b/plugins/node.d.linux/meminfo
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/memory b/plugins/node.d.linux/memory
index c13444ea72..fb533bca3c 100755
--- a/plugins/node.d.linux/memory
+++ b/plugins/node.d.linux/memory
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/netstat b/plugins/node.d.linux/netstat
index 06a3ee1444..5e4c650f5c 100755
--- a/plugins/node.d.linux/netstat
+++ b/plugins/node.d.linux/netstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/netstat_multi b/plugins/node.d.linux/netstat_multi
index f43abe6fd7..30be8c62a1 100755
--- a/plugins/node.d.linux/netstat_multi
+++ b/plugins/node.d.linux/netstat_multi
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # netstat_multi - Munin plugin for detailed Network statistics
 # Copyright (C) 2011 Redpill Linpro AS
diff --git a/plugins/node.d.linux/nfs4_client b/plugins/node.d.linux/nfs4_client
index 3ac0bea9b8..df3d7d2f61 100755
--- a/plugins/node.d.linux/nfs4_client
+++ b/plugins/node.d.linux/nfs4_client
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/nfs_client b/plugins/node.d.linux/nfs_client
index 0eaa634d9f..bf23346e99 100755
--- a/plugins/node.d.linux/nfs_client
+++ b/plugins/node.d.linux/nfs_client
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/nfsd b/plugins/node.d.linux/nfsd
index 41cd027ce4..27d61128f6 100755
--- a/plugins/node.d.linux/nfsd
+++ b/plugins/node.d.linux/nfsd
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/nfsd4 b/plugins/node.d.linux/nfsd4
index 8061118d2a..647781acee 100755
--- a/plugins/node.d.linux/nfsd4
+++ b/plugins/node.d.linux/nfsd4
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/numa_ b/plugins/node.d.linux/numa_
index df6a45aa5f..8eaa329f9d 100755
--- a/plugins/node.d.linux/numa_
+++ b/plugins/node.d.linux/numa_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<'=cut'
 
diff --git a/plugins/node.d.linux/port_ b/plugins/node.d.linux/port_
index 90afee0f2e..ca184d4a44 100755
--- a/plugins/node.d.linux/port_
+++ b/plugins/node.d.linux/port_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/proc b/plugins/node.d.linux/proc
index eaf20b77de..4f7d46c572 100755
--- a/plugins/node.d.linux/proc
+++ b/plugins/node.d.linux/proc
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # proc_ - Munin plugin to for Process information
 # Copyright (C) 2009-2010 Redpill Linpro AS
diff --git a/plugins/node.d.linux/proc_pri b/plugins/node.d.linux/proc_pri
index 9c49db3f63..02ae0c71fb 100755
--- a/plugins/node.d.linux/proc_pri
+++ b/plugins/node.d.linux/proc_pri
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/procfs b/plugins/node.d.linux/procfs
index 2bb1263b98..210ae17527 100755
--- a/plugins/node.d.linux/procfs
+++ b/plugins/node.d.linux/procfs
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/procsys b/plugins/node.d.linux/procsys
index 24b311525a..50dcf4f4ce 100755
--- a/plugins/node.d.linux/procsys
+++ b/plugins/node.d.linux/procsys
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.linux/selinux_avcstat b/plugins/node.d.linux/selinux_avcstat
index 06720628b2..749b34dac7 100755
--- a/plugins/node.d.linux/selinux_avcstat
+++ b/plugins/node.d.linux/selinux_avcstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.linux/threads b/plugins/node.d.linux/threads
index b0590dd43d..e72617e208 100755
--- a/plugins/node.d.linux/threads
+++ b/plugins/node.d.linux/threads
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 # vim: ft=sh
 
 : << =cut
diff --git a/plugins/node.d.linux/vserver_cpu_ b/plugins/node.d.linux/vserver_cpu_
index 58af464f9f..076b15d38f 100755
--- a/plugins/node.d.linux/vserver_cpu_
+++ b/plugins/node.d.linux/vserver_cpu_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : <<'=cut'
 
diff --git a/plugins/node.d.linux/vserver_loadavg b/plugins/node.d.linux/vserver_loadavg
index bfede6ba00..5884b4cfe0 100755
--- a/plugins/node.d.linux/vserver_loadavg
+++ b/plugins/node.d.linux/vserver_loadavg
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : <<'=cut'
 
diff --git a/plugins/node.d.linux/vserver_resources b/plugins/node.d.linux/vserver_resources
index f533241dd4..2be9a129aa 100755
--- a/plugins/node.d.linux/vserver_resources
+++ b/plugins/node.d.linux/vserver_resources
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : <<'=cut'
 
diff --git a/plugins/node.d.linux/yum b/plugins/node.d.linux/yum
index 26be29c493..95fb326952 100755
--- a/plugins/node.d.linux/yum
+++ b/plugins/node.d.linux/yum
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl : sw=4 : ts=4 : et
 
 =encoding utf8
diff --git a/plugins/node.d.netbsd/iostat b/plugins/node.d.netbsd/iostat
index 9c083a40c7..026bb8199b 100755
--- a/plugins/node.d.netbsd/iostat
+++ b/plugins/node.d.netbsd/iostat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin for watching io-bound traffic (in bytes) on disks.
 #
diff --git a/plugins/node.d.netbsd/iostat_ops b/plugins/node.d.netbsd/iostat_ops
index 90448f35e5..571ba8f28d 100755
--- a/plugins/node.d.netbsd/iostat_ops
+++ b/plugins/node.d.netbsd/iostat_ops
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin for watching io-bound traffic (in transfers) on disks.
 #
diff --git a/plugins/node.d.openbsd/if_ b/plugins/node.d.openbsd/if_
index 759a53ee09..110a0dac85 100755
--- a/plugins/node.d.openbsd/if_
+++ b/plugins/node.d.openbsd/if_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Wildcard-plugin to monitor network interfaces. To monitor an
 # interface, link if_<interface> to this file. E.g.
diff --git a/plugins/node.d.openbsd/if_errcoll_ b/plugins/node.d.openbsd/if_errcoll_
index e43f10c549..a83f72ea3d 100755
--- a/plugins/node.d.openbsd/if_errcoll_
+++ b/plugins/node.d.openbsd/if_errcoll_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Wildcard-plugin to monitor network interfaces. To monitor an
 # interface, link if_<interface> to this file. E.g.
diff --git a/plugins/node.d.openbsd/load b/plugins/node.d.openbsd/load
index b5f109f373..93d1328c52 100755
--- a/plugins/node.d.openbsd/load
+++ b/plugins/node.d.openbsd/load
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor the load average on a system.
 #
diff --git a/plugins/node.d.openbsd/netstat b/plugins/node.d.openbsd/netstat
index cdac7dbfdd..9b3b5b2b0d 100755
--- a/plugins/node.d.openbsd/netstat
+++ b/plugins/node.d.openbsd/netstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 : << =cut
 
 =head1 NAME
diff --git a/plugins/node.d.openbsd/open_files b/plugins/node.d.openbsd/open_files
index 290926359d..22e6bb4b02 100755
--- a/plugins/node.d.openbsd/open_files
+++ b/plugins/node.d.openbsd/open_files
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 # 
 # Plugin to monitor the number of open files in the system.
 #
diff --git a/plugins/node.d.openbsd/swap b/plugins/node.d.openbsd/swap
index f83048cd16..e6aebe82d0 100755
--- a/plugins/node.d.openbsd/swap
+++ b/plugins/node.d.openbsd/swap
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor swap IO in number of blocks per second.
 #
diff --git a/plugins/node.d.sunos/cpu b/plugins/node.d.sunos/cpu
index 6da36dc6ed..a2a75b242a 100755
--- a/plugins/node.d.sunos/cpu
+++ b/plugins/node.d.sunos/cpu
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/df b/plugins/node.d.sunos/df
index 5341c34c4f..1639f48a39 100755
--- a/plugins/node.d.sunos/df
+++ b/plugins/node.d.sunos/df
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/df_inode b/plugins/node.d.sunos/df_inode
index e81caff63a..54f9b11b37 100755
--- a/plugins/node.d.sunos/df_inode
+++ b/plugins/node.d.sunos/df_inode
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/if_ b/plugins/node.d.sunos/if_
index aa415c7037..8f128665e0 100755
--- a/plugins/node.d.sunos/if_
+++ b/plugins/node.d.sunos/if_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/if_err_ b/plugins/node.d.sunos/if_err_
index 65bd1c0b04..5ae6723423 100755
--- a/plugins/node.d.sunos/if_err_
+++ b/plugins/node.d.sunos/if_err_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/iostat b/plugins/node.d.sunos/iostat
index fab52a220d..e2efea2472 100755
--- a/plugins/node.d.sunos/iostat
+++ b/plugins/node.d.sunos/iostat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.sunos/load b/plugins/node.d.sunos/load
index 3a384bed7b..d97c3a1058 100755
--- a/plugins/node.d.sunos/load
+++ b/plugins/node.d.sunos/load
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/memory b/plugins/node.d.sunos/memory
index dc72af0f02..ab901e7841 100755
--- a/plugins/node.d.sunos/memory
+++ b/plugins/node.d.sunos/memory
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/netstat b/plugins/node.d.sunos/netstat
index 6d4a9d2325..3b697c69cc 100755
--- a/plugins/node.d.sunos/netstat
+++ b/plugins/node.d.sunos/netstat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.sunos/paging_in b/plugins/node.d.sunos/paging_in
index affeae6023..670ddf0ce1 100755
--- a/plugins/node.d.sunos/paging_in
+++ b/plugins/node.d.sunos/paging_in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/paging_out b/plugins/node.d.sunos/paging_out
index d76cd34417..22615bf4e9 100755
--- a/plugins/node.d.sunos/paging_out
+++ b/plugins/node.d.sunos/paging_out
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d.sunos/temperature b/plugins/node.d.sunos/temperature
index 7ef7cd2bd6..27252fb674 100755
--- a/plugins/node.d.sunos/temperature
+++ b/plugins/node.d.sunos/temperature
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d.sunos/uptime b/plugins/node.d.sunos/uptime
index 45fabc8744..79341b06a9 100755
--- a/plugins/node.d.sunos/uptime
+++ b/plugins/node.d.sunos/uptime
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/amavis b/plugins/node.d/amavis
index e637a9642f..4c461f4793 100755
--- a/plugins/node.d/amavis
+++ b/plugins/node.d/amavis
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 # vim: ft=sh
 
 : <<=cut
diff --git a/plugins/node.d/apache b/plugins/node.d/apache
index 1e917af2e2..edf97a1541 100755
--- a/plugins/node.d/apache
+++ b/plugins/node.d/apache
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/apc_envunit_ b/plugins/node.d/apc_envunit_
index 473d4ce8ee..84bd9dcf15 100755
--- a/plugins/node.d/apc_envunit_
+++ b/plugins/node.d/apc_envunit_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/apc_nis b/plugins/node.d/apc_nis
index b595799b8b..e85c147feb 100755
--- a/plugins/node.d/apc_nis
+++ b/plugins/node.d/apc_nis
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/asterisk b/plugins/node.d/asterisk
index d89342bf0f..1a2a868d95 100755
--- a/plugins/node.d/asterisk
+++ b/plugins/node.d/asterisk
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/bind9 b/plugins/node.d/bind9
index a11a7d7666..ca52682d0b 100755
--- a/plugins/node.d/bind9
+++ b/plugins/node.d/bind9
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/bind9_rndc b/plugins/node.d/bind9_rndc
index 01a3524c50..26684d0354 100755
--- a/plugins/node.d/bind9_rndc
+++ b/plugins/node.d/bind9_rndc
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/cmc_tc_sensor_ b/plugins/node.d/cmc_tc_sensor_
index a9116eb96b..955dae7492 100755
--- a/plugins/node.d/cmc_tc_sensor_
+++ b/plugins/node.d/cmc_tc_sensor_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/courier_ b/plugins/node.d/courier_
index 3a9244cdae..7939519ba6 100755
--- a/plugins/node.d/courier_
+++ b/plugins/node.d/courier_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/courier_mta_mailqueue b/plugins/node.d/courier_mta_mailqueue
index d23a1932b0..8c767d33d1 100755
--- a/plugins/node.d/courier_mta_mailqueue
+++ b/plugins/node.d/courier_mta_mailqueue
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/courier_mta_mailstats b/plugins/node.d/courier_mta_mailstats
index 3a4f375a26..fafdd7d35b 100755
--- a/plugins/node.d/courier_mta_mailstats
+++ b/plugins/node.d/courier_mta_mailstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/courier_mta_mailvolume b/plugins/node.d/courier_mta_mailvolume
index b9a5eb3bd0..90a3c7b831 100755
--- a/plugins/node.d/courier_mta_mailvolume
+++ b/plugins/node.d/courier_mta_mailvolume
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/cupsys_pages b/plugins/node.d/cupsys_pages
index a7357c17ca..ba9e4bac69 100755
--- a/plugins/node.d/cupsys_pages
+++ b/plugins/node.d/cupsys_pages
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/df b/plugins/node.d/df
index ef3274673d..fa664205cf 100755
--- a/plugins/node.d/df
+++ b/plugins/node.d/df
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/df_inode b/plugins/node.d/df_inode
index 87ce54fa0b..890d31ce0a 100755
--- a/plugins/node.d/df_inode
+++ b/plugins/node.d/df_inode
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/dhcpd3 b/plugins/node.d/dhcpd3
index ac348c3d72..0c9ff7c79e 100755
--- a/plugins/node.d/dhcpd3
+++ b/plugins/node.d/dhcpd3
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/digitemp_ b/plugins/node.d/digitemp_
index 454dfc6d80..3c738844d3 100755
--- a/plugins/node.d/digitemp_
+++ b/plugins/node.d/digitemp_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/ejabberd_ b/plugins/node.d/ejabberd_
index 38d261c637..2ce6d7f406 100755
--- a/plugins/node.d/ejabberd_
+++ b/plugins/node.d/ejabberd_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/exim_mailqueue b/plugins/node.d/exim_mailqueue
index d2c3365488..b777faea93 100755
--- a/plugins/node.d/exim_mailqueue
+++ b/plugins/node.d/exim_mailqueue
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << EOF
 
diff --git a/plugins/node.d/exim_mailqueue_alt b/plugins/node.d/exim_mailqueue_alt
index 841dd8e0d5..6c38e2c678 100755
--- a/plugins/node.d/exim_mailqueue_alt
+++ b/plugins/node.d/exim_mailqueue_alt
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/exim_mailstats b/plugins/node.d/exim_mailstats
index a8c1ed5ded..4b30060bbd 100755
--- a/plugins/node.d/exim_mailstats
+++ b/plugins/node.d/exim_mailstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim:syntax=perl
 
 =head1 NAME
diff --git a/plugins/node.d/external_ b/plugins/node.d/external_
index cc296816fa..7b7c2fac11 100755
--- a/plugins/node.d/external_
+++ b/plugins/node.d/external_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/fail2ban b/plugins/node.d/fail2ban
index 37fa256969..c07761cae3 100755
--- a/plugins/node.d/fail2ban
+++ b/plugins/node.d/fail2ban
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 : <<=cut
 
 =head1 NAME
diff --git a/plugins/node.d/foldingathome b/plugins/node.d/foldingathome
index 42f2da35f1..4007d9a913 100755
--- a/plugins/node.d/foldingathome
+++ b/plugins/node.d/foldingathome
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Folding@Home
 #
diff --git a/plugins/node.d/foldingathome_rank b/plugins/node.d/foldingathome_rank
index c3c267d21a..a6b52cd2e1 100755
--- a/plugins/node.d/foldingathome_rank
+++ b/plugins/node.d/foldingathome_rank
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Folding@Home Rank
 #
diff --git a/plugins/node.d/foldingathome_wu b/plugins/node.d/foldingathome_wu
index 42479a4447..3b35b58677 100755
--- a/plugins/node.d/foldingathome_wu
+++ b/plugins/node.d/foldingathome_wu
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d/haproxy_ b/plugins/node.d/haproxy_
index 4e9cfe02c2..2375bd731c 100755
--- a/plugins/node.d/haproxy_
+++ b/plugins/node.d/haproxy_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/hddtemp b/plugins/node.d/hddtemp
index e2b9d4b543..2e600cbc77 100755
--- a/plugins/node.d/hddtemp
+++ b/plugins/node.d/hddtemp
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor harddrive temperatures through SMART.
 #
diff --git a/plugins/node.d/hddtemp2 b/plugins/node.d/hddtemp2
index 4f458c4f09..a850da7dbf 100755
--- a/plugins/node.d/hddtemp2
+++ b/plugins/node.d/hddtemp2
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # Plugin to monitor hard drive temperatures.
 #
diff --git a/plugins/node.d/hddtemp_smartctl b/plugins/node.d/hddtemp_smartctl
index d664a5798b..5af90366b8 100755
--- a/plugins/node.d/hddtemp_smartctl
+++ b/plugins/node.d/hddtemp_smartctl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/hddtempd b/plugins/node.d/hddtempd
index be1daa9de0..9f3056cae8 100755
--- a/plugins/node.d/hddtempd
+++ b/plugins/node.d/hddtempd
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 #
 # Munin plugin to monitor hdd temperature from a hddtemp daemon.
 #
diff --git a/plugins/node.d/http_loadtime b/plugins/node.d/http_loadtime
index 46d1ed5c53..0bbe88e90d 100755
--- a/plugins/node.d/http_loadtime
+++ b/plugins/node.d/http_loadtime
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/ifx_concurrent_sessions_ b/plugins/node.d/ifx_concurrent_sessions_
index a70260bcc7..0ccb742163 100755
--- a/plugins/node.d/ifx_concurrent_sessions_
+++ b/plugins/node.d/ifx_concurrent_sessions_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 #
 
 =head1 NAME
diff --git a/plugins/node.d/ipac-ng b/plugins/node.d/ipac-ng
index 4e6766081d..e0508a869b 100755
--- a/plugins/node.d/ipac-ng
+++ b/plugins/node.d/ipac-ng
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/ipmi_ b/plugins/node.d/ipmi_
index 8f7c6f5246..93893a6f3e 100755
--- a/plugins/node.d/ipmi_
+++ b/plugins/node.d/ipmi_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/ipmi_sensor_ b/plugins/node.d/ipmi_sensor_
index bffb84b98c..da6155ec17 100755
--- a/plugins/node.d/ipmi_sensor_
+++ b/plugins/node.d/ipmi_sensor_
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# -*- python -*-
 
 """
 =head1 NAME
diff --git a/plugins/node.d/ircu b/plugins/node.d/ircu
index 49e0a49742..40f21cd0cc 100755
--- a/plugins/node.d/ircu
+++ b/plugins/node.d/ircu
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/jenkins_builds b/plugins/node.d/jenkins_builds
index e64e4158c0..295991dbc8 100755
--- a/plugins/node.d/jenkins_builds
+++ b/plugins/node.d/jenkins_builds
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/jenkins_builds_results b/plugins/node.d/jenkins_builds_results
index 14ee4c75c7..4586a47a08 100755
--- a/plugins/node.d/jenkins_builds_results
+++ b/plugins/node.d/jenkins_builds_results
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/jenkins_builds_results_summary b/plugins/node.d/jenkins_builds_results_summary
index 05f60a04da..48b2894784 100755
--- a/plugins/node.d/jenkins_builds_results_summary
+++ b/plugins/node.d/jenkins_builds_results_summary
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/jenkins_builds_running b/plugins/node.d/jenkins_builds_running
index f64b2bab59..4b3ea95ff3 100755
--- a/plugins/node.d/jenkins_builds_running
+++ b/plugins/node.d/jenkins_builds_running
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/jenkins_jobs b/plugins/node.d/jenkins_jobs
index cf93008875..65eba37b9a 100755
--- a/plugins/node.d/jenkins_jobs
+++ b/plugins/node.d/jenkins_jobs
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/loggrep b/plugins/node.d/loggrep
index 82daf1b731..3d5a88486a 100755
--- a/plugins/node.d/loggrep
+++ b/plugins/node.d/loggrep
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/lpstat b/plugins/node.d/lpstat
index e079c42f39..344a8b3372 100755
--- a/plugins/node.d/lpstat
+++ b/plugins/node.d/lpstat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/mailman b/plugins/node.d/mailman
index f32ddd9131..7a49d1e1ee 100755
--- a/plugins/node.d/mailman
+++ b/plugins/node.d/mailman
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/mailscanner b/plugins/node.d/mailscanner
index aafbc9ec1a..cc612e953f 100755
--- a/plugins/node.d/mailscanner
+++ b/plugins/node.d/mailscanner
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/mbmon_ b/plugins/node.d/mbmon_
index 7c80745487..d332e0f62d 100755
--- a/plugins/node.d/mbmon_
+++ b/plugins/node.d/mbmon_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor Motherboard temparature using mbmon
 #  (http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html)
diff --git a/plugins/node.d/memcached_ b/plugins/node.d/memcached_
index 638d5dd151..68ca64df0d 100755
--- a/plugins/node.d/memcached_
+++ b/plugins/node.d/memcached_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Plugin to monitor memcache statistics
 #
diff --git a/plugins/node.d/mhttping b/plugins/node.d/mhttping
index 2989a7da2d..0ad2b34969 100755
--- a/plugins/node.d/mhttping
+++ b/plugins/node.d/mhttping
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # Plugin by Greg Connor
 #
diff --git a/plugins/node.d/multiping b/plugins/node.d/multiping
index a488c6f1c4..e3ec4a8a5a 100755
--- a/plugins/node.d/multiping
+++ b/plugins/node.d/multiping
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/multips b/plugins/node.d/multips
index 5417f45584..c409ba83af 100755
--- a/plugins/node.d/multips
+++ b/plugins/node.d/multips
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<=cut
 
diff --git a/plugins/node.d/multips_memory b/plugins/node.d/multips_memory
index f6dd344926..6995da77e9 100755
--- a/plugins/node.d/multips_memory
+++ b/plugins/node.d/multips_memory
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<=cut
 
diff --git a/plugins/node.d/munin_stats b/plugins/node.d/munin_stats
index 45f22d8480..80ac263e71 100755
--- a/plugins/node.d/munin_stats
+++ b/plugins/node.d/munin_stats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # Copyright (C) 2006-2009 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 #
diff --git a/plugins/node.d/munin_update b/plugins/node.d/munin_update
index e08b6557d5..76e37a849e 100755
--- a/plugins/node.d/munin_update
+++ b/plugins/node.d/munin_update
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<=cut
 
diff --git a/plugins/node.d/mysql_ b/plugins/node.d/mysql_
index d04d12a662..e64ef638dc 100755
--- a/plugins/node.d/mysql_
+++ b/plugins/node.d/mysql_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/mysql_bytes b/plugins/node.d/mysql_bytes
index 0820126822..b6adfb7c2d 100755
--- a/plugins/node.d/mysql_bytes
+++ b/plugins/node.d/mysql_bytes
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/mysql_isam_space_ b/plugins/node.d/mysql_isam_space_
index 167b4e76c1..285cfe88a6 100755
--- a/plugins/node.d/mysql_isam_space_
+++ b/plugins/node.d/mysql_isam_space_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/mysql_queries b/plugins/node.d/mysql_queries
index 6e3235410e..249b544af9 100755
--- a/plugins/node.d/mysql_queries
+++ b/plugins/node.d/mysql_queries
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/mysql_slowqueries b/plugins/node.d/mysql_slowqueries
index 30d2fe23f3..cfb9e980da 100755
--- a/plugins/node.d/mysql_slowqueries
+++ b/plugins/node.d/mysql_slowqueries
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/mysql_threads b/plugins/node.d/mysql_threads
index eb49f55bf7..f61aafcb94 100755
--- a/plugins/node.d/mysql_threads
+++ b/plugins/node.d/mysql_threads
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/named b/plugins/node.d/named
index 831d955688..bb5279e217 100755
--- a/plugins/node.d/named
+++ b/plugins/node.d/named
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/netopia b/plugins/node.d/netopia
index fc9dca4ef0..4c375172c2 100755
--- a/plugins/node.d/netopia
+++ b/plugins/node.d/netopia
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 
 hostname="$(hostname)"
diff --git a/plugins/node.d/netstat b/plugins/node.d/netstat
index cde1b43e0d..ced44569df 100755
--- a/plugins/node.d/netstat
+++ b/plugins/node.d/netstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/nginx_request b/plugins/node.d/nginx_request
index 16925f18ea..38f1cbe6c4 100755
--- a/plugins/node.d/nginx_request
+++ b/plugins/node.d/nginx_request
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/nginx_status b/plugins/node.d/nginx_status
index 12b3d29c77..8899352c8c 100755
--- a/plugins/node.d/nginx_status
+++ b/plugins/node.d/nginx_status
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/ntp_ b/plugins/node.d/ntp_
index e204d840dc..0843e9677c 100755
--- a/plugins/node.d/ntp_
+++ b/plugins/node.d/ntp_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/ntp_kernel_err b/plugins/node.d/ntp_kernel_err
index 01a35e6f25..c7d0cace6d 100755
--- a/plugins/node.d/ntp_kernel_err
+++ b/plugins/node.d/ntp_kernel_err
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d/ntp_kernel_pll_freq b/plugins/node.d/ntp_kernel_pll_freq
index 6d1aa89803..77fef38eec 100755
--- a/plugins/node.d/ntp_kernel_pll_freq
+++ b/plugins/node.d/ntp_kernel_pll_freq
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d/ntp_kernel_pll_off b/plugins/node.d/ntp_kernel_pll_off
index 851c95d005..fdd189a4b7 100755
--- a/plugins/node.d/ntp_kernel_pll_off
+++ b/plugins/node.d/ntp_kernel_pll_off
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d/ntp_offset b/plugins/node.d/ntp_offset
index 8447261ab0..b4c7c3a21a 100755
--- a/plugins/node.d/ntp_offset
+++ b/plugins/node.d/ntp_offset
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/ntp_states b/plugins/node.d/ntp_states
index de8e38c970..78158f020f 100755
--- a/plugins/node.d/ntp_states
+++ b/plugins/node.d/ntp_states
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- mode: cperl; cperl-indent-level: 8; -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/nut_misc b/plugins/node.d/nut_misc
index cfd972bd60..cc98a3784c 100755
--- a/plugins/node.d/nut_misc
+++ b/plugins/node.d/nut_misc
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/nut_volts b/plugins/node.d/nut_volts
index 6bf6b1f9d8..4526aeb5bb 100755
--- a/plugins/node.d/nut_volts
+++ b/plugins/node.d/nut_volts
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # Plugin to monitor UPS via the upsc command
 #
diff --git a/plugins/node.d/nutups_ b/plugins/node.d/nutups_
index 8c55b0e60c..9c7a5eb174 100755
--- a/plugins/node.d/nutups_
+++ b/plugins/node.d/nutups_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to monitor various statistics exported by a UPS.
 #
diff --git a/plugins/node.d/nvidia_ b/plugins/node.d/nvidia_
index 9e464120b5..e752733555 100755
--- a/plugins/node.d/nvidia_
+++ b/plugins/node.d/nvidia_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 use strict;
 
diff --git a/plugins/node.d/openvpn b/plugins/node.d/openvpn
index 7b2987ca59..95f223ddf4 100755
--- a/plugins/node.d/openvpn
+++ b/plugins/node.d/openvpn
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/perdition b/plugins/node.d/perdition
index 5304147977..4dcab559bb 100755
--- a/plugins/node.d/perdition
+++ b/plugins/node.d/perdition
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/pgbouncer_connections b/plugins/node.d/pgbouncer_connections
index 9e58869a18..ae811a6cd0 100755
--- a/plugins/node.d/pgbouncer_connections
+++ b/plugins/node.d/pgbouncer_connections
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/pgbouncer_requests b/plugins/node.d/pgbouncer_requests
index 5f706a4336..72ab1e5949 100755
--- a/plugins/node.d/pgbouncer_requests
+++ b/plugins/node.d/pgbouncer_requests
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/ping_ b/plugins/node.d/ping_
index e7442a6eed..1d6ed3cf5c 100755
--- a/plugins/node.d/ping_
+++ b/plugins/node.d/ping_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/pop_stats b/plugins/node.d/pop_stats
index 1e835fb40e..104e72ee0d 100755
--- a/plugins/node.d/pop_stats
+++ b/plugins/node.d/pop_stats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 
 #%# family=contrib
diff --git a/plugins/node.d/postfix_mailqueue b/plugins/node.d/postfix_mailqueue
index 13a01e68b3..1a53d54e3d 100755
--- a/plugins/node.d/postfix_mailqueue
+++ b/plugins/node.d/postfix_mailqueue
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/postfix_mailstats b/plugins/node.d/postfix_mailstats
index 6bd6e8ec74..9027d76b66 100755
--- a/plugins/node.d/postfix_mailstats
+++ b/plugins/node.d/postfix_mailstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/postfix_mailvolume b/plugins/node.d/postfix_mailvolume
index 064751d8f1..4c3e43c5a3 100755
--- a/plugins/node.d/postfix_mailvolume
+++ b/plugins/node.d/postfix_mailvolume
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/postgres_autovacuum b/plugins/node.d/postgres_autovacuum
index 9db9925f4c..3ef385b5e2 100755
--- a/plugins/node.d/postgres_autovacuum
+++ b/plugins/node.d/postgres_autovacuum
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_bgwriter b/plugins/node.d/postgres_bgwriter
index ecc581bb96..2675694569 100755
--- a/plugins/node.d/postgres_bgwriter
+++ b/plugins/node.d/postgres_bgwriter
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_cache_ b/plugins/node.d/postgres_cache_
index c5c4731665..10c87654ab 100755
--- a/plugins/node.d/postgres_cache_
+++ b/plugins/node.d/postgres_cache_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_checkpoints b/plugins/node.d/postgres_checkpoints
index 21e37d3862..84eb17cfa9 100755
--- a/plugins/node.d/postgres_checkpoints
+++ b/plugins/node.d/postgres_checkpoints
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_connections_ b/plugins/node.d/postgres_connections_
index 6560c3cb5a..0a70aea08c 100755
--- a/plugins/node.d/postgres_connections_
+++ b/plugins/node.d/postgres_connections_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_connections_db b/plugins/node.d/postgres_connections_db
index 48b5e8b609..21598c5eb9 100755
--- a/plugins/node.d/postgres_connections_db
+++ b/plugins/node.d/postgres_connections_db
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_locks_ b/plugins/node.d/postgres_locks_
index cea8ba5c83..bb5fd8fc0c 100755
--- a/plugins/node.d/postgres_locks_
+++ b/plugins/node.d/postgres_locks_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_oldest_prepared_xact_ b/plugins/node.d/postgres_oldest_prepared_xact_
index 3ba82a5224..f960381206 100755
--- a/plugins/node.d/postgres_oldest_prepared_xact_
+++ b/plugins/node.d/postgres_oldest_prepared_xact_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_prepared_xacts_ b/plugins/node.d/postgres_prepared_xacts_
index 1f9d91b7ab..83d4235dbb 100755
--- a/plugins/node.d/postgres_prepared_xacts_
+++ b/plugins/node.d/postgres_prepared_xacts_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_querylength_ b/plugins/node.d/postgres_querylength_
index 0618007d22..8be46071cc 100755
--- a/plugins/node.d/postgres_querylength_
+++ b/plugins/node.d/postgres_querylength_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_scans_ b/plugins/node.d/postgres_scans_
index 676218ab5b..119fd82f2c 100755
--- a/plugins/node.d/postgres_scans_
+++ b/plugins/node.d/postgres_scans_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_size_ b/plugins/node.d/postgres_size_
index b02913e83f..fe2f5ceb99 100755
--- a/plugins/node.d/postgres_size_
+++ b/plugins/node.d/postgres_size_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_streaming_ b/plugins/node.d/postgres_streaming_
index 077d76fdaf..e5922603a6 100755
--- a/plugins/node.d/postgres_streaming_
+++ b/plugins/node.d/postgres_streaming_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 # vim: ft=perl
 #
 # Copyright (C) 2010 Magnus Hagander, Redpill Linpro AB
diff --git a/plugins/node.d/postgres_transactions_ b/plugins/node.d/postgres_transactions_
index 693d68b9be..380808d78e 100755
--- a/plugins/node.d/postgres_transactions_
+++ b/plugins/node.d/postgres_transactions_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_tuples_ b/plugins/node.d/postgres_tuples_
index 265cc67c4b..72db20b22a 100755
--- a/plugins/node.d/postgres_tuples_
+++ b/plugins/node.d/postgres_tuples_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_users b/plugins/node.d/postgres_users
index 766bce6323..333aad01a4 100755
--- a/plugins/node.d/postgres_users
+++ b/plugins/node.d/postgres_users
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/postgres_xlog b/plugins/node.d/postgres_xlog
index 793a6d9852..6f6a5902f7 100755
--- a/plugins/node.d/postgres_xlog
+++ b/plugins/node.d/postgres_xlog
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
 #
diff --git a/plugins/node.d/processes b/plugins/node.d/processes
index 80dfb59f7d..39cf568ee0 100755
--- a/plugins/node.d/processes
+++ b/plugins/node.d/processes
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/proxy_plugin b/plugins/node.d/proxy_plugin
index 9b89324b2b..061de30d75 100755
--- a/plugins/node.d/proxy_plugin
+++ b/plugins/node.d/proxy_plugin
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/ps_ b/plugins/node.d/ps_
index 84e8cb54d6..d7af912a30 100755
--- a/plugins/node.d/ps_
+++ b/plugins/node.d/ps_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/psu_ b/plugins/node.d/psu_
index 14d6a706ec..a3bb09a096 100755
--- a/plugins/node.d/psu_
+++ b/plugins/node.d/psu_
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : <<EOF
 
diff --git a/plugins/node.d/qmailqstat b/plugins/node.d/qmailqstat
index 42e0bbfc55..2a565d3482 100755
--- a/plugins/node.d/qmailqstat
+++ b/plugins/node.d/qmailqstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to show the amount of messages in the qmail queue
 #
diff --git a/plugins/node.d/qmailscan b/plugins/node.d/qmailscan
index 5de67c9718..94df6e34c8 100755
--- a/plugins/node.d/qmailscan
+++ b/plugins/node.d/qmailscan
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/qmailscan-simple b/plugins/node.d/qmailscan-simple
index a698b88e4b..b51eff3a05 100755
--- a/plugins/node.d/qmailscan-simple
+++ b/plugins/node.d/qmailscan-simple
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 #
 # Plugin to count the daily amount of Virii (qmailscan)
 #
diff --git a/plugins/node.d/samba b/plugins/node.d/samba
index c4eb3768f1..557b4b5a28 100755
--- a/plugins/node.d/samba
+++ b/plugins/node.d/samba
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/sendmail_mailqueue b/plugins/node.d/sendmail_mailqueue
index ecd9fa86ed..2dca2b7cf5 100755
--- a/plugins/node.d/sendmail_mailqueue
+++ b/plugins/node.d/sendmail_mailqueue
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/sendmail_mailstats b/plugins/node.d/sendmail_mailstats
index 7cb7c4c2b8..747db5de82 100755
--- a/plugins/node.d/sendmail_mailstats
+++ b/plugins/node.d/sendmail_mailstats
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/sendmail_mailtraffic b/plugins/node.d/sendmail_mailtraffic
index f0a804e80a..ad46ac8413 100755
--- a/plugins/node.d/sendmail_mailtraffic
+++ b/plugins/node.d/sendmail_mailtraffic
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/slapd_ b/plugins/node.d/slapd_
index a7a1ce061d..6ce2e69828 100755
--- a/plugins/node.d/slapd_
+++ b/plugins/node.d/slapd_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 # Copyright Bjorn Ruberg <bjorn@ruberg.no>
diff --git a/plugins/node.d/slapd_bdb_cache_ b/plugins/node.d/slapd_bdb_cache_
index 020fd0d71c..532965f33e 100755
--- a/plugins/node.d/slapd_bdb_cache_
+++ b/plugins/node.d/slapd_bdb_cache_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =pod
 
diff --git a/plugins/node.d/slony_lag_ b/plugins/node.d/slony_lag_
index 9834d84140..7d6b72bc84 100755
--- a/plugins/node.d/slony_lag_
+++ b/plugins/node.d/slony_lag_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 # vim: ft=perl
 #
 # Copyright (C) 2009 Magnus Hagander, Redpill Linpro AB
diff --git a/plugins/node.d/smart_ b/plugins/node.d/smart_
index 4ff59abb3e..e5f977773a 100755
--- a/plugins/node.d/smart_
+++ b/plugins/node.d/smart_
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# -*- python -*-
 #
 # Wildcard-plugin to monitor S.M.A.R.T attribute values through smartctl,
 # which is part of smartmontools package:
diff --git a/plugins/node.d/snmp__cpuload b/plugins/node.d/snmp__cpuload
index 44c6c369ac..fd63d8d660 100755
--- a/plugins/node.d/snmp__cpuload
+++ b/plugins/node.d/snmp__cpuload
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__df b/plugins/node.d/snmp__df
index 6a8a5310b9..3bc69c8b40 100755
--- a/plugins/node.d/snmp__df
+++ b/plugins/node.d/snmp__df
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__df_ram b/plugins/node.d/snmp__df_ram
index 1e12dc92a3..e33f3b59f9 100755
--- a/plugins/node.d/snmp__df_ram
+++ b/plugins/node.d/snmp__df_ram
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__fc_if_ b/plugins/node.d/snmp__fc_if_
index 67446db559..cfe3374af0 100755
--- a/plugins/node.d/snmp__fc_if_
+++ b/plugins/node.d/snmp__fc_if_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 #
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__fc_if_err_ b/plugins/node.d/snmp__fc_if_err_
index 91a525d18c..ad45e7f616 100755
--- a/plugins/node.d/snmp__fc_if_err_
+++ b/plugins/node.d/snmp__fc_if_err_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 #
 # Copyright (C) 2004 Jimmy Olsen
 #
diff --git a/plugins/node.d/snmp__if_ b/plugins/node.d/snmp__if_
index 0c4fc9526b..db0f7eb1c7 100755
--- a/plugins/node.d/snmp__if_
+++ b/plugins/node.d/snmp__if_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__if_err_ b/plugins/node.d/snmp__if_err_
index 9e5dd498f5..06e4ef4c52 100755
--- a/plugins/node.d/snmp__if_err_
+++ b/plugins/node.d/snmp__if_err_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__if_multi b/plugins/node.d/snmp__if_multi
index 12821509a8..61cd6de4bd 100755
--- a/plugins/node.d/snmp__if_multi
+++ b/plugins/node.d/snmp__if_multi
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__load b/plugins/node.d/snmp__load
index 3d8582d6b9..182c473662 100755
--- a/plugins/node.d/snmp__load
+++ b/plugins/node.d/snmp__load
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__memory b/plugins/node.d/snmp__memory
index e8226e3082..4156a8f2a0 100755
--- a/plugins/node.d/snmp__memory
+++ b/plugins/node.d/snmp__memory
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__netapp_diskusage_ b/plugins/node.d/snmp__netapp_diskusage_
index e9a30af041..fc5e3599e5 100755
--- a/plugins/node.d/snmp__netapp_diskusage_
+++ b/plugins/node.d/snmp__netapp_diskusage_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__netapp_inodeusage_ b/plugins/node.d/snmp__netapp_inodeusage_
index 5a37741d49..60cd32aa87 100755
--- a/plugins/node.d/snmp__netapp_inodeusage_
+++ b/plugins/node.d/snmp__netapp_inodeusage_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__netstat b/plugins/node.d/snmp__netstat
index 9cd82cd8ed..0e6d576d6a 100755
--- a/plugins/node.d/snmp__netstat
+++ b/plugins/node.d/snmp__netstat
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__print_pages b/plugins/node.d/snmp__print_pages
index 6ff09a36ac..7a7a6d1e4d 100755
--- a/plugins/node.d/snmp__print_pages
+++ b/plugins/node.d/snmp__print_pages
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =encoding utf8
 
diff --git a/plugins/node.d/snmp__print_supplies b/plugins/node.d/snmp__print_supplies
index e9a18524b4..01ec9400c9 100755
--- a/plugins/node.d/snmp__print_supplies
+++ b/plugins/node.d/snmp__print_supplies
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 # vim: ft=perl
 
 =encoding utf8
diff --git a/plugins/node.d/snmp__processes b/plugins/node.d/snmp__processes
index 385d117caf..b11a26321d 100755
--- a/plugins/node.d/snmp__processes
+++ b/plugins/node.d/snmp__processes
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__rdp_users b/plugins/node.d/snmp__rdp_users
index 3f72c31116..4340070fd8 100755
--- a/plugins/node.d/snmp__rdp_users
+++ b/plugins/node.d/snmp__rdp_users
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__sensors_fsc_bx_fan b/plugins/node.d/snmp__sensors_fsc_bx_fan
index b9a7436ccc..c15927cb5d 100755
--- a/plugins/node.d/snmp__sensors_fsc_bx_fan
+++ b/plugins/node.d/snmp__sensors_fsc_bx_fan
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__sensors_fsc_bx_temp b/plugins/node.d/snmp__sensors_fsc_bx_temp
index 6e35195966..435882d22b 100755
--- a/plugins/node.d/snmp__sensors_fsc_bx_temp
+++ b/plugins/node.d/snmp__sensors_fsc_bx_temp
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__sensors_fsc_fan b/plugins/node.d/snmp__sensors_fsc_fan
index f8ea07d31a..c77a009f4d 100755
--- a/plugins/node.d/snmp__sensors_fsc_fan
+++ b/plugins/node.d/snmp__sensors_fsc_fan
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 #
 # Copyright (C) 2004 Dagfinn Ilmari Mannsaaker
diff --git a/plugins/node.d/snmp__sensors_fsc_temp b/plugins/node.d/snmp__sensors_fsc_temp
index 2fdf4a34c3..3e70d689db 100755
--- a/plugins/node.d/snmp__sensors_fsc_temp
+++ b/plugins/node.d/snmp__sensors_fsc_temp
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 #
 # Copyright (C) 2004 Dagfinn Ilmari Mannsaaker
diff --git a/plugins/node.d/snmp__sensors_mbm_fan b/plugins/node.d/snmp__sensors_mbm_fan
index 2c582cc8d7..99ec9cbc87 100755
--- a/plugins/node.d/snmp__sensors_mbm_fan
+++ b/plugins/node.d/snmp__sensors_mbm_fan
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__sensors_mbm_temp b/plugins/node.d/snmp__sensors_mbm_temp
index 883c0c9fb9..5b4e99d45e 100755
--- a/plugins/node.d/snmp__sensors_mbm_temp
+++ b/plugins/node.d/snmp__sensors_mbm_temp
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__sensors_mbm_volt b/plugins/node.d/snmp__sensors_mbm_volt
index d2c55332ca..a2614cc42c 100755
--- a/plugins/node.d/snmp__sensors_mbm_volt
+++ b/plugins/node.d/snmp__sensors_mbm_volt
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/snmp__swap b/plugins/node.d/snmp__swap
index 1f5bc3c32c..7aa9b3fbf2 100755
--- a/plugins/node.d/snmp__swap
+++ b/plugins/node.d/snmp__swap
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 #
 # Copyright (C) 2006 Lars Strand
diff --git a/plugins/node.d/snmp__uptime b/plugins/node.d/snmp__uptime
index 4a2f30fee7..1df0299400 100755
--- a/plugins/node.d/snmp__uptime
+++ b/plugins/node.d/snmp__uptime
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__users b/plugins/node.d/snmp__users
index b97c5ca2d5..fa553ceab5 100755
--- a/plugins/node.d/snmp__users
+++ b/plugins/node.d/snmp__users
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snmp__winload b/plugins/node.d/snmp__winload
index 3e1472da1e..5b9e34dafe 100755
--- a/plugins/node.d/snmp__winload
+++ b/plugins/node.d/snmp__winload
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # Copyright (C) 2004-2006 Jimmy Olsen, Dagfinn Ilmari Mannsaaker
 #
diff --git a/plugins/node.d/snmp__winmem b/plugins/node.d/snmp__winmem
index 9c23a830ee..8857bbfbfe 100755
--- a/plugins/node.d/snmp__winmem
+++ b/plugins/node.d/snmp__winmem
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 # vim: ft=perl
 
 =head1 NAME
diff --git a/plugins/node.d/snort_alerts b/plugins/node.d/snort_alerts
index 8309dda918..38a3ca8635 100755
--- a/plugins/node.d/snort_alerts
+++ b/plugins/node.d/snort_alerts
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/snort_bytes_pkt b/plugins/node.d/snort_bytes_pkt
index c67815c9c8..42a6769ef0 100755
--- a/plugins/node.d/snort_bytes_pkt
+++ b/plugins/node.d/snort_bytes_pkt
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/snort_drop_rate b/plugins/node.d/snort_drop_rate
index 9a72d92e68..77100078e8 100755
--- a/plugins/node.d/snort_drop_rate
+++ b/plugins/node.d/snort_drop_rate
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/snort_pattern_match b/plugins/node.d/snort_pattern_match
index 255aac77c1..ac5ba6ff06 100755
--- a/plugins/node.d/snort_pattern_match
+++ b/plugins/node.d/snort_pattern_match
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/snort_pkts b/plugins/node.d/snort_pkts
index a892959e23..4afc423c9b 100755
--- a/plugins/node.d/snort_pkts
+++ b/plugins/node.d/snort_pkts
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/snort_traffic b/plugins/node.d/snort_traffic
index 959f8529cc..c7aa0587f2 100755
--- a/plugins/node.d/snort_traffic
+++ b/plugins/node.d/snort_traffic
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/spamstats b/plugins/node.d/spamstats
index 01b601dc98..ef35976e09 100755
--- a/plugins/node.d/spamstats
+++ b/plugins/node.d/spamstats
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/squeezebox_ b/plugins/node.d/squeezebox_
index 9f428ef9c1..62e76230e4 100755
--- a/plugins/node.d/squeezebox_
+++ b/plugins/node.d/squeezebox_
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 
 : <<=cut
 
diff --git a/plugins/node.d/squid b/plugins/node.d/squid
index 477f1322c9..e538721311 100755
--- a/plugins/node.d/squid
+++ b/plugins/node.d/squid
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- cperl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/surfboard b/plugins/node.d/surfboard
index 53a052bbb5..a21a6a919b 100755
--- a/plugins/node.d/surfboard
+++ b/plugins/node.d/surfboard
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/tomcat_access b/plugins/node.d/tomcat_access
index 644529298d..25de4252b8 100755
--- a/plugins/node.d/tomcat_access
+++ b/plugins/node.d/tomcat_access
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/tomcat_jvm b/plugins/node.d/tomcat_jvm
index 3fa41a5db8..0869beef7f 100755
--- a/plugins/node.d/tomcat_jvm
+++ b/plugins/node.d/tomcat_jvm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/tomcat_threads b/plugins/node.d/tomcat_threads
index 432ffd90c5..584fd16eda 100755
--- a/plugins/node.d/tomcat_threads
+++ b/plugins/node.d/tomcat_threads
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/tomcat_volume b/plugins/node.d/tomcat_volume
index 7d9e3a6f24..99ba2c27d9 100755
--- a/plugins/node.d/tomcat_volume
+++ b/plugins/node.d/tomcat_volume
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/users b/plugins/node.d/users
index 0fe3e9ea06..38f5745169 100755
--- a/plugins/node.d/users
+++ b/plugins/node.d/users
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# -*- perl -*-
 
 =head1 NAME
 
diff --git a/plugins/node.d/varnish_ b/plugins/node.d/varnish_
index 0908592dd0..b0a29164b0 100755
--- a/plugins/node.d/varnish_
+++ b/plugins/node.d/varnish_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # varnish_ - Munin plugin to for Varnish
 # Copyright (C) 2009  Redpill Linpro AS
diff --git a/plugins/node.d/vmstat b/plugins/node.d/vmstat
index cdaef1b62f..78e554ac22 100755
--- a/plugins/node.d/vmstat
+++ b/plugins/node.d/vmstat
@@ -1,5 +1,4 @@
 #!/bin/sh
-# -*- sh -*-
 
 : << =cut
 
diff --git a/plugins/node.d/zimbra_ b/plugins/node.d/zimbra_
index 2dd4676a5c..f4d9b37432 100755
--- a/plugins/node.d/zimbra_
+++ b/plugins/node.d/zimbra_
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (c) 2009 Erik Inge Bolsø, Redpill Linpro AS
 #
diff --git a/plugins/plugin.sh b/plugins/plugin.sh
index 2c9c23130e..ccf8350d42 100644
--- a/plugins/plugin.sh
+++ b/plugins/plugin.sh
@@ -1,4 +1,3 @@
-# -*- sh -*-
 # Support functions for shell munin plugins
 #
 
diff --git a/script/munin-async b/script/munin-async
index 87f590d040..88799cd3fc 100644
--- a/script/munin-async
+++ b/script/munin-async
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Steve Schnepp
 #
diff --git a/script/munin-asyncd b/script/munin-asyncd
index 93b1897d95..b8a60cf9df 100644
--- a/script/munin-asyncd
+++ b/script/munin-asyncd
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2010 Steve Schnepp
 #
diff --git a/script/munin-check b/script/munin-check
index 35e4769d29..beb2cafc18 100644
--- a/script/munin-check
+++ b/script/munin-check
@@ -1,5 +1,4 @@
 #!/bin/bash
-# -*- sh -*-
 # Copyright (C) 2008 Matthias Schmitz
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/script/munin-doc b/script/munin-doc
index bc8fe01867..88d3d6de9f 100755
--- a/script/munin-doc
+++ b/script/munin-doc
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- perl -*-
 #
 # This script provides the basis for a plugin documentation system for
 # munin.  Please see "man perlpod" for the reference manual to writing
diff --git a/script/munin-graph b/script/munin-graph
index 1f9f7b2270..42ca6f0242 100755
--- a/script/munin-graph
+++ b/script/munin-graph
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =encoding utf8
 
diff --git a/script/munin-html b/script/munin-html
index 43d4b16118..84f3cdb65e 100755
--- a/script/munin-html
+++ b/script/munin-html
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 =encoding utf8
 
diff --git a/script/munin-limits b/script/munin-limits
index 4471b04bdd..a0e33a8421 100755
--- a/script/munin-limits
+++ b/script/munin-limits
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl  -*-
 
 =encoding utf8
 
diff --git a/script/munin-node b/script/munin-node
index 127dc91aca..9fd797bbed 100755
--- a/script/munin-node
+++ b/script/munin-node
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -T
-# -*- cperl -*-
 #
 # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
 #    Nicolai Langfeldt
diff --git a/script/munin-node-configure b/script/munin-node-configure
index 39b1a63d94..06a0dcb4c3 100755
--- a/script/munin-node-configure
+++ b/script/munin-node-configure
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 #
 # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
 #
diff --git a/script/munin-run b/script/munin-run
index 7c5d89dd84..6852603d1d 100755
--- a/script/munin-run
+++ b/script/munin-run
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -T
-# -*- perl -*-
 #
 # Copyright (C) 2004-2009
 #
diff --git a/script/munin-sched b/script/munin-sched
index fc26f557b6..444770f5b9 100755
--- a/script/munin-sched
+++ b/script/munin-sched
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -T
-# -*- cperl -*-
 #
 # Copyright (C) 2002-2010 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
 #    Nicolai Langfeldt, Matthew Boyle
diff --git a/script/munin-update b/script/munin-update
index 833ddb0035..14e6209123 100755
--- a/script/munin-update
+++ b/script/munin-update
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# -*- cperl -*-
 
 use warnings;
 use strict;
diff --git a/t/munin_master_config.t b/t/munin_master_config.t
index cd720a5fe2..367d73c824 100644
--- a/t/munin_master_config.t
+++ b/t/munin_master_config.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 # vim: ts=4 : sw=4 : et
 use warnings;
 use strict;
diff --git a/t/munin_master_config_concat.t b/t/munin_master_config_concat.t
index 4d94f1c10c..311617dff8 100755
--- a/t/munin_master_config_concat.t
+++ b/t/munin_master_config_concat.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_config_split.t b/t/munin_master_config_split.t
index cee508911f..8eb355139d 100755
--- a/t/munin_master_config_split.t
+++ b/t/munin_master_config_split.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_graphold_sum_cdef.t b/t/munin_master_graphold_sum_cdef.t
index 8aa8f9bdfd..3e39db5d4e 100644
--- a/t/munin_master_graphold_sum_cdef.t
+++ b/t/munin_master_graphold_sum_cdef.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 # vim: ts=4 : sw=4 : et
 use warnings;
 use strict;
diff --git a/t/munin_master_limitsold.t b/t/munin_master_limitsold.t
index 090096c610..3665f314c4 100644
--- a/t/munin_master_limitsold.t
+++ b/t/munin_master_limitsold.t
@@ -1,4 +1,3 @@
-# -*- perl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_node.t b/t/munin_master_node.t
index 4efc7f6ce3..9041dae59a 100644
--- a/t/munin_master_node.t
+++ b/t/munin_master_node.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_plugin_config.t b/t/munin_master_plugin_config.t
index add5d42030..14e96b6651 100644
--- a/t/munin_master_plugin_config.t
+++ b/t/munin_master_plugin_config.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_plugin_fetch.t b/t/munin_master_plugin_fetch.t
index 6a0773e9ac..d1d60d5749 100644
--- a/t/munin_master_plugin_fetch.t
+++ b/t/munin_master_plugin_fetch.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_plugin_multigraph_config.t b/t/munin_master_plugin_multigraph_config.t
index 27469f3318..f24ddcd913 100644
--- a/t/munin_master_plugin_multigraph_config.t
+++ b/t/munin_master_plugin_multigraph_config.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 use warnings;
 use strict;
 
diff --git a/t/munin_master_plugin_multigraph_fetch.t b/t/munin_master_plugin_multigraph_fetch.t
index 1522eea069..f352f177a2 100644
--- a/t/munin_master_plugin_multigraph_fetch.t
+++ b/t/munin_master_plugin_multigraph_fetch.t
@@ -1,4 +1,3 @@
-# -*- cperl -*-
 # vim: ts=4 : sw=4 : et
 use warnings;
 use strict;
diff --git a/t/plugins.t b/t/plugins.t
index a12151fba4..76713875a9 100644
--- a/t/plugins.t
+++ b/t/plugins.t
@@ -1,4 +1,3 @@
-# -*- perl -*-
 
 use strict;
 use warnings;