Remove wait-until-deployed