diff --git a/auth0/src/main/java/com/auth0/android/request/internal/JsonRequiredTypeAdapterFactory.java b/auth0/src/main/java/com/auth0/android/request/internal/JsonRequiredTypeAdapterFactory.java
index 40e0cd9e..a62b12e2 100755
--- a/auth0/src/main/java/com/auth0/android/request/internal/JsonRequiredTypeAdapterFactory.java
+++ b/auth0/src/main/java/com/auth0/android/request/internal/JsonRequiredTypeAdapterFactory.java
@@ -32,7 +32,7 @@ public T read(JsonReader in) throws IOException {
 
                 Field[] fields = pojo.getClass().getDeclaredFields();
                 for (Field f : fields) {
-                    if (f!= null && f.getAnnotation(JsonRequired.class) != null) {
+                    if (f.getAnnotation(JsonRequired.class) != null) {
                         try {
                             f.setAccessible(true);
                             if (f.get(pojo) == null) {
diff --git a/sample/src/main/java/com/auth0/sample/DatabaseLoginFragment.kt b/sample/src/main/java/com/auth0/sample/DatabaseLoginFragment.kt
index 52daa4f6..c73223d1 100644
--- a/sample/src/main/java/com/auth0/sample/DatabaseLoginFragment.kt
+++ b/sample/src/main/java/com/auth0/sample/DatabaseLoginFragment.kt
@@ -29,7 +29,7 @@ import kotlinx.coroutines.launch
  */
 class DatabaseLoginFragment : Fragment() {
 
-    private val scope = "openid profile email offline_access read:current_user update:current_user_metadata"
+    private val scope = "openid profile email read:current_user update:current_user_metadata"
 
     private val account: Auth0 by lazy {
         // -- REPLACE this credentials with your own Auth0 app credentials!
@@ -247,13 +247,7 @@ class DatabaseLoginFragment : Fragment() {
     }
 
     private fun getCreds() {
-        credentialsManager.getCredentials(
-            "openid email profile offline_access",
-            0,
-            mapOf(),
-            mapOf("test" to "test"),
-            true,
-            object : Callback<Credentials, CredentialsManagerException> {
+        credentialsManager.getCredentials(object : Callback<Credentials, CredentialsManagerException> {
             override fun onSuccess(result: Credentials) {
                 Snackbar.make(
                     requireView(),
@@ -270,12 +264,7 @@ class DatabaseLoginFragment : Fragment() {
 
     private suspend fun getCredsAsync() {
         try {
-            val credentials = credentialsManager.awaitCredentials(
-                "openid email profile offline_access",
-                0,
-                mapOf(),
-                mapOf("test" to "test"),
-                true)
+            val credentials = credentialsManager.awaitCredentials()
             Snackbar.make(
                 requireView(),
                 "Got credentials - ${credentials.accessToken}",