Remove unwanted wait