Cleaned up authentication options