diff --git a/apps/clustering/models.py b/apps/clustering/models.py
index 6a86232bd8..5f53b7c32e 100644
--- a/apps/clustering/models.py
+++ b/apps/clustering/models.py
@@ -27,6 +27,9 @@ class NodeManager(models.Manager):
             node.save()
         return node
 
+    def live_nodes(self):
+        return self.model.objects.filter(state=NODE_STATE_HEALTHY)
+
 
 class Node(models.Model):
     hostname = models.CharField(max_length=255, verbose_name=_(u'hostname'), unique=True)
@@ -84,12 +87,6 @@ class ClusteringConfigManager(models.Manager):
         for node in self.dead_nodes():
             node.mark_as_dead()
 
-    def zombiest_node(self):
-        try:
-            return self.dead_nodes().order_by('-heartbeat')[0]
-        except IndexError:
-            return None
-
 
 class ClusteringConfig(Singleton):
     node_heartbeat_interval = models.PositiveIntegerField(verbose_name=(u'node heartbeat interval (in seconds)'), help_text=_(u'Interval of time for the node\'s heartbeat update to the cluster.'), default=DEFAULT_NODE_HEARTBEAT_INTERVAL)
diff --git a/apps/clustering/views.py b/apps/clustering/views.py
index 07cb50e80c..a72bc91c58 100644
--- a/apps/clustering/views.py
+++ b/apps/clustering/views.py
@@ -22,7 +22,7 @@ def node_list(request):
     Permission.objects.check_permissions(request.user, [PERMISSION_NODES_VIEW])
 
     context = {
-        'object_list': Node.objects.all(),
+        'object_list': Node.objects.live_nodes(),
         'title': _(u'nodes'),
         'extra_columns_preffixed': [
             {