diff --git a/manifests/client/target.pp b/manifests/client/target.pp
index 2711f24..bc93405 100644
--- a/manifests/client/target.pp
+++ b/manifests/client/target.pp
@@ -6,7 +6,7 @@
 class confdroid_nagios::client::target (
 
 ) inherits confdroid_nagios::params {
-  if ($ng_nagios_server != $fqdn) and ($ng_enable_target == true) {
+  if $ng_enable_target == true {
     package { $ng_reqpackages_client:
       ensure => $ng_pkg_ensure,
     }
diff --git a/manifests/server/nagios.pp b/manifests/server/nagios.pp
index db372eb..a07bfaa 100644
--- a/manifests/server/nagios.pp
+++ b/manifests/server/nagios.pp
@@ -24,23 +24,6 @@ class confdroid_nagios::server::nagios (
       notify              => Service[$ng_service],
     }
 
-    @@nagios_host { $fqdn:
-      ensure              => $ng_ping_ensure,
-      alias               => $hostname,
-      address             => $fqdn,
-      use                 => 'linux-server',
-      target              => $ng_target_localhost,
-      hostgroups          => 'linux-servers',
-      contacts            => $ng_contact_name,
-      max_check_attempts  => $ng_max_check_attempts,
-      notification_period => '24x7',
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      check_command       => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
-      notify              => Service[$ng_service],
-    }
-
     @@nagios_service { 'check_nagios_localhost':
       check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
       use                 => 'generic-service',