Get rid of authenticate phase