diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go
index 48a3061de2..baf615d680 100644
--- a/builtin/providers/aws/provider.go
+++ b/builtin/providers/aws/provider.go
@@ -91,21 +91,19 @@ func Provider() terraform.ResourceProvider {
 			},
 
 			"dynamodb_endpoint": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Default:       "",
-				Description:   descriptions["dynamodb_endpoint"],
-				Deprecated:    "Use `dynamodb` inside `endpoints` block instead",
-				ConflictsWith: []string{"endpoints.0.dynamodb"},
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "",
+				Description: descriptions["dynamodb_endpoint"],
+				Removed:     "Use `dynamodb` inside `endpoints` block instead",
 			},
 
 			"kinesis_endpoint": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Default:       "",
-				Description:   descriptions["kinesis_endpoint"],
-				Deprecated:    "Use `kinesis` inside `endpoints` block instead",
-				ConflictsWith: []string{"endpoints.0.kinesis"},
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "",
+				Description: descriptions["kinesis_endpoint"],
+				Removed:     "Use `kinesis` inside `endpoints` block instead",
 			},
 
 			"endpoints": endpointsSchema(),
@@ -504,8 +502,6 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		Token:                   d.Get("token").(string),
 		Region:                  d.Get("region").(string),
 		MaxRetries:              d.Get("max_retries").(int),
-		DynamoDBEndpoint:        d.Get("dynamodb_endpoint").(string),
-		KinesisEndpoint:         d.Get("kinesis_endpoint").(string),
 		Insecure:                d.Get("insecure").(bool),
 		SkipCredsValidation:     d.Get("skip_credentials_validation").(bool),
 		SkipRegionValidation:    d.Get("skip_region_validation").(bool),