diff --git a/tensorflow_probability/python/internal/assert_util.py b/tensorflow_probability/python/internal/assert_util.py
index 4f5a9866e5..d786f3f0cd 100644
--- a/tensorflow_probability/python/internal/assert_util.py
+++ b/tensorflow_probability/python/internal/assert_util.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """TF assertions."""
 
-# Dependency imports
 import numpy as np
 
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/batch_shape_lib_test.py b/tensorflow_probability/python/internal/batch_shape_lib_test.py
index 4b09882c81..63a018d5cf 100644
--- a/tensorflow_probability/python/internal/batch_shape_lib_test.py
+++ b/tensorflow_probability/python/internal/batch_shape_lib_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for batch_shape."""
 
-# Dependency imports
-
 from absl import logging
 from absl.testing import parameterized
 import mock
diff --git a/tensorflow_probability/python/internal/cache_util.py b/tensorflow_probability/python/internal/cache_util.py
index 07fa04a4af..897c554bae 100644
--- a/tensorflow_probability/python/internal/cache_util.py
+++ b/tensorflow_probability/python/internal/cache_util.py
@@ -17,7 +17,6 @@
 import collections
 import weakref
 
-# Dependency imports
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/internal/cache_util_test.py b/tensorflow_probability/python/internal/cache_util_test.py
index fe82de01ec..d23e7df31e 100644
--- a/tensorflow_probability/python/internal/cache_util_test.py
+++ b/tensorflow_probability/python/internal/cache_util_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for cache_util."""
 
-# Dependency imports
-
 from absl.testing import parameterized
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/internal/callable_util_test.py b/tensorflow_probability/python/internal/callable_util_test.py
index 3905b69e7c..5fd84c2264 100644
--- a/tensorflow_probability/python/internal/callable_util_test.py
+++ b/tensorflow_probability/python/internal/callable_util_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for cache_util."""
 
-# Dependency imports
-
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/internal/distribution_util_test.py b/tensorflow_probability/python/internal/distribution_util_test.py
index a8bf3d196b..bfa12113f3 100644
--- a/tensorflow_probability/python/internal/distribution_util_test.py
+++ b/tensorflow_probability/python/internal/distribution_util_test.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Tests for distribution_utility functions."""
 
-# Dependency imports
 import numpy as np
 
 import tensorflow.compat.v1 as tf1
diff --git a/tensorflow_probability/python/internal/dtype_util.py b/tensorflow_probability/python/internal/dtype_util.py
index 3fc3f647a0..41c075f741 100644
--- a/tensorflow_probability/python/internal/dtype_util.py
+++ b/tensorflow_probability/python/internal/dtype_util.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Utility functions for dtypes."""
 
-# Dependency imports
 import numpy as np
 
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/dtype_util_test.py b/tensorflow_probability/python/internal/dtype_util_test.py
index 6b0e5a0774..8df2ecfa5c 100644
--- a/tensorflow_probability/python/internal/dtype_util_test.py
+++ b/tensorflow_probability/python/internal/dtype_util_test.py
@@ -16,7 +16,6 @@
 
 import dataclasses
 
-# Dependency imports
 from absl.testing import parameterized
 import numpy as np
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/hypothesis_testlib.py b/tensorflow_probability/python/internal/hypothesis_testlib.py
index 2b67929294..6b167d01b3 100644
--- a/tensorflow_probability/python/internal/hypothesis_testlib.py
+++ b/tensorflow_probability/python/internal/hypothesis_testlib.py
@@ -20,7 +20,6 @@
 import traceback
 import unittest
 
-# Dependency imports
 import hypothesis as hp
 from hypothesis.extra import numpy as hpnp
 import hypothesis.strategies as hps
diff --git a/tensorflow_probability/python/internal/loop_util_test.py b/tensorflow_probability/python/internal/loop_util_test.py
index 41c43aef51..313fab1ba0 100644
--- a/tensorflow_probability/python/internal/loop_util_test.py
+++ b/tensorflow_probability/python/internal/loop_util_test.py
@@ -20,8 +20,6 @@
 
 import collections
 
-# Dependency imports
-
 from absl.testing import parameterized
 import numpy as np
 import tensorflow.compat.v1 as tf1
diff --git a/tensorflow_probability/python/internal/nest_util_test.py b/tensorflow_probability/python/internal/nest_util_test.py
index 28a0a2e7d1..3eb0bbff5b 100644
--- a/tensorflow_probability/python/internal/nest_util_test.py
+++ b/tensorflow_probability/python/internal/nest_util_test.py
@@ -16,8 +16,6 @@
 
 import collections
 
-# Dependency imports
-
 from absl.testing import parameterized
 import numpy as np
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/numerics_testing.py b/tensorflow_probability/python/internal/numerics_testing.py
index 2445fa6d37..bec69b7014 100644
--- a/tensorflow_probability/python/internal/numerics_testing.py
+++ b/tensorflow_probability/python/internal/numerics_testing.py
@@ -16,7 +16,6 @@
 
 import functools
 
-# Dependency imports
 from absl import logging
 import numpy as np
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/numerics_testing_test.py b/tensorflow_probability/python/internal/numerics_testing_test.py
index 1367dec52f..b4cb6e0b08 100644
--- a/tensorflow_probability/python/internal/numerics_testing_test.py
+++ b/tensorflow_probability/python/internal/numerics_testing_test.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Testing the numerics testing utilities."""
 
-# Dependency imports
 import tensorflow.compat.v2 as tf
 from tensorflow_probability.python.internal import numerics_testing as nt
 from tensorflow_probability.python.internal import test_util
diff --git a/tensorflow_probability/python/internal/prefer_static.py b/tensorflow_probability/python/internal/prefer_static.py
index ed65705a2a..f026b1b849 100644
--- a/tensorflow_probability/python/internal/prefer_static.py
+++ b/tensorflow_probability/python/internal/prefer_static.py
@@ -14,7 +14,6 @@
 # ============================================================================
 """Operations that use static values when possible."""
 
-# Dependency imports
 import decorator
 import numpy as np
 
diff --git a/tensorflow_probability/python/internal/samplers.py b/tensorflow_probability/python/internal/samplers.py
index 894291fdc9..a68a7f7a32 100644
--- a/tensorflow_probability/python/internal/samplers.py
+++ b/tensorflow_probability/python/internal/samplers.py
@@ -18,8 +18,6 @@
 import hashlib
 import warnings
 
-# Dependency imports
-
 import numpy as np
 import six
 
diff --git a/tensorflow_probability/python/internal/special_math.py b/tensorflow_probability/python/internal/special_math.py
index 3f5c8a32f5..4e0a483a0f 100644
--- a/tensorflow_probability/python/internal/special_math.py
+++ b/tensorflow_probability/python/internal/special_math.py
@@ -69,7 +69,6 @@
 
 """Special Math Ops."""
 
-# Dependency imports
 import numpy as np
 
 import tensorflow.compat.v2 as tf
diff --git a/tensorflow_probability/python/internal/special_math_test.py b/tensorflow_probability/python/internal/special_math_test.py
index f545585534..6ef830f76a 100644
--- a/tensorflow_probability/python/internal/special_math_test.py
+++ b/tensorflow_probability/python/internal/special_math_test.py
@@ -16,7 +16,6 @@
 
 import collections
 
-# Dependency imports
 import numpy as np
 from scipy import special as sp_special
 from scipy import stats as sp_stats
diff --git a/tensorflow_probability/python/internal/structural_tuple_test.py b/tensorflow_probability/python/internal/structural_tuple_test.py
index 23348c2882..93d6556392 100644
--- a/tensorflow_probability/python/internal/structural_tuple_test.py
+++ b/tensorflow_probability/python/internal/structural_tuple_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for structural_tuple."""
 
-# Dependency imports
-
 import tensorflow.compat.v2 as tf
 
 from tensorflow_probability.python.internal import nest_util
diff --git a/tensorflow_probability/python/internal/tensor_util_test.py b/tensorflow_probability/python/internal/tensor_util_test.py
index 1f5f19fd67..0361d5e9c6 100644
--- a/tensorflow_probability/python/internal/tensor_util_test.py
+++ b/tensorflow_probability/python/internal/tensor_util_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for tensor_util."""
 
-# Dependency imports
-
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/internal/tensorshape_util_test.py b/tensorflow_probability/python/internal/tensorshape_util_test.py
index e381bca15d..5cb9a4072d 100644
--- a/tensorflow_probability/python/internal/tensorshape_util_test.py
+++ b/tensorflow_probability/python/internal/tensorshape_util_test.py
@@ -14,8 +14,6 @@
 # ============================================================================
 """Tests for tensorshape_util."""
 
-# Dependency imports
-
 import numpy as np
 import tensorflow.compat.v2 as tf
 
diff --git a/tensorflow_probability/python/internal/test_combinations.py b/tensorflow_probability/python/internal/test_combinations.py
index 6873d2a009..ed91ad42a3 100644
--- a/tensorflow_probability/python/internal/test_combinations.py
+++ b/tensorflow_probability/python/internal/test_combinations.py
@@ -47,7 +47,6 @@ def testOptimizer(self, optimizer):
 import types
 import unittest
 
-# Dependency imports
 from absl.testing import parameterized
 import six
 
diff --git a/tensorflow_probability/python/internal/test_combinations_test.py b/tensorflow_probability/python/internal/test_combinations_test.py
index 7903e7a52c..4dd1c6bcf0 100644
--- a/tensorflow_probability/python/internal/test_combinations_test.py
+++ b/tensorflow_probability/python/internal/test_combinations_test.py
@@ -16,7 +16,6 @@
 
 from collections import OrderedDict
 
-# Dependency imports
 from tensorflow_probability.python.internal import test_combinations
 from tensorflow_probability.python.internal import test_util
 
diff --git a/tensorflow_probability/python/internal/test_util_test.py b/tensorflow_probability/python/internal/test_util_test.py
index 4c2511d9ab..7be0572b84 100644
--- a/tensorflow_probability/python/internal/test_util_test.py
+++ b/tensorflow_probability/python/internal/test_util_test.py
@@ -16,7 +16,6 @@
 
 import collections
 
-# Dependency imports
 from absl import flags
 from absl.testing import flagsaver
 from absl.testing import parameterized