rm wait_for_compute workaround