Merge "Remove duplicated wait"