Fix captcha refresh
Cleanup TODOs