diff --git a/azurerm/internal/services/frontdoor/frontdoor_firewall_policy_resource.go b/azurerm/internal/services/frontdoor/frontdoor_firewall_policy_resource.go
index c48856fb3607..a73b62294f6d 100644
--- a/azurerm/internal/services/frontdoor/frontdoor_firewall_policy_resource.go
+++ b/azurerm/internal/services/frontdoor/frontdoor_firewall_policy_resource.go
@@ -22,8 +22,6 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-// TODO: a state migration to patch the ID's
-
 func resourceArmFrontDoorFirewallPolicy() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceArmFrontDoorFirewallPolicyCreateUpdate,
diff --git a/azurerm/internal/services/frontdoor/parse/frontdoor.go b/azurerm/internal/services/frontdoor/parse/frontdoor.go
index 185e21f9be38..9172078ff58c 100644
--- a/azurerm/internal/services/frontdoor/parse/frontdoor.go
+++ b/azurerm/internal/services/frontdoor/parse/frontdoor.go
@@ -22,7 +22,7 @@ func NewFrontDoorID(resourceGroup, name string) FrontDoorId {
 func FrontDoorID(input string) (*FrontDoorId, error) {
 	frontDoorId, id, err := parseFrontDoorChildResourceId(input)
 	if err != nil {
-		return nil, fmt.Errorf("[ERROR] Unable to parse FrontDoor ID %q: %+v", input, err)
+		return nil, fmt.Errorf("parsing FrontDoor ID %q: %+v", input, err)
 	}
 
 	if err := id.ValidateNoEmptySegments(input); err != nil {
@@ -35,7 +35,7 @@ func FrontDoorID(input string) (*FrontDoorId, error) {
 func FrontDoorIDForImport(input string) (*FrontDoorId, error) {
 	id, err := azure.ParseAzureResourceID(input)
 	if err != nil {
-		return nil, fmt.Errorf("[ERROR] Unable to parse FrontDoor ID %q: %+v", input, err)
+		return nil, fmt.Errorf("parsing FrontDoor ID %q: %+v", input, err)
 	}
 
 	frontDoorId := FrontDoorId{
diff --git a/azurerm/internal/services/frontdoor/validate/name_test.go b/azurerm/internal/services/frontdoor/validate/name_test.go
index 3bc09001a655..481a747c86f6 100644
--- a/azurerm/internal/services/frontdoor/validate/name_test.go
+++ b/azurerm/internal/services/frontdoor/validate/name_test.go
@@ -16,7 +16,7 @@ func TestAccAzureRMFrontDoorFirewallPolicy_validateName(t *testing.T) {
 			ExpectError: true,
 		},
 		{
-			Name:        "Starst with Numeric",
+			Name:        "Starts with Numeric",
 			Input:       "1WellThisIsAllWrong",
 			ExpectError: true,
 		},