Replaced polls with timeouts with control sockets, moved buffering to ZMQ layer