Remove waits; adjust date