Removed debug stuff

salt/client/__init__.py

@@ -1217,7 +1217,7 @@ class LocalClient(object):
         # Wait for the hosts to check in
         while True:
             raw = self.event.get_event(timeout)
-            if raw is None: # XXXX or time.time() > timeout_at:
+            if raw is None or time.time() > timeout_at:
                 # Timeout reached
                 break
             if 'minions' in raw.get('data', {}):

salt/daemons/flo/core.py

@@ -781,9 +781,6 @@ class Router(ioflo.base.deeding.Deed):
             log.error('Received invalid message: {0}'.format(msg))
             return
 
-        if s_estate == 'router' or d_estate == 'router':
-            console.terse("Event estate for 'router' {0}.\n".format(msg))
-
         if s_yard is None:
             return  # drop message