diff --git a/okta/app.go b/okta/app.go
index f1800838c..bb1175dea 100644
--- a/okta/app.go
+++ b/okta/app.go
@@ -95,14 +95,14 @@ var (
 			Optional:    true,
 			Description: "Ignore users sync. This is a temporary solution until 'users' field is supported in all the app-like resources",
 			Default:     false,
-			Deprecated:  "Because of users has been removed, this attribute is a no op and will be removed",
+			Deprecated:  "Because users has been removed, this attribute is a no op and will be removed",
 		},
 		"skip_groups": {
 			Type:        schema.TypeBool,
 			Optional:    true,
 			Description: "Ignore groups sync. This is a temporary solution until 'groups' field is supported in all the app-like resources",
 			Default:     false,
-			Deprecated:  "Because of groups has been removed, this attribute is a no op and will be removed",
+			Deprecated:  "Because groups has been removed, this attribute is a no op and will be removed",
 		},
 	}
 
diff --git a/okta/resource_okta_group.go b/okta/resource_okta_group.go
index 1ff5021ab..661dece9b 100644
--- a/okta/resource_okta_group.go
+++ b/okta/resource_okta_group.go
@@ -51,7 +51,7 @@ func resourceGroup() *schema.Resource {
 				Optional:    true,
 				Description: "Ignore users sync. This is a temporary solution until 'users' field is supported in all the app-like resources",
 				Default:     false,
-				Deprecated:  "Because of users has been removed, this attribute is a no op and will be removed",
+				Deprecated:  "Because users has been removed, this attribute is a no op and will be removed",
 			},
 			"custom_profile_attributes": {
 				Type:             schema.TypeString,
diff --git a/okta/resource_okta_policy_rule_idp_discovery_test.go b/okta/resource_okta_policy_rule_idp_discovery_test.go
index 7a26c1013..3d6b2b341 100644
--- a/okta/resource_okta_policy_rule_idp_discovery_test.go
+++ b/okta/resource_okta_policy_rule_idp_discovery_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-// TODU
 func TestAccOktaPolicyRuleIdpDiscovery_crud(t *testing.T) {
 	mgr := newFixtureManager(policyRuleIdpDiscovery, t.Name())
 	config := mgr.GetFixtures("basic.tf", t)
diff --git a/okta/resource_okta_user.go b/okta/resource_okta_user.go
index 16f8568fb..2eca718ee 100644
--- a/okta/resource_okta_user.go
+++ b/okta/resource_okta_user.go
@@ -71,6 +71,13 @@ func resourceUser() *schema.Resource {
 			},
 		},
 		Schema: map[string]*schema.Schema{
+			"skip_roles": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Do not populate user roles information (prevents additional API call)",
+				Deprecated:  "Because admin_roles has been removed, this attribute is a no op and will be removed",
+			},
 			"city": {
 				Type:        schema.TypeString,
 				Optional:    true,
diff --git a/okta/resource_okta_user_test.go b/okta/resource_okta_user_test.go
index 77b8aba23..e3b306c50 100644
--- a/okta/resource_okta_user_test.go
+++ b/okta/resource_okta_user_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-// TODU
 func TestAccOktaUser_customProfileAttributes(t *testing.T) {
 	mgr := newFixtureManager(user, t.Name())
 	config := mgr.GetFixtures("custom_attributes.tf", t)