diff --git a/fizz/defs.bzl b/fizz/defs.bzl
index d41179f56f..e8527fd805 100644
--- a/fizz/defs.bzl
+++ b/fizz/defs.bzl
@@ -201,7 +201,11 @@ def fizz_cxx_library(
 
 def fizz_cpp_binary(name, deps, **kwargs):
     if get_fbsource_cell() == "fbcode":
-        cpp_binary(name = name, **kwargs)
+        cpp_binary(
+            name = name,
+            deps = deps,
+            **kwargs
+        )
     else:
         converted_deps = deps_map_utils.convert_all_to_fbsource_deps(
             deps = deps,
diff --git a/fizz/record/BUCK b/fizz/record/BUCK
deleted file mode 100644
index 2ee73efc6e..0000000000
--- a/fizz/record/BUCK
+++ /dev/null
@@ -1,88 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
-
-oncall("secure_pipes")
-
-cpp_library(
-    name = "record",
-    srcs = [
-        "Types.cpp",
-    ],
-    headers = [
-        "Extensions.h",
-        "Extensions-inl.h",
-        "Types.h",
-        "Types-inl.h",
-    ],
-    exported_deps = [
-        "//fizz/protocol:events",
-        "//folly:conv",
-        "//folly:optional",
-        "//folly:string",
-        "//folly/io:iobuf",
-    ],
-)
-
-cpp_library(
-    name = "record_layer",
-    srcs = [
-        "RecordLayer.cpp",
-    ],
-    headers = [
-        "RecordLayer.h",
-    ],
-    exported_deps = [
-        ":record",
-        "//fizz/crypto/aead:aead",
-        "//fizz/protocol:params",
-        "//folly:optional",
-        "//folly/io:iobuf",
-    ],
-)
-
-cpp_library(
-    name = "plaintext_record_layer",
-    srcs = [
-        "PlaintextRecordLayer.cpp",
-    ],
-    headers = [
-        "PlaintextRecordLayer.h",
-    ],
-    deps = [
-        "//folly:string",
-    ],
-    exported_deps = [
-        ":record_layer",
-    ],
-)
-
-cpp_library(
-    name = "encrypted_record_layer",
-    srcs = [
-        "EncryptedRecordLayer.cpp",
-    ],
-    headers = [
-        "EncryptedRecordLayer.h",
-    ],
-    deps = [
-        "//fizz/crypto/aead:iobuf",
-    ],
-    exported_deps = [
-        ":buf_and_padding_policy",
-        ":record_layer",
-        "//fizz/crypto/aead:aead",
-    ],
-)
-
-cpp_library(
-    name = "buf_and_padding_policy",
-    srcs = [
-        "BufAndPaddingPolicy.cpp",
-    ],
-    headers = [
-        "BufAndPaddingPolicy.h",
-    ],
-    exported_deps = [
-        ":record",
-        "//folly/io:iobuf",
-    ],
-)
diff --git a/fizz/record/test/BUCK b/fizz/record/test/BUCK
deleted file mode 100644
index ccda2b50db..0000000000
--- a/fizz/record/test/BUCK
+++ /dev/null
@@ -1,140 +0,0 @@
-load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary")
-load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
-load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
-
-oncall("secure_pipes")
-
-cpp_library(
-    name = "mocks",
-    headers = [
-        "Mocks.h",
-    ],
-    exported_deps = [
-        "//fizz/protocol:types",
-        "//fizz/record:encrypted_record_layer",
-        "//fizz/record:plaintext_record_layer",
-        "//folly/portability:gmock",
-    ],
-)
-
-cpp_library(
-    name = "extension_tests_base",
-    headers = [
-        "ExtensionTestsBase.h",
-    ],
-    exported_deps = [
-        "//fizz/record:record",
-        "//folly:string",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "handshake_types_test",
-    srcs = [
-        "HandshakeTypesTest.cpp",
-    ],
-    deps = [
-        "//fizz/record:record",
-        "//folly:string",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "extensions_test",
-    srcs = [
-        "ExtensionsTest.cpp",
-    ],
-    deps = [
-        ":extension_tests_base",
-        "//fizz/record:record",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "types_test",
-    srcs = [
-        "TypesTest.cpp",
-    ],
-    deps = [
-        "//fizz/record:record",
-        "//folly/io:iobuf",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "plaintext_record_test",
-    srcs = [
-        "PlaintextRecordTest.cpp",
-    ],
-    deps = [
-        "//fizz/record:plaintext_record_layer",
-        "//folly:string",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "record_test",
-    srcs = [
-        "RecordTest.cpp",
-    ],
-    deps = [
-        ":mocks",
-        "//fizz/record:record_layer",
-        "//folly:string",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "encrypted_record_test",
-    srcs = [
-        "EncryptedRecordTest.cpp",
-    ],
-    deps = [
-        "//fizz/crypto/aead/test:mocks",
-        "//fizz/record:buf_and_padding_policy",
-        "//fizz/record:encrypted_record_layer",
-        "//folly:string",
-        "//folly/portability:gmock",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_unittest(
-    name = "buf_and_padding_policy_test",
-    srcs = [
-        "BufAndPaddingPolicyTest.cpp",
-    ],
-    deps = [
-        "//fizz/record:buf_and_padding_policy",
-        "//folly/portability:gtest",
-    ],
-)
-
-cpp_binary(
-    name = "record_bench",
-    srcs = [
-        "EncryptedRecordBench.cpp",
-    ],
-    compiler_flags = ["-Wno-unused-variable"],
-    deps = [
-        "//fizz/backend:libaegis",
-        "//fizz/backend:openssl",
-        "//fizz/crypto:utils",
-        "//fizz/record:encrypted_record_layer",
-        "//folly:benchmark",
-        "//folly:random",
-        "//folly/init:init",
-    ],
-)