diff --git a/packages/auth/src/AuthProvider/useForgotPassword.ts b/packages/auth/src/AuthProvider/useForgotPassword.ts
index 79e41ffa8f93..981fd7e7a360 100644
--- a/packages/auth/src/AuthProvider/useForgotPassword.ts
+++ b/packages/auth/src/AuthProvider/useForgotPassword.ts
@@ -13,10 +13,6 @@ export const useForgotPassword = <
   TSignUp,
   TGetTokenOptions,
   TForgotPassword,
-  TResetPasswordOptions,
-  TResetPassword,
-  TValidateResetToken,
-  TClient,
 >(
   authImplementation: AuthImplementation<
     TUser,
@@ -28,11 +24,7 @@ export const useForgotPassword = <
     TSignUpOptions,
     TSignUp,
     TGetTokenOptions,
-    TForgotPassword,
-    TResetPasswordOptions,
-    TResetPassword,
-    TValidateResetToken,
-    TClient
+    TForgotPassword
   >,
 ) => {
   return useCallback(
diff --git a/packages/auth/src/AuthProvider/useLogIn.ts b/packages/auth/src/AuthProvider/useLogIn.ts
index 85c96488ed1b..4135f11e427e 100644
--- a/packages/auth/src/AuthProvider/useLogIn.ts
+++ b/packages/auth/src/AuthProvider/useLogIn.ts
@@ -7,37 +7,12 @@ import { spaDefaultAuthProviderState } from './AuthProviderState.js'
 import type { useCurrentUser } from './useCurrentUser.js'
 import { useReauthenticate } from './useReauthenticate.js'
 
-export const useLogIn = <
-  TUser,
-  TRestoreAuth,
-  TLogInOptions,
-  TLogIn,
-  TLogOutOptions,
-  TLogOut,
-  TSignUpOptions,
-  TSignUp,
-  TGetTokenOptions,
-  TForgotPassword,
-  TResetPasswordOptions,
-  TResetPassword,
-  TValidateResetToken,
-  TClient,
->(
+export const useLogIn = <TUser, TRestoreAuth, TLogInOptions, TLogIn>(
   authImplementation: AuthImplementation<
     TUser,
     TRestoreAuth,
     TLogInOptions,
-    TLogIn,
-    TLogOutOptions,
-    TLogOut,
-    TSignUpOptions,
-    TSignUp,
-    TGetTokenOptions,
-    TForgotPassword,
-    TResetPasswordOptions,
-    TResetPassword,
-    TValidateResetToken,
-    TClient
+    TLogIn
   >,
   setAuthProviderState: React.Dispatch<
     React.SetStateAction<AuthProviderState<TUser>>
diff --git a/packages/auth/src/AuthProvider/useLogOut.ts b/packages/auth/src/AuthProvider/useLogOut.ts
index a6d1176a0291..c65d89eeb33f 100644
--- a/packages/auth/src/AuthProvider/useLogOut.ts
+++ b/packages/auth/src/AuthProvider/useLogOut.ts
@@ -11,14 +11,6 @@ export const useLogOut = <
   TLogIn,
   TLogOutOptions,
   TLogOut,
-  TSignUpOptions,
-  TSignUp,
-  TGetTokenOptions,
-  TForgotPassword,
-  TResetPasswordOptions,
-  TResetPassword,
-  TValidateResetToken,
-  TClient,
 >(
   authImplementation: AuthImplementation<
     TUser,
@@ -26,15 +18,7 @@ export const useLogOut = <
     TLogInOptions,
     TLogIn,
     TLogOutOptions,
-    TLogOut,
-    TSignUpOptions,
-    TSignUp,
-    TGetTokenOptions,
-    TForgotPassword,
-    TResetPasswordOptions,
-    TResetPassword,
-    TValidateResetToken,
-    TClient
+    TLogOut
   >,
   setAuthProviderState: React.Dispatch<
     React.SetStateAction<AuthProviderState<TUser>>
diff --git a/packages/auth/src/AuthProvider/useResetPassword.ts b/packages/auth/src/AuthProvider/useResetPassword.ts
index 6a9249735a0d..00c2a8f5917c 100644
--- a/packages/auth/src/AuthProvider/useResetPassword.ts
+++ b/packages/auth/src/AuthProvider/useResetPassword.ts
@@ -15,8 +15,6 @@ export const useResetPassword = <
   TForgotPassword,
   TResetPasswordOptions,
   TResetPassword,
-  TValidateResetToken,
-  TClient,
 >(
   authImplementation: AuthImplementation<
     TUser,
@@ -30,9 +28,7 @@ export const useResetPassword = <
     TGetTokenOptions,
     TForgotPassword,
     TResetPasswordOptions,
-    TResetPassword,
-    TValidateResetToken,
-    TClient
+    TResetPassword
   >,
 ) => {
   return useCallback(
diff --git a/packages/auth/src/AuthProvider/useSignUp.ts b/packages/auth/src/AuthProvider/useSignUp.ts
index 81eb63466b0d..a093597af23c 100644
--- a/packages/auth/src/AuthProvider/useSignUp.ts
+++ b/packages/auth/src/AuthProvider/useSignUp.ts
@@ -15,12 +15,6 @@ export const useSignUp = <
   TLogOut,
   TSignUpOptions,
   TSignUp,
-  TGetTokenOptions,
-  TForgotPassword,
-  TResetPasswordOptions,
-  TResetPassword,
-  TValidateResetToken,
-  TClient,
 >(
   authImplementation: AuthImplementation<
     TUser,
@@ -30,13 +24,7 @@ export const useSignUp = <
     TLogOutOptions,
     TLogOut,
     TSignUpOptions,
-    TSignUp,
-    TGetTokenOptions,
-    TForgotPassword,
-    TResetPasswordOptions,
-    TResetPassword,
-    TValidateResetToken,
-    TClient
+    TSignUp
   >,
   setAuthProviderState: React.Dispatch<
     React.SetStateAction<AuthProviderState<TUser>>
diff --git a/packages/auth/src/AuthProvider/useValidateResetToken.ts b/packages/auth/src/AuthProvider/useValidateResetToken.ts
index 0a771d0ef15e..6d89b7f8a691 100644
--- a/packages/auth/src/AuthProvider/useValidateResetToken.ts
+++ b/packages/auth/src/AuthProvider/useValidateResetToken.ts
@@ -16,7 +16,6 @@ export const useValidateResetToken = <
   TResetPasswordOptions,
   TResetPassword,
   TValidateResetToken,
-  TClient,
 >(
   authImplementation: AuthImplementation<
     TUser,
@@ -31,8 +30,7 @@ export const useValidateResetToken = <
     TForgotPassword,
     TResetPasswordOptions,
     TResetPassword,
-    TValidateResetToken,
-    TClient
+    TValidateResetToken
   >,
 ) => {
   return useCallback(