diff --git a/site/tests/cli_runner.uce b/site/tests/cli_runner.uce
index 058dd5e..1d1c1c4 100644
--- a/site/tests/cli_runner.uce
+++ b/site/tests/cli_runner.uce
@@ -304,13 +304,27 @@ CLI(Request& context)
 	}
 
 	print("Running UCE CLI tests\n");
+	f64 group_start = time_precise();
 	cli_run_demo_smoke();
+	print("[GROUP] demo ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_http_smoke();
+	print("[GROUP] http ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_site_suite();
+	print("[GROUP] site ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_security_smoke();
+	print("[GROUP] security ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_starter_parity();
+	print("[GROUP] starter ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_tcp_smoke();
+	print("[GROUP] tcp ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
+	group_start = time_precise();
 	cli_run_wasm_kill(include_kill);
+	print("[GROUP] wasm-kill ", std::to_string((u64)((time_precise() - group_start) * 1000)), " ms\n");
 	print("\nSummary: ", std::to_string(cli_tests_passed), " passed, ", std::to_string(cli_tests_failed), " failed, ", std::to_string(cli_tests_skipped), " skipped\n");
 	if(cli_tests_failed != 0)
 	{
diff --git a/src/wasm/core.cpp b/src/wasm/core.cpp
index 92d559a..4574471 100644
--- a/src/wasm/core.cpp
+++ b/src/wasm/core.cpp
@@ -541,8 +541,6 @@ enum WasmResolveKind {
 	WASM_RESOLVE_EXISTS = 2,
 	WASM_RESOLVE_ONCE = 3,
 	WASM_RESOLVE_CLI = 4,
-	WASM_RESOLVE_WEBSOCKET = 5,
-	WASM_RESOLVE_SERVE_HTTP = 6,
 };
 
 static s32 wasm_resolve_target(String target, s32 kind, String* resolved_out = 0)
diff --git a/src/wasm/worker.cpp b/src/wasm/worker.cpp
index ad6dff5..dfd04e7 100644
--- a/src/wasm/worker.cpp
+++ b/src/wasm/worker.cpp
@@ -389,7 +389,7 @@ public:
 	// resolve-kind values shared with the guest core (src/wasm/core.cpp)
 	// must match WasmResolveKind in src/wasm/core.cpp
 	enum ResolveKind { RESOLVE_COMPONENT = 0, RESOLVE_RENDER = 1, RESOLVE_EXISTS = 2, RESOLVE_ONCE = 3,
-		RESOLVE_CLI = 4, RESOLVE_WEBSOCKET = 5, RESOLVE_SERVE_HTTP = 6 };
+		RESOLVE_CLI = 4 };
 
 	String birth()
 	{
@@ -1071,8 +1071,6 @@ private:
 		String symbol = kind == RESOLVE_RENDER ? "__uce_render"
 			: kind == RESOLVE_ONCE ? "__uce_once"
 			: kind == RESOLVE_CLI ? "__uce_cli"
-			: kind == RESOLVE_WEBSOCKET ? "__uce_websocket"
-			: kind == RESOLVE_SERVE_HTTP ? "__uce_serve_http"
 			: "__uce_component";
 		if(render_name != "")
 			symbol += "_" + sanitize_symbol_suffix(render_name);