diff --git a/spinoffs/fun_mc/fun_mc/fun_mc_test.py b/spinoffs/fun_mc/fun_mc/fun_mc_test.py
index cb743a9a20..41d2dbe32a 100644
--- a/spinoffs/fun_mc/fun_mc/fun_mc_test.py
+++ b/spinoffs/fun_mc/fun_mc/fun_mc_test.py
@@ -18,8 +18,6 @@
 import functools
 import os
 
-# Dependency imports
-
 from absl.testing import parameterized
 import jax as real_jax
 from jax import config as jax_config
diff --git a/spinoffs/fun_mc/fun_mc/malt_test.py b/spinoffs/fun_mc/fun_mc/malt_test.py
index 091c269489..e420806fb9 100644
--- a/spinoffs/fun_mc/fun_mc/malt_test.py
+++ b/spinoffs/fun_mc/fun_mc/malt_test.py
@@ -17,8 +17,6 @@
 import functools
 import os
 
-# Dependency imports
-
 import jax as real_jax
 from jax import config as jax_config
 import numpy as np
diff --git a/spinoffs/fun_mc/fun_mc/prefab_test.py b/spinoffs/fun_mc/fun_mc/prefab_test.py
index c9d5f82966..072455091b 100644
--- a/spinoffs/fun_mc/fun_mc/prefab_test.py
+++ b/spinoffs/fun_mc/fun_mc/prefab_test.py
@@ -17,8 +17,6 @@
 import functools
 import os
 
-# Dependency imports
-
 import jax as real_jax
 from jax import config as jax_config
 import numpy as np
diff --git a/spinoffs/fun_mc/fun_mc/sga_hmc_test.py b/spinoffs/fun_mc/fun_mc/sga_hmc_test.py
index 7da2538907..59ec305bed 100644
--- a/spinoffs/fun_mc/fun_mc/sga_hmc_test.py
+++ b/spinoffs/fun_mc/fun_mc/sga_hmc_test.py
@@ -17,8 +17,6 @@
 import functools
 import os
 
-# Dependency imports
-
 from absl.testing import parameterized
 from jax import config as jax_config
 import tensorflow.compat.v2 as real_tf
diff --git a/spinoffs/fun_mc/fun_mc/util_tfp_test.py b/spinoffs/fun_mc/fun_mc/util_tfp_test.py
index 7e4d7fd78e..2c6a1cfb18 100644
--- a/spinoffs/fun_mc/fun_mc/util_tfp_test.py
+++ b/spinoffs/fun_mc/fun_mc/util_tfp_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for util_tfp."""
 
-# Dependency imports
-
 from absl.testing import parameterized
 from jax import config as jax_config
 import numpy as np
diff --git a/tensorflow_probability/python/experimental/nn/affine_layers_test.py b/tensorflow_probability/python/experimental/nn/affine_layers_test.py
index 43433f4199..850c72a120 100644
--- a/tensorflow_probability/python/experimental/nn/affine_layers_test.py
+++ b/tensorflow_probability/python/experimental/nn/affine_layers_test.py
@@ -15,8 +15,6 @@
 """Tests for affine_layers.py."""
 
 import functools
-# Dependency imports
-
 from absl.testing import parameterized
 
 import numpy as np
diff --git a/tensorflow_probability/python/experimental/nn/convolutional_layers_test.py b/tensorflow_probability/python/experimental/nn/convolutional_layers_test.py
index a6525de128..0e7da838f5 100644
--- a/tensorflow_probability/python/experimental/nn/convolutional_layers_test.py
+++ b/tensorflow_probability/python/experimental/nn/convolutional_layers_test.py
@@ -15,7 +15,6 @@
 """Tests for convolution_layers.py."""
 
 import functools
-# Dependency imports
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/experimental/nn/convolutional_layers_v2_test.py b/tensorflow_probability/python/experimental/nn/convolutional_layers_v2_test.py
index 0893af1b25..0cf0ca5ce7 100644
--- a/tensorflow_probability/python/experimental/nn/convolutional_layers_v2_test.py
+++ b/tensorflow_probability/python/experimental/nn/convolutional_layers_v2_test.py
@@ -16,8 +16,6 @@
 # TODO(emilyaf): Test Keras compatibility (other layers too).
 
 import functools
-# Dependency imports
-
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/experimental/nn/convolutional_transpose_layers_test.py b/tensorflow_probability/python/experimental/nn/convolutional_transpose_layers_test.py
index eceba593ec..e660df7331 100644
--- a/tensorflow_probability/python/experimental/nn/convolutional_transpose_layers_test.py
+++ b/tensorflow_probability/python/experimental/nn/convolutional_transpose_layers_test.py
@@ -15,7 +15,6 @@
 """Tests for convolutional_transpose_layers.py."""
 
 import functools
-# Dependency imports
 import tensorflow.compat.v2 as tf
 
 from tensorflow_probability.python.bijectors import sigmoid
diff --git a/tensorflow_probability/python/experimental/nn/layers_test.py b/tensorflow_probability/python/experimental/nn/layers_test.py
index 2ca23eaed3..9f962412d6 100644
--- a/tensorflow_probability/python/experimental/nn/layers_test.py
+++ b/tensorflow_probability/python/experimental/nn/layers_test.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Tests for layers."""
 
-# Dependency imports
 import tensorflow.compat.v2 as tf
 
 from tensorflow_probability.python.distributions import independent
diff --git a/tensorflow_probability/python/optimizer/bfgs.py b/tensorflow_probability/python/optimizer/bfgs.py
index 22342300b6..ea03553800 100644
--- a/tensorflow_probability/python/optimizer/bfgs.py
+++ b/tensorflow_probability/python/optimizer/bfgs.py
@@ -25,7 +25,6 @@
 
 import collections
 
-# Dependency imports
 import tensorflow.compat.v2 as tf
 
 from tensorflow_probability.python.internal import distribution_util
diff --git a/tensorflow_probability/python/optimizer/lbfgs.py b/tensorflow_probability/python/optimizer/lbfgs.py
index 7faf0e24f3..b7635bfac2 100644
--- a/tensorflow_probability/python/optimizer/lbfgs.py
+++ b/tensorflow_probability/python/optimizer/lbfgs.py
@@ -25,7 +25,6 @@
 """
 import collections
 
-# Dependency imports
 import tensorflow.compat.v2 as tf
 
 from tensorflow_probability.python.internal import dtype_util
diff --git a/tensorflow_probability/python/optimizer/nelder_mead.py b/tensorflow_probability/python/optimizer/nelder_mead.py
index e1c0f78f2c..1fa3058047 100644
--- a/tensorflow_probability/python/optimizer/nelder_mead.py
+++ b/tensorflow_probability/python/optimizer/nelder_mead.py
@@ -23,7 +23,6 @@
 
 import collections
 
-# Dependency imports
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/optimizer/proximal_hessian_sparse_test.py b/tensorflow_probability/python/optimizer/proximal_hessian_sparse_test.py
index afc44fa312..a51c598373 100644
--- a/tensorflow_probability/python/optimizer/proximal_hessian_sparse_test.py
+++ b/tensorflow_probability/python/optimizer/proximal_hessian_sparse_test.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Tests for Proximal Hessian Optimizer."""
 
-# Dependency imports
 import numpy as np
 
 import tensorflow.compat.v1 as tf1
diff --git a/tensorflow_probability/python/optimizer/sgld_test.py b/tensorflow_probability/python/optimizer/sgld_test.py
index 37c3e9d363..8eea84126d 100644
--- a/tensorflow_probability/python/optimizer/sgld_test.py
+++ b/tensorflow_probability/python/optimizer/sgld_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Functional test for GradientDescent."""
 
-# Dependency imports
-
 import numpy as np
 import tensorflow.compat.v1 as tf1
 import tensorflow.compat.v2 as tf