Remove unnecessary wait functions