Remove dependency on captcha