diff --git a/.github/workflows/ci_todos.yml b/.github/workflows/ci_todos.yml
index 98911f419..20a75492f 100644
--- a/.github/workflows/ci_todos.yml
+++ b/.github/workflows/ci_todos.yml
@@ -1,25 +1,24 @@
-# TODO: Uncomment this
-# # This workflow prevents TODOs in code
-# name: Check TODOs in code
+# This workflow prevents TODOs in code
+name: Check TODOs in code
 
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - main
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
-# jobs:
-#   findTodos:
-#     runs-on: macos-13
-#     steps:
-#       - uses: actions/checkout@v3
+jobs:
+  findTodos:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v3
 
-#       - name: Check TODOs in code
-#         shell: bash
-#         # TODOs may be committed as long as the same line contains a link to a Github Issue or refers to a CrypTool SIM.
-#         run: |
-#           ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./releases --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
-#           GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./releases --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
-#           if [ "$ALL_TODO_COUNT" != "$GOOD_TODO_COUNT" ]; then
-#             exit 1;
-#           fi
+      - name: Check TODOs in code
+        shell: bash
+        # TODOs may be committed as long as the same line contains a link to a Github Issue or refers to a CrypTool SIM.
+        run: |
+          ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./releases --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml | grep -v "context\.TODO()" || true; } | wc -l)
+          GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./releases --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml | grep -v "context\.TODO()" || true; } | wc -l)
+          if [ "$ALL_TODO_COUNT" != "$GOOD_TODO_COUNT" ]; then
+            exit 1;
+          fi
diff --git a/DynamoDbEncryption/Makefile b/DynamoDbEncryption/Makefile
index ef50a1295..5138879c0 100644
--- a/DynamoDbEncryption/Makefile
+++ b/DynamoDbEncryption/Makefile
@@ -102,7 +102,7 @@ SERVICE_DEPS_DynamoDbEncryptionTransforms := \
 	DynamoDbEncryption/dafny/DynamoDbItemEncryptor
 
 # Go
-# TODO: Define the name later
+# TODO-Go-ORR: Define the name later https://sim.amazon.com/issues/CrypTool-5444
 # This will probably get changes to */releases/go/* but I will bring this to the team later.
 GO_MODULE_NAME="github.com/aws/aws-database-encryption-sdk-dynamodb"
 
diff --git a/TestVectors/Makefile b/TestVectors/Makefile
index 1a7adc7c5..f38d343b5 100644
--- a/TestVectors/Makefile
+++ b/TestVectors/Makefile
@@ -148,19 +148,6 @@ _sed_types_file_add_extern:
 
 _polymorph_go: purge_polymorph_code
 
-# Smithy-dafny generated shim needs a long term fix. 
-# TODO: Remove this commands once smithy-dafny is fixed
-# This commands does not work on windows
-# https://taskei.amazon.dev/tasks/CrypTool-5283
-purge_polymorph_code:
-	find .. -name "shim.go" | xargs sed -i $(SED_PARAMETER) 's/(_static \*CompanionStruct_Default___)//g'
-	rm -rf runtimes/go/ImplementationFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated \
-		runtimes/go/ImplementationFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygeneratedtypes \
-		runtimes/go/ImplementationFromDafny-go/WrappedAwsCryptographyDbEncryptionSdkDynamoDbService \
-		runtimes/go/TestsFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygenerated \
-		runtimes/go/TestsFromDafny-go/awscryptographydbencryptionsdkdynamodbsmithygeneratedtypes \
-		runtimes/go/TestsFromDafny-go/WrappedAwsCryptographyDbEncryptionSdkDynamoDbService
-
 # Go
 GO_MODULE_NAME="github.com/aws/aws-database-encryption-sdk-dynamodb/testvectors"
 
@@ -213,7 +200,7 @@ _sed_index_file_remove_extern:
 _polymorph_go: purge_polymorph_code
 
 # Smithy-dafny generated shim needs a long term fix. 
-# TODO: Remove this commands once smithy-dafny is fixed
+# TODO: Remove this commands once smithy-dafny is fixed https://sim.amazon.com/issues/CrypTool-5445
 # This commands does not work on windows
 # https://taskei.amazon.dev/tasks/CrypTool-5283
 purge_polymorph_code: