Got rid of a bunch of redundant AWS.OpenID references