Remove use of Authenticator framework. It does not work.

More cleanup