diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 83edfd706e1..68b1ba2de1d 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -105,48 +105,15 @@ COMMON_PIP_DEPS = [
     "//tensorflow/tools/docs:py_guide_parser",
 ]
 
-COMMON_PIP_DEPS_V1 = COMMON_PIP_DEPS + [
-    "//tensorflow/contrib/autograph:autograph",
-    "//tensorflow/contrib/boosted_trees:boosted_trees_pip",
-    "//tensorflow/contrib/cluster_resolver:cluster_resolver_pip",
-    "//tensorflow/contrib/compiler:xla",
-    "//tensorflow/contrib/constrained_optimization:constrained_optimization_pip",
-    "//tensorflow/contrib/distribute/python:distribute_test_lib_pip",
-    "//tensorflow/contrib/eager/python/examples:examples_pip",
-    "//tensorflow/contrib/eager/python:evaluator",
-    "//tensorflow/contrib/graph_editor:graph_editor_pip",
-    "//tensorflow/contrib/keras:keras",
-    "//tensorflow/contrib/labeled_tensor:labeled_tensor_pip",
-    "//tensorflow/contrib/nn:nn_py",
-    "//tensorflow/contrib/predictor:predictor_pip",
-    "//tensorflow/contrib/proto:proto",
-    "//tensorflow/contrib/receptive_field:receptive_field_pip",
-    "//tensorflow/contrib/rate:rate",
-    "//tensorflow/contrib/rpc:rpc_pip",
-    "//tensorflow/contrib/session_bundle:session_bundle_pip",
-    "//tensorflow/contrib/signal:signal_py",
-    "//tensorflow/contrib/slim:slim",
-    "//tensorflow/contrib/slim/python/slim/data:data_pip",
-    "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
-    "//tensorflow/contrib/specs:specs",
-    "//tensorflow/contrib/summary:summary_test_util",
-    "//tensorflow/contrib/tensor_forest:init_py",
-    "//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
-    "//tensorflow/contrib/timeseries:timeseries_pip",
-    "//tensorflow/contrib/tpu",
-    "//tensorflow/examples/tutorials/mnist:package",
-]
-
 # On Windows, python binary is a zip file of runfiles tree.
 # Add everything to its data dependency for generating a runfiles tree
 # for building the pip package on Windows.
 py_binary(
     name = "simple_console_for_windows",
     srcs = ["simple_console_for_windows.py"],
-    data = select({
-        "//conditions:default": COMMON_PIP_DEPS_V1,
-        "//tensorflow:api_version_2": COMMON_PIP_DEPS,
-    }) + ["//tensorflow/python:pywrap_tensorflow_import_lib_file"],
+    data = COMMON_PIP_DEPS + [
+        "//tensorflow/python:pywrap_tensorflow_import_lib_file",
+    ],
     srcs_version = "PY2AND3",
     deps = ["//tensorflow:tensorflow_py"],
 )
@@ -264,10 +231,7 @@ filegroup(
 sh_binary(
     name = "build_pip_package",
     srcs = ["build_pip_package.sh"],
-    data = select({
-               "//tensorflow:api_version_2": COMMON_PIP_DEPS,
-               "//conditions:default": COMMON_PIP_DEPS_V1,
-           }) +
+    data = COMMON_PIP_DEPS +
            select({
                "//tensorflow:windows": [
                    ":simple_console_for_windows",
diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 9adbb36a74a..7e3643f65b7 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -52,16 +52,10 @@ def GetBuild(dir_base):
 
 def BuildPyTestDependencies():
   python_targets = GetBuild("tensorflow/python")
-  contrib_targets = GetBuild("tensorflow/contrib")
-  tensorboard_targets = GetBuild("tensorflow/contrib/tensorboard")
   tensorflow_targets = GetBuild("tensorflow")
   # Build list of test targets,
-  # python + contrib - tensorboard - attr(manual|pno_pip)
+  # python - attr(manual|pno_pip)
   targets = " + ".join(python_targets)
-  for t in contrib_targets:
-    targets += " + " + t
-  for t in tensorboard_targets:
-    targets += " - " + t
   targets += ' - attr(tags, "manual|no_pip", %s)' % " + ".join(
       tensorflow_targets)
   query_kind = "kind(py_test, %s)" % targets
@@ -101,27 +95,6 @@ DEPENDENCY_BLACKLIST = [
     "//tensorflow/lite/python:interpreter_test",
     "//tensorflow/lite/python:interpreter.py",
     "//tensorflow/lite/python:interpreter_test.py",
-    # contrib
-    "//tensorflow/contrib/eager/python/examples/revnet:blocks_test_main_lib",
-    "//tensorflow/contrib/session_bundle:session_bundle_half_plus_two",
-    "//tensorflow/contrib/keras:testing_utils",
-    "//tensorflow/contrib/ffmpeg:test_data",
-    "//tensorflow/contrib/fused_conv:fused_conv2d_bias_activation_op_test_base",
-    "//tensorflow/contrib/hadoop:test_data",
-    "//tensorflow/contrib/factorization/examples:mnist",
-    "//tensorflow/contrib/factorization/examples:mnist.py",
-    "//tensorflow/contrib/factorization:factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",  # pylint:disable=line-too-long
-    "//tensorflow/contrib/framework:checkpoint_ops_testdata",
-    "//tensorflow/contrib/bayesflow:reinforce_simple_example",
-    "//tensorflow/contrib/bayesflow:examples/reinforce_simple/reinforce_simple_example.py",  # pylint:disable=line-too-long
-    "//tensorflow/contrib/saved_model:reader",  # Not present in v2
-    "//tensorflow/contrib/timeseries/examples:predict",
-    "//tensorflow/contrib/timeseries/examples:multivariate",
-    "//tensorflow/contrib/timeseries/examples:known_anomaly",
-    "//tensorflow/contrib/timeseries/examples:data/period_trend.csv",  # pylint:disable=line-too-long
-    "//tensorflow/contrib/timeseries/python/timeseries:test_utils",
-    "//tensorflow/contrib/timeseries/python/timeseries/state_space_models:test_utils",  # pylint:disable=line-too-long
-    "//tensorflow/contrib/image:sparse_image_warp_test_data",
 ]