420 - Cleaned up authentication refactor.