Remove unneeded wait