Clean up auth a bit