remove need for wait_until_ready