diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py
index b9c8c4ba5..2ffdedc42 100644
--- a/py/test/defaultconftest.py
+++ b/py/test/defaultconftest.py
@@ -14,17 +14,11 @@ conf_iocapture = "fd" # overridable from conftest.py
 pytest_plugins = "default terminal xfail tmpdir execnetcleanup resultlog monkeypatch".split()
 
 # ===================================================
-# Distributed testing specific options 
+# settings in conftest only (for now) - for distribution
 
-#dist_hosts: needs to be provided by user
-#dist_rsync_roots: might be provided by user, if not present or None,
-#                  whole pkgdir will be rsynced
-
-dist_taskspernode = 15
 dist_boxed = False
 if hasattr(py.std.os, 'nice'):
     dist_nicelevel = py.std.os.nice(0) # nice py.test works
 else:
     dist_nicelevel = 0
-dist_rsync_ignore = []
 
diff --git a/py/test/event.py b/py/test/event.py
index 7fffc359c..72b5f40aa 100644
--- a/py/test/event.py
+++ b/py/test/event.py
@@ -146,11 +146,6 @@ class RescheduleItems(BaseEvent):
     def __init__(self, items):
         self.items = items
  
-#class HostGatewayReady(BaseEvent):
-#    def __init__(self, host, roots):
-#        self.host = host
-#        self.roots = roots
-
 # ---------------------------------------------------------------------
 # Events related to rsyncing
 # ---------------------------------------------------------------------
diff --git a/py/test/plugin/pytest_plugintester.py b/py/test/plugin/pytest_plugintester.py
index 3c43e5ae3..388512203 100644
--- a/py/test/plugin/pytest_plugintester.py
+++ b/py/test/plugin/pytest_plugintester.py
@@ -207,7 +207,7 @@ class PytestPluginHooks:
         """ Node is down. """
 
     def pyevent_rescheduleitems(self, event):
-        """ Items from a host that went down. """
+        """ Items from a node that went down. """
 
     def pyevent_looponfailinginfo(self, event):
         """ info for repeating failing tests. """