diff --git a/tensorflow_text/core/kernels/BUILD b/tensorflow_text/core/kernels/BUILD
index c20f5c9db..11c3bacb9 100644
--- a/tensorflow_text/core/kernels/BUILD
+++ b/tensorflow_text/core/kernels/BUILD
@@ -796,7 +796,6 @@ tf_cc_library(
         "@com_google_absl//absl/types:span",
         # lite/kernels/shim:op_kernel tensorflow dep,
         # lite/kernels/shim:shape tensorflow dep,
-        # lite/kernels/shim:status_macros tensorflow dep,
         # lite/kernels/shim:tensor_view tensorflow dep,
     ],
 )
@@ -1186,7 +1185,6 @@ tf_cc_library(
         "@com_google_absl//absl/status:statusor",
         # lite/kernels/shim:op_kernel tensorflow dep,
         # lite/kernels/shim:shape tensorflow dep,
-        # lite/kernels/shim:status_macros tensorflow dep,
         # lite/kernels/shim:tensor_view tensorflow dep,
     ],
 )
diff --git a/tensorflow_text/core/ops/BUILD b/tensorflow_text/core/ops/BUILD
index f5d08c6a5..668ddd8b0 100644
--- a/tensorflow_text/core/ops/BUILD
+++ b/tensorflow_text/core/ops/BUILD
@@ -14,10 +14,10 @@ cc_test(
         "byte_splitter_op_test.cc",
     ],
     deps = [
+        # tf:framework tensorflow dep,
         # tf:test tensorflow dep,
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:byte_splitter_kernel",
     ],
 )
@@ -30,10 +30,10 @@ cc_test(
         "boise_offset_converter_op_test.cc",
     ],
     deps = [
+        # tf:framework tensorflow dep,
         # tf:test tensorflow dep,
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:boise_offset_converter_kernel",
     ],
 )
@@ -46,10 +46,10 @@ cc_test(
         "fast_wordpiece_tokenizer_op_test.cc",
     ],
     deps = [
+        # tf:framework tensorflow dep,
         # tf:test tensorflow dep,
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:fast_wordpiece_tokenizer_kernel",
     ],
 )
@@ -62,10 +62,10 @@ cc_test(
         "sentence_fragmenter_v2_op_test.cc",
     ],
     deps = [
+        # tf:framework tensorflow dep,
         # tf:test tensorflow dep,
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:sentence_fragmenter_v2_kernel",
     ],
 )
@@ -83,7 +83,6 @@ cc_test(
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
         # tf/framework:tensor_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:round_robin_trimmer_kernel",
     ],
 )
@@ -96,11 +95,11 @@ cc_test(
         "utf8_binarize_op_test.cc",
     ],
     deps = [
+        # tf:framework tensorflow dep,
         # tf:protos_all_cc tensorflow dep,
         # tf:test tensorflow dep,
         # tf:test_main tensorflow dep,
         # tf/framework:shape_inference_testutil tensorflow dep,
-        # lite/kernels/shim:tf_op_shim tensorflow dep,
         "//tensorflow_text/core/kernels:utf8_binarize_kernel",
     ],
 )