simplified cluster; minor worker reorg