Tidy header, clean up OpenID delegation