Remove doubled wait