diff --git a/codegen/sdk-codegen/aws-models/s3.2006-03-01.json b/codegen/sdk-codegen/aws-models/s3.2006-03-01.json
index fe2346c482c6..ba09a05fafb4 100644
--- a/codegen/sdk-codegen/aws-models/s3.2006-03-01.json
+++ b/codegen/sdk-codegen/aws-models/s3.2006-03-01.json
@@ -5566,23 +5566,6 @@
                 "matcher": {
                   "success": true
                 }
-              },
-              {
-                "state": "retry",
-                "matcher": {
-                  "errorType": "NoSuchBucket"
-                }
-              }
-            ],
-            "minDelay": 5
-          },
-          "BucketNotExists": {
-            "acceptors": [
-              {
-                "state": "success",
-                "matcher": {
-                  "errorType": "NoSuchBucket"
-                }
               }
             ],
             "minDelay": 5
@@ -5638,23 +5621,6 @@
                 "matcher": {
                   "success": true
                 }
-              },
-              {
-                "state": "retry",
-                "matcher": {
-                  "errorType": "NoSuchKey"
-                }
-              }
-            ],
-            "minDelay": 5
-          },
-          "ObjectNotExists": {
-            "acceptors": [
-              {
-                "state": "success",
-                "matcher": {
-                  "errorType": "NoSuchKey"
-                }
               }
             ],
             "minDelay": 5
diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
index 4c9e8802be3e..5120d599bd23 100644
--- a/codegen/smithy-aws-typescript-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
@@ -34,6 +34,7 @@ tasks.withType<Test> {
 
 dependencies {
     api("software.amazon.smithy:smithy-aws-traits:[1.5.0, 2.0[")
+    api("software.amazon.smithy:smithy-waiters:[1.5.0, 2.0[")
     api("software.amazon.smithy:smithy-aws-iam-traits:[1.5.0, 2.0[")
     api("software.amazon.smithy:smithy-typescript-codegen:0.3.0")
     testCompile("org.junit.jupiter:junit-jupiter-api:5.4.0")