Removing excess authService calls and resolves