Clean up of public auth flow