Remove the wait function