diff --git a/codegen/smithy-dafny-codegen-cli/src/main/java/software/amazon/polymorph/CodegenCli.java b/codegen/smithy-dafny-codegen-cli/src/main/java/software/amazon/polymorph/CodegenCli.java
index 8b9cd0375..9f57eda40 100644
--- a/codegen/smithy-dafny-codegen-cli/src/main/java/software/amazon/polymorph/CodegenCli.java
+++ b/codegen/smithy-dafny-codegen-cli/src/main/java/software/amazon/polymorph/CodegenCli.java
@@ -145,10 +145,8 @@ public static void main(String[] args) {
     cliArguments.patchFilesDir.ifPresent(engineBuilder::withPatchFilesDir);
     final CodegenEngine engine = engineBuilder.build();
     switch (cliArguments.command) {
-      case GENERATE:
-        engine.run();
-      case PATCH_AFTER_TRANSPILE:
-        engine.patchAfterTranspiling();
+      case GENERATE -> engine.run();
+      case PATCH_AFTER_TRANSPILE -> engine.patchAfterTranspiling();
     }
   }
 
diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/CodegenEngine.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/CodegenEngine.java
index e064c1994..884f960f4 100644
--- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/CodegenEngine.java
+++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/CodegenEngine.java
@@ -885,10 +885,6 @@ private void patchRustAfterTranspiling() {
       final List<String> lines = Files.readAllLines(
         implementationFromDafnyPath
       );
-      // TODO fix root cause of duplicate extra declarations
-      if (lines.contains("// (extra-declarations)")) {
-        return;
-      }
       final int firstModDeclIndex = IntStream
         .range(0, lines.size())
         .filter(i -> lines.get(i).trim().startsWith("pub mod"))