Cleanup some auth mess