Remove extra yes echos