Remove unnecessary wait