Get rid of useless waits.