diff --git a/pkg/kubeapiserver/BUILD b/pkg/kubeapiserver/BUILD
index 4a9c0ea5026..77abfbf0abd 100644
--- a/pkg/kubeapiserver/BUILD
+++ b/pkg/kubeapiserver/BUILD
@@ -47,7 +47,6 @@ filegroup(
         "//pkg/kubeapiserver/authenticator:all-srcs",
         "//pkg/kubeapiserver/authorizer:all-srcs",
         "//pkg/kubeapiserver/options:all-srcs",
-        "//pkg/kubeapiserver/server:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/pkg/kubeapiserver/options/serving.go b/pkg/kubeapiserver/options/serving.go
index c659fc8cd6d..09d14703711 100644
--- a/pkg/kubeapiserver/options/serving.go
+++ b/pkg/kubeapiserver/options/serving.go
@@ -18,10 +18,8 @@ limitations under the License.
 package options
 
 import (
-	"fmt"
 	"net"
 
-	utilnet "k8s.io/apimachinery/pkg/util/net"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 )
 
@@ -39,34 +37,3 @@ func NewSecureServingOptions() *genericoptions.SecureServingOptionsWithLoopback
 	}
 	return o.WithLoopback()
 }
-
-// NewInsecureServingOptions gives default values for the kube-apiserver.
-// TODO: switch insecure serving off by default
-func NewInsecureServingOptions() *genericoptions.DeprecatedInsecureServingOptionsWithLoopback {
-	o := genericoptions.DeprecatedInsecureServingOptions{
-		BindAddress: net.ParseIP("127.0.0.1"),
-		BindPort:    8080,
-	}
-	return o.WithLoopback()
-}
-
-// DefaultAdvertiseAddress sets the field AdvertiseAddress if
-// unset. The field will be set based on the SecureServingOptions. If
-// the SecureServingOptions is not present, DefaultExternalAddress
-// will fall back to the insecure ServingOptions.
-func DefaultAdvertiseAddress(s *genericoptions.ServerRunOptions, insecure *genericoptions.DeprecatedInsecureServingOptions) error {
-	if insecure == nil {
-		return nil
-	}
-
-	if s.AdvertiseAddress == nil || s.AdvertiseAddress.IsUnspecified() {
-		hostIP, err := utilnet.ResolveBindAddress(insecure.BindAddress)
-		if err != nil {
-			return fmt.Errorf("unable to find suitable network address.error='%v'. "+
-				"Try to set the AdvertiseAddress directly or provide a valid BindAddress to fix this", err)
-		}
-		s.AdvertiseAddress = hostIP
-	}
-
-	return nil
-}
diff --git a/pkg/kubeapiserver/server/BUILD b/pkg/kubeapiserver/server/BUILD
deleted file mode 100644
index 65a86fb8439..00000000000
--- a/pkg/kubeapiserver/server/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["insecure_handler.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubeapiserver/server",
-    deps = [
-        "//staging/src/k8s.io/apiserver/pkg/endpoints/filters:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/server/filters:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/kubeapiserver/server/insecure_handler.go b/pkg/kubeapiserver/server/insecure_handler.go
deleted file mode 100644
index 6a4aeafb0d2..00000000000
--- a/pkg/kubeapiserver/server/insecure_handler.go
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2016 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 server
-
-import (
-	"net/http"
-
-	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
-	"k8s.io/apiserver/pkg/server"
-	genericfilters "k8s.io/apiserver/pkg/server/filters"
-)
-
-// BuildInsecureHandlerChain sets up the server to listen to http. Should be removed.
-func BuildInsecureHandlerChain(apiHandler http.Handler, c *server.Config) http.Handler {
-	requestInfoResolver := server.NewRequestInfoResolver(c)
-	handler := apiHandler
-	// Temporarily disable APIPriorityAndFairness during development
-	// so that /debug/pprof works even while this feature is totally
-	// hosed
-	if c.FlowControl != nil && false {
-		handler = genericfilters.WithPriorityAndFairness(handler, c.LongRunningFunc, c.FlowControl)
-	} else {
-		handler = genericfilters.WithMaxInFlightLimit(handler, c.MaxRequestsInFlight, c.MaxMutatingRequestsInFlight, c.LongRunningFunc)
-	}
-	handler = genericapifilters.WithAudit(handler, c.AuditBackend, c.AuditPolicyChecker, c.LongRunningFunc)
-	handler = genericapifilters.WithAuthentication(handler, server.InsecureSuperuser{}, nil, nil)
-	handler = genericfilters.WithCORS(handler, c.CorsAllowedOriginList, nil, nil, nil, "true")
-	handler = genericfilters.WithTimeoutForNonLongRunningRequests(handler, c.LongRunningFunc, c.RequestTimeout)
-	handler = genericfilters.WithWaitGroup(handler, c.LongRunningFunc, c.HandlerChainWaitGroup)
-	handler = genericapifilters.WithRequestInfo(handler, requestInfoResolver)
-	handler = genericapifilters.WithWarningRecorder(handler)
-	handler = genericapifilters.WithCacheControl(handler)
-	handler = genericfilters.WithPanicRecovery(handler, requestInfoResolver)
-
-	return handler
-}