Remove extra waits