diff -Naur -x '*~' nagios/sample-config/template-object/commands.cfg.in nagios-no-duplicate-command-definition/sample-config/template-object/commands.cfg.in
--- nagios/sample-config/template-object/commands.cfg.in	2010-08-28 17:24:44.000000000 +0200
+++ nagios-no-duplicate-command-definition/sample-config/template-object/commands.cfg.in	2013-02-07 21:17:10.433731240 +0100
@@ -36,182 +36,6 @@
 	command_line	/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | @MAIL_PROG@ -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
 	}
 
-
-
-
-
-################################################################################
-#
-# SAMPLE HOST CHECK COMMANDS
-#
-################################################################################
-
-
-# This command checks to see if a host is "alive" by pinging it
-# The check must result in a 100% packet loss or 5 second (5000ms) round trip 
-# average time to produce a critical error.
-# Note: Five ICMP echo packets are sent (determined by the '-p 5' argument)
-
-# 'check-host-alive' command definition
-define command{
-        command_name    check-host-alive
-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5
-        }
-
-
-
-
-################################################################################
-#
-# SAMPLE SERVICE CHECK COMMANDS
-#
-# These are some example service check commands.  They may or may not work on
-# your system, as they must be modified for your plugins.  See the HTML 
-# documentation on the plugins for examples of how to configure command definitions.
-#
-# NOTE:  The following 'check_local_...' functions are designed to monitor
-#        various metrics on the host that Nagios is running on (i.e. this one).
-################################################################################
-
-# 'check_local_disk' command definition
-define command{
-        command_name    check_local_disk
-        command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
-        }
-
-
-# 'check_local_load' command definition
-define command{
-        command_name    check_local_load
-        command_line    $USER1$/check_load -w $ARG1$ -c $ARG2$
-        }
-
-
-# 'check_local_procs' command definition
-define command{
-        command_name    check_local_procs
-        command_line    $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-        }
-
-
-# 'check_local_users' command definition
-define command{
-        command_name    check_local_users
-        command_line    $USER1$/check_users -w $ARG1$ -c $ARG2$
-        }
-
-
-# 'check_local_swap' command definition
-define command{
-	command_name	check_local_swap
-	command_line	$USER1$/check_swap -w $ARG1$ -c $ARG2$
-	}
-
-
-# 'check_local_mrtgtraf' command definition
-define command{
-	command_name	check_local_mrtgtraf
-	command_line	$USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$
-	}
-
-
-################################################################################
-# NOTE:  The following 'check_...' commands are used to monitor services on
-#        both local and remote hosts.
-################################################################################
-
-# 'check_ftp' command definition
-define command{
-        command_name    check_ftp
-        command_line    $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_hpjd' command definition
-define command{
-        command_name    check_hpjd
-        command_line    $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_snmp' command definition
-define command{
-        command_name    check_snmp
-        command_line    $USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_http' command definition
-define command{
-        command_name    check_http
-        command_line    $USER1$/check_http -I $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_ssh' command definition
-define command{
-	command_name	check_ssh
-	command_line	$USER1$/check_ssh $ARG1$ $HOSTADDRESS$
-	}
-
-
-# 'check_dhcp' command definition
-define command{
-	command_name	check_dhcp
-	command_line	$USER1$/check_dhcp $ARG1$
-	}
-
-
-# 'check_ping' command definition
-define command{
-        command_name    check_ping
-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
-        }
-
-
-# 'check_pop' command definition
-define command{
-        command_name    check_pop
-        command_line    $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_imap' command definition
-define command{
-        command_name    check_imap
-        command_line    $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_smtp' command definition
-define command{
-        command_name    check_smtp
-        command_line    $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$
-        }
-
-
-# 'check_tcp' command definition
-define command{
-	command_name	check_tcp
-	command_line	$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
-	}
-
-
-# 'check_udp' command definition
-define command{
-	command_name	check_udp
-	command_line	$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
-	}
-
-
-# 'check_nt' command definition
-define command{
-	command_name	check_nt
-	command_line	$USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$
-	}
-
-
-
 ################################################################################
 #
 # SAMPLE PERFORMANCE DATA COMMANDS
diff -Naur -x '*~' nagios/sample-config/template-object/localhost.cfg.in nagios-no-duplicate-command-definition/sample-config/template-object/localhost.cfg.in
--- nagios/sample-config/template-object/localhost.cfg.in	2007-06-09 18:43:08.000000000 +0200
+++ nagios-no-duplicate-command-definition/sample-config/template-object/localhost.cfg.in	2013-02-07 21:17:52.369398243 +0100
@@ -78,7 +78,7 @@
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Root Partition
-	check_command			check_local_disk!20%!10%!/
+	check_command			check_disk!20%!10%!/
         }
 
 
@@ -91,7 +91,7 @@
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Current Users
-	check_command			check_local_users!20!50
+	check_command			check_users!20!50
         }
 
 
@@ -103,7 +103,7 @@
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Total Processes
-	check_command			check_local_procs!250!400!RSZDT
+	check_command			check_procs!250!400!RSZDT
         }
 
 
@@ -114,7 +114,7 @@
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Current Load
-	check_command			check_local_load!5.0,4.0,3.0!10.0,6.0,4.0
+	check_command			check_load!5.0,4.0,3.0!10.0,6.0,4.0
         }
 
 
@@ -126,7 +126,7 @@
         use                             local-service         ; Name of service template to use
         host_name                       localhost
         service_description             Swap Usage
-	check_command			check_local_swap!20!10
+	check_command			check_swap!20!10
         }