diff --git a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD
index bdf59323..e27cc345 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/collab_opts/prune_preserve/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
+# Placeholder: load py_library
 # Placeholder: load py_test
 
 package(default_visibility = [
@@ -7,21 +7,23 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "prune_preserve",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [
         ":default_8bit_prune_preserve_quantize_scheme",  # buildcleaner: keep
     ],
 )
 
-py_strict_library(
+py_library(
     name = "prune_preserve_quantize_registry",
     srcs = [
         "prune_preserve_quantize_registry.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
@@ -49,11 +51,12 @@ py_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_prune_preserve_quantize_scheme",
     srcs = [
         "default_8bit_prune_preserve_quantize_scheme.py",
     ],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":prune_preserve_quantize_registry",
diff --git a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD
index f33c9d59..18e45eb6 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/default_8bit/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library", "py_strict_test")
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_test")
 # Placeholder: load py_library
 # Placeholder: load py_test
 
@@ -8,19 +8,21 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "default_8bit",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_quantizers",
     srcs = [
         "default_8bit_quantizers.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
@@ -43,22 +45,24 @@ py_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_quantize_configs",
     srcs = [
         "default_8bit_quantize_configs.py",
     ],
+    strict_deps = True,
     deps = [
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize_config",
         "//tensorflow_model_optimization/python/core/quantization/keras:quantizers",
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_quantize_registry",
     srcs = [
         "default_8bit_quantize_registry.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
@@ -130,11 +134,12 @@ py_strict_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_quantize_layout_transform",
     srcs = [
         "default_8bit_quantize_layout_transform.py",
     ],
+    strict_deps = True,
     deps = [
         ":default_8bit_transforms",
         # tensorflow dep1,
@@ -160,11 +165,12 @@ py_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_8bit_quantize_scheme",
     srcs = [
         "default_8bit_quantize_scheme.py",
     ],
+    strict_deps = True,
     deps = [
         ":default_8bit_quantize_layout_transform",
         ":default_8bit_quantize_registry",
diff --git a/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD
index 448889d5..a3dc2ca5 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
+# Placeholder: load py_library
 
 package(default_visibility = [
     "//tensorflow_model_optimization:__subpackages__",
@@ -6,19 +6,21 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "experimental",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [
         ":quantization",  # buildcleaner: keep
     ],
 )
 
-py_strict_library(
+py_library(
     name = "quantization",
     srcs = ["__init__.py"],
+    strict_deps = True,
     deps = [
         "//tensorflow_model_optimization/python/core/quantization/keras",  # buildcleaner: keep
     ],
diff --git a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD
index bbd5893e..655d9c87 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/experimental/default_n_bit/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library", "py_strict_test")
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_test")
 # Placeholder: load py_library
 # Placeholder: load py_test
 
@@ -6,19 +6,21 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "default_n_bit",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [],
 )
 
-py_strict_library(
+py_library(
     name = "default_n_bit_quantizers",
     srcs = [
         "default_n_bit_quantizers.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
@@ -40,22 +42,24 @@ py_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_n_bit_quantize_configs",
     srcs = [
         "default_n_bit_quantize_configs.py",
     ],
+    strict_deps = True,
     deps = [
         "//tensorflow_model_optimization/python/core/quantization/keras:quantize_config",
         "//tensorflow_model_optimization/python/core/quantization/keras:quantizers",
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_n_bit_quantize_registry",
     srcs = [
         "default_n_bit_quantize_registry.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
@@ -102,11 +106,12 @@ py_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_n_bit_quantize_layout_transform",
     srcs = [
         "default_n_bit_quantize_layout_transform.py",
     ],
+    strict_deps = True,
     deps = [
         ":default_n_bit_transforms",
         # tensorflow dep1,
@@ -139,11 +144,12 @@ py_strict_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "default_n_bit_quantize_scheme",
     srcs = [
         "default_n_bit_quantize_scheme.py",
     ],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":default_n_bit_quantize_layout_transform",
diff --git a/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD
index cf51c0dc..af02209a 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/graph_transformations/BUILD
@@ -1,4 +1,5 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library", "py_strict_test")
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_test")
+# Placeholder: load py_library
 
 package(default_visibility = [
     "//tensorflow_model_optimization:__subpackages__",
@@ -6,19 +7,21 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "graph_transformations",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [],
 )
 
-py_strict_library(
+py_library(
     name = "transforms",
     srcs = [
         "transforms.py",
     ],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         # six dep1,
@@ -38,11 +41,12 @@ py_strict_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "model_transformer",
     srcs = [
         "model_transformer.py",
     ],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":transforms",
diff --git a/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD b/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD
index e6ebb22a..31360ab2 100644
--- a/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD
+++ b/tensorflow_model_optimization/python/core/quantization/keras/layers/BUILD
@@ -1,4 +1,4 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
+# Placeholder: load py_library
 
 package(default_visibility = [
     "//tensorflow_model_optimization:__subpackages__",
@@ -6,26 +6,29 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "layers",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [],
 )
 
-py_strict_library(
+py_library(
     name = "conv_batchnorm_test_utils",
     srcs = ["conv_batchnorm_test_utils.py"],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
     ],
 )
 
-py_strict_library(
+py_library(
     name = "dense_batchnorm_test_utils",
     srcs = ["dense_batchnorm_test_utils.py"],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/keras:compat",
diff --git a/tensorflow_model_optimization/python/core/sparsity/BUILD b/tensorflow_model_optimization/python/core/sparsity/BUILD
index 4d7a985b..36f28dcc 100644
--- a/tensorflow_model_optimization/python/core/sparsity/BUILD
+++ b/tensorflow_model_optimization/python/core/sparsity/BUILD
@@ -1,12 +1,13 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
+# Placeholder: load py_library
 
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "sparsity",
     srcs = ["__init__.py"],
+    strict_deps = True,
     deps = [
         "//tensorflow_model_optimization/python/core/sparsity/keras",  # buildcleaner: keep
     ],
diff --git a/tensorflow_model_optimization/python/core/sparsity/keras/BUILD b/tensorflow_model_optimization/python/core/sparsity/keras/BUILD
index b32fa77a..c6d79c4a 100644
--- a/tensorflow_model_optimization/python/core/sparsity/keras/BUILD
+++ b/tensorflow_model_optimization/python/core/sparsity/keras/BUILD
@@ -1,4 +1,5 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library", "py_strict_test")
+load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_test")
+# Placeholder: load py_library
 # Placeholder: load py_test
 
 package(default_visibility = [
@@ -7,11 +8,12 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "keras",
     srcs = [
         "__init__.py",
     ],
+    strict_deps = True,
     deps = [
         ":prunable_layer",  # buildcleaner: keep
         ":prune",  # buildcleaner: keep
@@ -21,9 +23,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "prune",
     srcs = ["prune.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":pruning_schedule",
@@ -34,18 +37,20 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "prunable_layer",
     srcs = ["prunable_layer.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         # six dep1,
     ],
 )
 
-py_strict_library(
+py_library(
     name = "prune_registry",
     srcs = ["prune_registry.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":prunable_layer",
@@ -54,9 +59,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_policy",
     srcs = ["pruning_policy.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":pruning_wrapper",
@@ -66,9 +72,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_schedule",
     srcs = ["pruning_schedule.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         # six dep1,
@@ -91,9 +98,10 @@ py_strict_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_wrapper",
     srcs = ["pruning_wrapper.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":prunable_layer",
@@ -109,9 +117,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_callbacks",
     srcs = ["pruning_callbacks.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":pruning_wrapper",
@@ -139,9 +148,10 @@ py_strict_test(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_impl",
     srcs = ["pruning_impl.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":pruning_utils",
@@ -150,9 +160,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "pruning_utils",
     srcs = ["pruning_utils.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         # numpy dep1,
@@ -160,9 +171,10 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "estimator_utils",
     srcs = ["estimator_utils.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":pruning_wrapper",
@@ -172,10 +184,11 @@ py_strict_library(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "test_utils",
     testonly = 1,
     srcs = ["test_utils.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         ":prune",
diff --git a/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD b/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD
index 227bda9a..0414f47e 100644
--- a/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD
+++ b/tensorflow_model_optimization/python/core/sparsity/keras/tools/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
 # Placeholder: load py_binary
+# Placeholder: load py_library
 # Placeholder: load py_test
 
 package(default_visibility = [
@@ -8,9 +8,10 @@ package(default_visibility = [
 
 licenses(["notice"])
 
-py_strict_library(
+py_library(
     name = "sparsity_tooling",
     srcs = ["sparsity_tooling.py"],
+    strict_deps = True,
     visibility = ["//visibility:public"],
     deps = [
         # tensorflow dep1,
@@ -49,9 +50,10 @@ py_binary(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "check_sparsity_m_by_n",
     srcs = ["check_sparsity_m_by_n.py"],
+    strict_deps = True,
     deps = [
         # absl:app dep1,
         # absl/flags dep1,
diff --git a/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD b/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD
index ede2e4bd..6a204573 100644
--- a/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD
+++ b/tensorflow_model_optimization/python/examples/clustering/keras/imdb/BUILD
@@ -1,5 +1,5 @@
-load("//tensorflow_model_optimization:tensorflow_model_optimization.bzl", "py_strict_library")
 # Placeholder: load py_binary
+# Placeholder: load py_library
 
 package(
     default_visibility = ["//visibility:public"],
@@ -54,11 +54,12 @@ py_binary(
     ],
 )
 
-py_strict_library(
+py_library(
     name = "imdb_utils",
     srcs = [
         "imdb_utils.py",
     ],
+    strict_deps = True,
     deps = [
         # tensorflow dep1,
         "//tensorflow_model_optimization/python/core/clustering/keras:cluster",