More auth cleanup