Remove _wait

Signed-off-by: Ning Yao <zay11022@gmail.com>