Various fixes, removing of old and unnecessary code.

Will comment on some of the changes.
No need to keep the captcha prefixes, it's all namespaced by captcha.settings.