diff --git a/c10/ovrsource_defs.bzl b/c10/ovrsource_defs.bzl
index 3f682fb9c20..4abf8b0014d 100644
--- a/c10/ovrsource_defs.bzl
+++ b/c10/ovrsource_defs.bzl
@@ -63,7 +63,6 @@ def define_c10_ovrsource(name, is_mobile):
             "core/impl/*.h",
         ]),
         reexport_all_header_dependencies = False,
-        # tests = C10_CPU_TEST_TARGETS,
         visibility = [
             "//xplat/caffe2/c10:c10_ovrsource",
         ],
@@ -84,25 +83,6 @@ def define_c10_ovrsource(name, is_mobile):
     )
 
 def define_ovrsource_targets():
-    # C10_CPU_TEST_FILES = native.glob([
-    #     "test/core/*.cpp",
-    #     "test/util/*.cpp",
-    # ])
-
-    # C10_GPU_TEST_FILES = native.glob([
-    #     "cuda/test/**/*.cpp",
-    # ])
-
-    # C10_CPU_TEST_TARGETS = [
-    #     ":" + paths.basename(test)[:-len(".cpp")] + "_ovrsource"
-    #     for test in C10_CPU_TEST_FILES
-    # ]
-
-    # C10_GPU_TEST_TARGETS = [
-    #     ":" + paths.basename(test)[:-len(".cpp")] + "_ovrsource"
-    #     for test in C10_GPU_TEST_FILES
-    # ]
-
     common_c10_cmake_defines = [
         ("#cmakedefine C10_BUILD_SHARED_LIBS", ""),
         ("#cmakedefine C10_USE_NUMA", ""),
@@ -207,7 +187,6 @@ def define_ovrsource_targets():
             "cuda/impl/*.h",
         ]),
         reexport_all_header_dependencies = False,
-        # tests = C10_GPU_TEST_TARGETS,
         visibility = ["PUBLIC"],
         deps = [
             "//third-party/cuda:libcuda",
@@ -217,64 +196,3 @@ def define_ovrsource_targets():
             ":c10_ovrsource",
         ],
     )
-
-    # [
-    #     oxx_test(
-    #         name = paths.basename(test)[:-len(".cpp")] + "_ovrsource",
-    #         srcs = [test],
-    #         compatible_with = cpu_supported_platforms,
-    #         compiler_flags = select({
-    #             "DEFAULT": [],
-    #             "ovr_config//compiler:cl": [
-    #                 "/w",
-    #             ],
-    #             "ovr_config//compiler:clang": [
-    #                 "-Wno-error",
-    #                 "-Wno-self-assign-overloaded",
-    #                 "-Wno-self-move",
-    #                 "-Wno-shadow",
-    #                 "-Wno-undef",
-    #                 "-Wno-unused-function",
-    #                 "-Wno-unused-variable",
-    #             ],
-    #         }),
-    #         framework = "gtest",
-    #         oncall = "ovrsource_pytorch",
-    #         raw_headers = native.glob([
-    #             "test/**/*.h",
-    #         ]),
-    #         deps = [
-    #             ":c10_ovrsource",
-    #         ],
-    #     )
-    #     for test in C10_CPU_TEST_FILES
-    # ]
-
-    # [
-    #     oxx_test(
-    #         name = paths.basename(test)[:-len(".cpp")] + "_ovrsource",
-    #         srcs = [test],
-    #         compatible_with = cuda_supported_platforms,
-    #         compiler_flags = select({
-    #             "DEFAULT": [],
-    #             "ovr_config//compiler:cl": [
-    #                 "/w",
-    #             ],
-    #             "ovr_config//compiler:clang": [
-    #                 "-Wno-error",
-    #             ],
-    #         }),
-    #         framework = "gtest",
-    #         oncall = "ovrsource_pytorch",
-    #         raw_headers = native.glob([
-    #             "test/**/*.h",
-    #         ]),
-    #         runtime_shared_libraries = [
-    #             "//third-party/cuda:cudart",
-    #         ],
-    #         deps = [
-    #             ":c10_cuda_ovrsource",
-    #         ],
-    #     )
-    #     for test in C10_GPU_TEST_FILES
-    # ]