diff --git a/fizz/experimental/ktls/test/BUCK b/fizz/experimental/ktls/test/BUCK
deleted file mode 100644
index 494fd8047b5..00000000000
--- a/fizz/experimental/ktls/test/BUCK
+++ /dev/null
@@ -1,76 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
-
-oncall("secure_pipes")
-
-cpp_unittest(
-    name = "ktls_test",
-    srcs = [
-        "KTLSTest.cpp",
-    ],
-    deps = [
-        "//fizz/backend:openssl",
-        "//fizz/crypto/aead:aead",
-        "//fizz/experimental/ktls:ktls",
-        "//folly/test:test_utils",
-    ],
-)
-
-cpp_unittest(
-    name = "async_fizz_base_ktls_test",
-    srcs = [
-        "AsyncFizzBaseKTLSTest.cpp",
-    ],
-    deps = [
-        "//fizz/backend:openssl",
-        "//fizz/client:async_fizz_client",
-        "//fizz/client:synchronized_lru_psk_cache",
-        "//fizz/crypto/test:TestUtil",
-        "//fizz/experimental/ktls:ktls",
-        "//fizz/protocol:certificate",
-        "//fizz/protocol/test:mocks",
-        "//fizz/server:aead_ticket_cipher",
-        "//fizz/server:async_fizz_server",
-        "//fizz/server:cert_manager",
-        "//fizz/server:fizz_server_context",
-        "//fizz/server:ticket_codec",
-        "//folly:function",
-        "//folly/futures:core",
-        "//folly/io/async:async_socket",
-        "//folly/io/async:server_socket",
-        "//folly/test:test_utils",
-    ],
-)
-
-cpp_unittest(
-    name = "async_ktls_socket_test",
-    srcs = [
-        "AsyncKTLSSocketTest.cpp",
-    ],
-    deps = [
-        "//fizz/backend:openssl",
-        "//fizz/experimental/ktls:ktls",
-        "//fizz/record:encrypted_record_layer",
-        "//folly/futures:core",
-        "//folly/io/async:async_socket",
-        "//folly/io/async:server_socket",
-        "//folly/io/async/test:mocks",
-        "//folly/test:test_utils",
-    ],
-)
-
-cpp_unittest(
-    name = "async_ktls_rx_socket_test",
-    srcs = [
-        "AsyncKTLSRxSocketTest.cpp",
-    ],
-    deps = [
-        "//fizz/backend:openssl",
-        "//fizz/experimental/ktls:ktls",
-        "//fizz/record:encrypted_record_layer",
-        "//folly/futures:core",
-        "//folly/io/async:async_socket",
-        "//folly/io/async:server_socket",
-        "//folly/io/async/test:mocks",
-        "//folly/test:test_utils",
-    ],
-)
diff --git a/fizz/tool/BUCK b/fizz/tool/BUCK
deleted file mode 100644
index 90746dc7bdc..00000000000
--- a/fizz/tool/BUCK
+++ /dev/null
@@ -1,103 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary")
-load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
-
-oncall("secure_pipes")
-
-cpp_library(
-    name = "tool_lib",
-    srcs = [
-        "FizzCommandCommon.cpp",
-    ],
-    headers = [
-        "FizzCommandCommon.h",
-    ],
-    deps = [
-        "//fizz/backend:libsodium",
-        "//fizz/backend:openssl",
-        "//fizz/protocol:certificate",
-        "//folly:base64",
-        "//folly:string",
-    ],
-    exported_deps = [
-        "//fizz/crypto/exchange:key_exchange",
-        "//fizz/protocol:async_fizz_base",
-        "//fizz/protocol/ech:encrypted_client_hello",
-        "//fizz/util:parse",
-        "//folly:file_util",
-        "//folly/experimental/io:io_uring_backend",
-        "//folly/io:iobuf",
-        "//folly/io/async:async_base",
-        "//folly/json:dynamic",
-    ],
-)
-
-cpp_binary(
-    name = "fizz",
-    srcs = [
-        "FizzClientCommand.cpp",
-        "FizzClientLoadGenCommand.cpp",
-        "FizzGenerateDelegatedCredentialCommand.cpp",
-        "FizzServerBenchmarkCommand.cpp",
-        "FizzServerCommand.cpp",
-        "Main.cpp",
-    ],
-    headers = [
-        "CertificateVerifiers.h",
-        "Commands.h",
-    ],
-    preprocessor_flags = [
-        "-DFIZZ_TOOL_ENABLE_BROTLI",
-        "-DFIZZ_TOOL_ENABLE_ZSTD",
-        "-DFIZZ_TOOL_ENABLE_IO_URING",
-    ],
-    deps = [
-        ":tool_lib",
-        "//fizz/backend:libsodium",
-        "//fizz/backend:openssl",
-        "//fizz/client:async_fizz_client",
-        "//fizz/client:psk_serialization_utils",
-        "//fizz/compression:brotli_certificate_compressor",
-        "//fizz/compression:brotli_certificate_decompressor",
-        "//fizz/compression:zlib_certificate_compressor",
-        "//fizz/compression:zlib_certificate_decompressor",
-        "//fizz/compression:zstd_certificate_compressor",
-        "//fizz/compression:zstd_certificate_decompressor",
-        "//fizz/crypto:random",
-        "//fizz/crypto/hpke:utils",
-        "//fizz/experimental/batcher:batcher",
-        "//fizz/experimental/protocol:batch_signature_factory",
-        "//fizz/experimental/server:batch_signature_async_self_cert",
-        "//fizz/extensions/delegatedcred:delegated_credential_cert_manager",
-        "//fizz/extensions/delegatedcred:delegated_credential_client_extension",
-        "//fizz/extensions/delegatedcred:delegated_credential_factory",
-        "//fizz/extensions/delegatedcred:delegated_credential_utils",
-        "//fizz/extensions/delegatedcred:self_delegated_credential",
-        "//fizz/extensions/delegatedcred:serialization",
-        "//fizz/protocol:certificate_verifier",
-        "//fizz/protocol:default_certificate_verifier",
-        "//fizz/protocol:default_factory",
-        "//fizz/protocol/test:cert_util",
-        "//fizz/server:async_fizz_server",
-        "//fizz/server:sliding_bloom_replay_cache",
-        "//fizz/server:ticket_types",
-        "//fizz/util:fizz_util",
-        "//fizz/util:key_log_writer",
-        "//fizz/util:parse",
-        "//folly:conv",
-        "//folly:file_util",
-        "//folly:format",
-        "//folly/executors:io_thread_pool_executor",
-        "//folly/futures:core",
-        "//folly/io/async:async_ssl_socket",
-        "//folly/io/async:server_socket",
-        "//folly/io/async:ssl_context",
-        "//folly/io/async/ssl:openssl_transport_certificate",
-        "//folly/json:dynamic",
-        "//folly/portability:gflags",
-        "//folly/ssl:openssl_cert_utils",
-        "//folly/stats:histogram",
-    ],
-    external_deps = [
-        "glog",
-    ],
-)
diff --git a/fizz/tool/test/BUCK b/fizz/tool/test/BUCK
deleted file mode 100644
index 14ab7d0ea90..00000000000
--- a/fizz/tool/test/BUCK
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
-
-oncall("secure_pipes")
-
-cpp_unittest(
-    name = "fizz_command_common",
-    srcs = [
-        "FizzCommandCommonTest.cpp",
-    ],
-    deps = [
-        "//fizz/protocol/ech:encrypted_client_hello",
-        "//fizz/tool:tool_lib",
-        "//folly/container:array",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)