diff --git a/cpp/platform/impl/windows/executor.h b/cpp/platform/impl/windows/executor.h
index 4f521368..cff20810 100644
--- a/cpp/platform/impl/windows/executor.h
+++ b/cpp/platform/impl/windows/executor.h
@@ -36,9 +36,6 @@ class Executor : public api::Executor {
   // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html#shutdown--
   // TODO(b/184975123): replace with real implementation.
   void Shutdown() override {}
-
-  // TODO(b/184975123): replace with real implementation.
-  int GetTid(int index) const override { return 0; }
 };
 
 }  // namespace windows
diff --git a/cpp/platform/impl/windows/scheduled_executor.h b/cpp/platform/impl/windows/scheduled_executor.h
index a1e61227..790ed70d 100644
--- a/cpp/platform/impl/windows/scheduled_executor.h
+++ b/cpp/platform/impl/windows/scheduled_executor.h
@@ -47,9 +47,6 @@ class ScheduledExecutor : public api::ScheduledExecutor {
   // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html#shutdown--
   // TODO(b/184975123): replace with real implementation.
   void Shutdown() override {}
-
-  // TODO(b/184975123): replace with real implementation.
-  int GetTid(int index) const override { return 0; }
 };
 
 }  // namespace windows
diff --git a/cpp/platform/impl/windows/submittable_executor.h b/cpp/platform/impl/windows/submittable_executor.h
index 9533a5e9..0fdc0c88 100644
--- a/cpp/platform/impl/windows/submittable_executor.h
+++ b/cpp/platform/impl/windows/submittable_executor.h
@@ -43,9 +43,6 @@ class SubmittableExecutor : public api::SubmittableExecutor {
   // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html#shutdown--
   // TODO(b/184975123): replace with real implementation.
   void Shutdown() override {}
-
-  // TODO(b/184975123): replace with real implementation.
-  int GetTid(int index) const override { return 0; }
 };
 
 }  // namespace windows
diff --git a/proto/BUILD b/proto/BUILD
index e1b09839..9c1d8c0b 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -72,6 +72,9 @@ portable_proto_library(
 filegroup(
     name = "connections_enums_proto_config",
     srcs = ["connections_enums_proto_config.asciipb"],
+    compatible_with = [
+        "//buildenv/target:non_prod",
+    ],
 )
 
 proto_library(
diff --git a/proto/connections/BUILD b/proto/connections/BUILD
index d1448693..78b02719 100644
--- a/proto/connections/BUILD
+++ b/proto/connections/BUILD
@@ -64,4 +64,7 @@ portable_proto_library(
 filegroup(
     name = "offline_wire_formats_proto_config",
     srcs = ["offline_wire_formats_proto_config.asciipb"],
+    compatible_with = [
+        "//buildenv/target:non_prod",
+    ],
 )