cleaned AuthenticationService