diff --git a/client/testfixture/guests/rust/Makefile b/client/testfixture/guests/rust/Makefile
index 5569af08..31f19ffa 100644
--- a/client/testfixture/guests/rust/Makefile
+++ b/client/testfixture/guests/rust/Makefile
@@ -1,10 +1,10 @@
 deploy: clean build
-	rm -rf ../../wasm/* && cp ../../../../target/wasm32-wasip2/release/wasm_rust_guest_testfixture.wasm ../../wasm/
+	cp ../../../../target/wasm32-wasip2/release/wasm_rust_guest_testfixture.wasm ../../wasm/
 
 build:
 	cargo build --target wasm32-wasip2  --release
 
 clean:
-	rm -rf ../../scripts/*.wasm
+	rm -rf ../../wasm/wasm_rust_guest_testfixture.wasm
 
 .PHONY: build deploy clean
diff --git a/client/testfixture/wasm/auth_ui_component.wasm b/client/testfixture/wasm/auth_ui_component.wasm
index 95b74305..4d3705bf 100644
Binary files a/client/testfixture/wasm/auth_ui_component.wasm and b/client/testfixture/wasm/auth_ui_component.wasm differ
diff --git a/client/testfixture/wasm/wasm_rust_guest_testfixture.wasm b/client/testfixture/wasm/wasm_rust_guest_testfixture.wasm
index 0de07569..79b81f57 100644
Binary files a/client/testfixture/wasm/wasm_rust_guest_testfixture.wasm and b/client/testfixture/wasm/wasm_rust_guest_testfixture.wasm differ
diff --git a/crates/auth-ui/Makefile b/crates/auth-ui/Makefile
index 2f1a1fbc..617ed6a8 100644
--- a/crates/auth-ui/Makefile
+++ b/crates/auth-ui/Makefile
@@ -20,4 +20,4 @@ ${TRAILDEPOT}/wasm/component.wasm: ../../target/wasm32-wasip2/release/${NAME}.wa
 ../../target/wasm32-wasip2/release/${NAME}.wasm: src/*.rs
 	cargo build --target wasm32-wasip2  --release
 
-.PHONY: guest run
+.PHONY: guest deploy run
diff --git a/crates/wasm-runtime-guest/src/lib.rs b/crates/wasm-runtime-guest/src/lib.rs
index 7298da82..96ffbd8a 100644
--- a/crates/wasm-runtime-guest/src/lib.rs
+++ b/crates/wasm-runtime-guest/src/lib.rs
@@ -42,7 +42,6 @@ use crate::http::{HttpRoute, Method, StatusCode, empty_error_response};
 use crate::job::Job;
 
 pub use crate::wit::exports::trailbase::runtime::init_endpoint::{InitArguments, InitResult};
-pub use crate::wit::trailbase::runtime::host_endpoint::thread_id;
 
 // Needed for export macro
 pub use static_assertions::assert_impl_all;
diff --git a/crates/wasm-runtime-guest/wit/trailbase.wit b/crates/wasm-runtime-guest/wit/trailbase.wit
index 0f6a185a..a66a929d 100644
--- a/crates/wasm-runtime-guest/wit/trailbase.wit
+++ b/crates/wasm-runtime-guest/wit/trailbase.wit
@@ -29,9 +29,6 @@ interface init-endpoint  {
 }
 
 interface host-endpoint {
-  thread-id: func() -> u64;
-
-
   variant tx-error {
     other(string)
   }
diff --git a/crates/wasm-runtime-host/src/lib.rs b/crates/wasm-runtime-host/src/lib.rs
index 811383f8..febd7327 100644
--- a/crates/wasm-runtime-host/src/lib.rs
+++ b/crates/wasm-runtime-host/src/lib.rs
@@ -63,7 +63,6 @@ wasmtime::component::bindgen!({
         "trailbase:runtime/host-endpoint/tx-rollback": trappable,
         "trailbase:runtime/host-endpoint/tx-execute": trappable,
         "trailbase:runtime/host-endpoint/tx-query": trappable,
-        "trailbase:runtime/host-endpoint/thread-id": trappable,
         default: async | trappable,
     },
     exports: {
@@ -177,11 +176,6 @@ impl WasiHttpView for State {
 }
 
 impl trailbase::runtime::host_endpoint::Host for State {
-  // FIXME: Makes no sense with shared executor.
-  fn thread_id(&mut self) -> wasmtime::Result<u64> {
-    return Err(wasmtime::Error::msg("not supported"));
-  }
-
   fn execute(
     &mut self,
     query: String,
diff --git a/guests/typescript/generated/types/interfaces/trailbase-runtime-host-endpoint.d.ts b/guests/typescript/generated/types/interfaces/trailbase-runtime-host-endpoint.d.ts
index 1aa20b1b..114bb869 100644
--- a/guests/typescript/generated/types/interfaces/trailbase-runtime-host-endpoint.d.ts
+++ b/guests/typescript/generated/types/interfaces/trailbase-runtime-host-endpoint.d.ts
@@ -1,5 +1,4 @@
 /** @module Interface trailbase:runtime/host-endpoint **/
-export function threadId(): bigint;
 /**
  * NOTE: Ideally, we'd use these but they currently block guests.
  */
diff --git a/guests/typescript/src/index.ts b/guests/typescript/src/index.ts
index 5156fdfe..e516b067 100644
--- a/guests/typescript/src/index.ts
+++ b/guests/typescript/src/index.ts
@@ -11,7 +11,6 @@ export { addPeriodicCallback } from "./timer";
 
 export * from "./util";
 export type { InitResult } from "trailbase:runtime/init-endpoint";
-export { threadId } from "trailbase:runtime/host-endpoint";
 
 export interface Config {
   incomingHandler: {
diff --git a/guests/typescript/wit/trailbase.wit b/guests/typescript/wit/trailbase.wit
index 8693f7d3..42a64c74 100644
--- a/guests/typescript/wit/trailbase.wit
+++ b/guests/typescript/wit/trailbase.wit
@@ -29,9 +29,6 @@ interface init-endpoint  {
 }
 
 interface host-endpoint {
-  thread-id: func() -> u64;
-
-
   variant tx-error {
     other(string)
   }