Clean up authentication
Fix merge conflicts