Remove ClickAndWaitFor... methods. Scripts are better by splitting such calls across two lines, one for the click and one for the wait