Authentification refactoring
No longer required