Simplify auth init further