diff --git a/pkg/BUILD b/pkg/BUILD
index 11d20c8cc2b..1f9e10e8879 100644
--- a/pkg/BUILD
+++ b/pkg/BUILD
@@ -79,7 +79,6 @@ filegroup(
         "//pkg/client/unversioned:all-srcs",
         "//pkg/cloudprovider:all-srcs",
         "//pkg/controller:all-srcs",
-        "//pkg/conversion:all-srcs",
         "//pkg/credentialprovider:all-srcs",
         "//pkg/fieldpath:all-srcs",
         "//pkg/fields:all-srcs",
diff --git a/pkg/conversion/BUILD b/pkg/conversion/BUILD
deleted file mode 100644
index 9f371d60332..00000000000
--- a/pkg/conversion/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["doc.go"],
-    tags = ["automanaged"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//pkg/conversion/queryparams:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/pkg/conversion/doc.go b/pkg/conversion/doc.go
deleted file mode 100644
index 68f6e8dcc5b..00000000000
--- a/pkg/conversion/doc.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package conversion only exists until heapster rebases
-// TODO genericapiserver remove this empty package.  Godep fails without this because heapster relies
-// on this package.  This will allow us to start splitting packages, but will force
-// heapster to update on their next kube rebase.
-package conversion
diff --git a/pkg/conversion/queryparams/BUILD b/pkg/conversion/queryparams/BUILD
deleted file mode 100644
index deefdcef3c1..00000000000
--- a/pkg/conversion/queryparams/BUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["doc.go"],
-    tags = ["automanaged"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/conversion/queryparams/OWNERS b/pkg/conversion/queryparams/OWNERS
deleted file mode 100755
index 31b24b48a0d..00000000000
--- a/pkg/conversion/queryparams/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-reviewers:
-- smarterclayton
-- wojtek-t
-- caesarxuchao
-- mikedanese
-- liggitt
-- kargakis
-- dims
diff --git a/pkg/conversion/queryparams/doc.go b/pkg/conversion/queryparams/doc.go
deleted file mode 100644
index fa1d5e1bc7e..00000000000
--- a/pkg/conversion/queryparams/doc.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package queryparams only exists until heapster rebases
-// TODO genericapiserver remove this empty package.  Godep fails without this because heapster relies
-// on this package.  This will allow us to start splitting packages, but will force
-// heapster to update on their next kube rebase.
-package queryparams