Cleaned up authentication.