Remove redundant wait step