Remove wait method