diff --git a/_proto/Makefile b/_proto/Makefile
index ce624619d..39f72d441 100644
--- a/_proto/Makefile
+++ b/_proto/Makefile
@@ -8,13 +8,13 @@ dst 	= ../pkg/proto
 target  = go
 plugins = grpc
 
-chart_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(chart_pkg),$(addprefix M,$(chart_pbs))))
-chart_pbs = $(sort $(wildcard hapi/chart/*.proto))
-chart_pkg = chart
+chart_ias    = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(chart_pkg),$(addprefix M,$(chart_pbs))))
+chart_pbs    = $(sort $(wildcard hapi/chart/*.proto))
+chart_pkg    = chart
 
-release_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(release_pkg),$(addprefix M,$(release_pbs))))
-release_pbs = $(sort $(wildcard hapi/release/*.proto))
-release_pkg = release
+release_ias  = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(release_pkg),$(addprefix M,$(release_pbs))))
+release_pbs  = $(sort $(wildcard hapi/release/*.proto))
+release_pkg  = release
 
 services_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(services_pkg),$(addprefix M,$(services_pbs))))
 services_pbs = $(sort $(wildcard hapi/services/*.proto))
@@ -24,18 +24,14 @@ rudder_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(rudder_pkg)
 rudder_pbs = $(sort $(wildcard hapi/rudder/*.proto))
 rudder_pkg = rudder
 
-version_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(version_pkg),$(addprefix M,$(version_pbs))))
-version_pbs = $(sort $(wildcard hapi/version/*.proto))
-version_pkg = version
-
-kube_ias = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(kube_pkg),$(addprefix M,$(kube_pbs))))
-kube_pbs = $(sort $(wildcard hapi/kube/*.proto))
-kube_pkg = kube
+version_ias    = $(subst $(space),$(comma),$(addsuffix =$(import_path)/$(version_pkg),$(addprefix M,$(version_pbs))))
+version_pbs    = $(sort $(wildcard hapi/version/*.proto))
+version_pkg    = version
 
 google_deps	 = Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any
 
 .PHONY: all
-all: chart release services rudder version kube
+all: chart release services rudder version
 
 .PHONY: chart
 chart:
@@ -57,10 +53,6 @@ rudder:
 version:
 	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps):$(dst) $(version_pbs)
 
-.PHONY: kube
-kube:
-	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps):$(dst) $(kube_pbs)
-
 .PHONY: clean
 clean:
 	@rm -rf $(dst)/hapi 2>/dev/null
diff --git a/_proto/hapi/kube/info.proto b/_proto/hapi/kube/info.proto
deleted file mode 100644
index 9ecb757e7..000000000
--- a/_proto/hapi/kube/info.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Kubernetes Authors All rights reserved.
-//
-// 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.
-
-syntax = "proto3";
-
-package hapi.kube;
-
-import "hapi/kube/version.proto";
-
-option go_package = "kube";
-
-message Info {
-    hapi.kube.Version Version = 1;
-}
diff --git a/_proto/hapi/kube/version.proto b/_proto/hapi/kube/version.proto
deleted file mode 100644
index 8ada2d3fb..000000000
--- a/_proto/hapi/kube/version.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 The Kubernetes Authors All rights reserved.
-//
-// 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.
-
-syntax = "proto3";
-
-package hapi.kube;
-
-option go_package = "kube";
-
-message Version {
-	string major = 1;
-	string minor = 2;
-	string git_version = 3;
-	string git_commit = 4;
-	string git_tree_state = 5;
-	string build_date = 6;
-	string go_version = 7;
-	string compiler = 8;
-	string platform = 9;
-}
diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 405384d5a..1fb6a86e9 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -23,7 +23,6 @@ import "hapi/release/info.proto";
 import "hapi/release/test_run.proto";
 import "hapi/release/status.proto";
 import "hapi/version/version.proto";
-import "hapi/kube/info.proto";
 
 option go_package = "services";
 
@@ -86,11 +85,6 @@ service ReleaseService {
     }
 }
 
-service InfoService {
-	rpc GetKubeInfo(GetKubeInfoRequest) returns (GetKubeInfoResponse) {
-	}
-}
-
 // ListReleasesRequest requests a list of releases.
 //
 // Releases can be retrieved in chunks by setting limit and offset.
@@ -339,11 +333,5 @@ message TestReleaseRequest {
 message TestReleaseResponse {
 	string msg = 1;
 	hapi.release.TestRun.Status status = 2;
-}
-
-message GetKubeInfoRequest {
-}
 
-message GetKubeInfoResponse {
-	hapi.kube.Info Info = 1;
 }
diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index 425ebdccf..64c66b348 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -71,9 +71,9 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
 			if !version.showClient && !version.showServer {
 				version.showClient, version.showServer = true, true
 			}
-			if version.showServer || settings.Debug {
+			if version.showServer {
 				// We do this manually instead of in PreRun because we only
-				// need a tunnel if server version or debug is requested.
+				// need a tunnel if server version is requested.
 				setupConnection(cmd, args)
 			}
 			version.client = ensureHelmClient(version.client)
@@ -89,17 +89,6 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
 }
 
 func (v *versionCmd) run() error {
-	if settings.Debug {
-		resp, err := v.client.GetKubeInfo()
-		if err != nil {
-			if grpc.Code(err) == codes.Unimplemented {
-				return errors.New("server is too old to know kubernetes info")
-			}
-			debug("%s", err)
-			return errors.New("cannot connect to Tiller")
-		}
-		debug("Kubernetes: %+v\n", resp.Info)
-	}
 
 	if v.showClient {
 		cv := version.GetVersionProto()
diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 45b09b823..2a4cf066e 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -171,14 +171,6 @@ func start() {
 		}
 	}()
 
-	go func() {
-		svc := tiller.NewInfoServer(env, clientset)
-		services.RegisterInfoServiceServer(rootServer, svc)
-		if err := rootServer.Serve(lstn); err != nil {
-			srvErrCh <- err
-		}
-	}()
-
 	go func() {
 		mux := newProbesMux()
 
diff --git a/pkg/helm/client.go b/pkg/helm/client.go
index 25381161a..dbaf01d96 100644
--- a/pkg/helm/client.go
+++ b/pkg/helm/client.go
@@ -197,19 +197,6 @@ func (h *Client) GetVersion(opts ...VersionOption) (*rls.GetVersionResponse, err
 	return h.version(ctx, req)
 }
 
-// GetKubeInfo returns the kubernetes server information.
-func (h *Client) GetKubeInfo() (*rls.GetKubeInfoResponse, error) {
-	req := &rls.GetKubeInfoRequest{}
-	ctx := NewContext()
-
-	if h.opts.before != nil {
-		if err := h.opts.before(ctx, req); err != nil {
-			return nil, err
-		}
-	}
-	return h.kubeInfo(ctx, req)
-}
-
 // RollbackRelease rolls back a release to the previous version.
 func (h *Client) RollbackRelease(rlsName string, opts ...RollbackOption) (*rls.RollbackReleaseResponse, error) {
 	for _, opt := range opts {
@@ -416,17 +403,6 @@ func (h *Client) version(ctx context.Context, req *rls.GetVersionRequest) (*rls.
 	return rlc.GetVersion(ctx, req)
 }
 
-func (h *Client) kubeInfo(ctx context.Context, req *rls.GetKubeInfoRequest) (*rls.GetKubeInfoResponse, error) {
-	c, err := h.connect(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer c.Close()
-
-	rlc := rls.NewInfoServiceClient(c)
-	return rlc.GetKubeInfo(ctx, req)
-}
-
 // Executes tiller.GetHistory RPC.
 func (h *Client) history(ctx context.Context, req *rls.GetHistoryRequest) (*rls.GetHistoryResponse, error) {
 	c, err := h.connect(ctx)
diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index e24d02d42..c66777673 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -21,7 +21,6 @@ import (
 	"sync"
 
 	"k8s.io/helm/pkg/proto/hapi/chart"
-	"k8s.io/helm/pkg/proto/hapi/kube"
 	"k8s.io/helm/pkg/proto/hapi/release"
 	rls "k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/proto/hapi/version"
@@ -79,25 +78,6 @@ func (c *FakeClient) GetVersion(opts ...VersionOption) (*rls.GetVersionResponse,
 	}, nil
 }
 
-// GetKubeInfo returns fake kubernetes server information
-func (c *FakeClient) GetKubeInfo() (*rls.GetKubeInfoResponse, error) {
-	return &rls.GetKubeInfoResponse{
-		Info: &kube.Info{
-			Version: &kube.Version{
-				Major:        "0",
-				Minor:        "1",
-				GitVersion:   "2",
-				GitCommit:    "3",
-				GitTreeState: "4",
-				BuildDate:    "5",
-				GoVersion:    "6",
-				Compiler:     "7",
-				Platform:     "8",
-			},
-		},
-	}, nil
-}
-
 // UpdateReleaseFromChart returns nil, nil
 func (c *FakeClient) UpdateReleaseFromChart(rlsName string, chart *chart.Chart, opts ...UpdateOption) (*rls.UpdateReleaseResponse, error) {
 	return nil, nil
diff --git a/pkg/helm/interface.go b/pkg/helm/interface.go
index 636d622d6..bff110b34 100644
--- a/pkg/helm/interface.go
+++ b/pkg/helm/interface.go
@@ -34,6 +34,5 @@ type Interface interface {
 	ReleaseContent(rlsName string, opts ...ContentOption) (*rls.GetReleaseContentResponse, error)
 	ReleaseHistory(rlsName string, opts ...HistoryOption) (*rls.GetHistoryResponse, error)
 	GetVersion(opts ...VersionOption) (*rls.GetVersionResponse, error)
-	GetKubeInfo() (*rls.GetKubeInfoResponse, error)
 	RunReleaseTest(rlsName string, opts ...ReleaseTestOption) (<-chan *rls.TestReleaseResponse, <-chan error)
 }
diff --git a/pkg/proto/hapi/chart/chart.pb.go b/pkg/proto/hapi/chart/chart.pb.go
index dbb188e91..a884ed552 100644
--- a/pkg/proto/hapi/chart/chart.pb.go
+++ b/pkg/proto/hapi/chart/chart.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/chart.proto
-// DO NOT EDIT!
 
 /*
 Package chart is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/chart/config.pb.go b/pkg/proto/hapi/chart/config.pb.go
index 4a8b36d89..30c652700 100644
--- a/pkg/proto/hapi/chart/config.pb.go
+++ b/pkg/proto/hapi/chart/config.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/config.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go
index 0574e6df9..af9f58153 100644
--- a/pkg/proto/hapi/chart/metadata.pb.go
+++ b/pkg/proto/hapi/chart/metadata.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/metadata.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/chart/template.pb.go b/pkg/proto/hapi/chart/template.pb.go
index 416269d18..439aec5a8 100644
--- a/pkg/proto/hapi/chart/template.pb.go
+++ b/pkg/proto/hapi/chart/template.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/template.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/kube/info.pb.go b/pkg/proto/hapi/kube/info.pb.go
deleted file mode 100644
index 58b075336..000000000
--- a/pkg/proto/hapi/kube/info.pb.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: hapi/kube/info.proto
-// DO NOT EDIT!
-
-/*
-Package kube is a generated protocol buffer package.
-
-It is generated from these files:
-	hapi/kube/info.proto
-	hapi/kube/version.proto
-
-It has these top-level messages:
-	Info
-	Version
-*/
-package kube
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type Info struct {
-	Version *Version `protobuf:"bytes,1,opt,name=Version" json:"Version,omitempty"`
-}
-
-func (m *Info) Reset()                    { *m = Info{} }
-func (m *Info) String() string            { return proto.CompactTextString(m) }
-func (*Info) ProtoMessage()               {}
-func (*Info) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Info) GetVersion() *Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Info)(nil), "hapi.kube.Info")
-}
-
-func init() { proto.RegisterFile("hapi/kube/info.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 109 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0x48, 0x2c, 0xc8,
-	0xd4, 0xcf, 0x2e, 0x4d, 0x4a, 0xd5, 0xcf, 0xcc, 0x4b, 0xcb, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
-	0x17, 0xe2, 0x04, 0x89, 0xea, 0x81, 0x44, 0xa5, 0xc4, 0x11, 0x0a, 0xca, 0x52, 0x8b, 0x8a, 0x33,
-	0xf3, 0xf3, 0x20, 0x6a, 0x94, 0x4c, 0xb8, 0x58, 0x3c, 0xf3, 0xd2, 0xf2, 0x85, 0x74, 0xb8, 0xd8,
-	0xc3, 0x20, 0x12, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x42, 0x7a, 0x70, 0xdd, 0x7a, 0x50,
-	0x99, 0x20, 0x98, 0x12, 0x27, 0xb6, 0x28, 0x16, 0x90, 0x44, 0x12, 0x1b, 0xd8, 0x10, 0x63, 0x40,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x44, 0x5d, 0xcd, 0x80, 0x00, 0x00, 0x00,
-}
diff --git a/pkg/proto/hapi/kube/version.pb.go b/pkg/proto/hapi/kube/version.pb.go
deleted file mode 100644
index 6c68b2d95..000000000
--- a/pkg/proto/hapi/kube/version.pb.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: hapi/kube/version.proto
-// DO NOT EDIT!
-
-package kube
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Version struct {
-	Major        string `protobuf:"bytes,1,opt,name=major" json:"major,omitempty"`
-	Minor        string `protobuf:"bytes,2,opt,name=minor" json:"minor,omitempty"`
-	GitVersion   string `protobuf:"bytes,3,opt,name=git_version,json=gitVersion" json:"git_version,omitempty"`
-	GitCommit    string `protobuf:"bytes,4,opt,name=git_commit,json=gitCommit" json:"git_commit,omitempty"`
-	GitTreeState string `protobuf:"bytes,5,opt,name=git_tree_state,json=gitTreeState" json:"git_tree_state,omitempty"`
-	BuildDate    string `protobuf:"bytes,6,opt,name=build_date,json=buildDate" json:"build_date,omitempty"`
-	GoVersion    string `protobuf:"bytes,7,opt,name=go_version,json=goVersion" json:"go_version,omitempty"`
-	Compiler     string `protobuf:"bytes,8,opt,name=compiler" json:"compiler,omitempty"`
-	Platform     string `protobuf:"bytes,9,opt,name=platform" json:"platform,omitempty"`
-}
-
-func (m *Version) Reset()                    { *m = Version{} }
-func (m *Version) String() string            { return proto.CompactTextString(m) }
-func (*Version) ProtoMessage()               {}
-func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Version) GetMajor() string {
-	if m != nil {
-		return m.Major
-	}
-	return ""
-}
-
-func (m *Version) GetMinor() string {
-	if m != nil {
-		return m.Minor
-	}
-	return ""
-}
-
-func (m *Version) GetGitVersion() string {
-	if m != nil {
-		return m.GitVersion
-	}
-	return ""
-}
-
-func (m *Version) GetGitCommit() string {
-	if m != nil {
-		return m.GitCommit
-	}
-	return ""
-}
-
-func (m *Version) GetGitTreeState() string {
-	if m != nil {
-		return m.GitTreeState
-	}
-	return ""
-}
-
-func (m *Version) GetBuildDate() string {
-	if m != nil {
-		return m.BuildDate
-	}
-	return ""
-}
-
-func (m *Version) GetGoVersion() string {
-	if m != nil {
-		return m.GoVersion
-	}
-	return ""
-}
-
-func (m *Version) GetCompiler() string {
-	if m != nil {
-		return m.Compiler
-	}
-	return ""
-}
-
-func (m *Version) GetPlatform() string {
-	if m != nil {
-		return m.Platform
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Version)(nil), "hapi.kube.Version")
-}
-
-func init() { proto.RegisterFile("hapi/kube/version.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 229 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x90, 0xcd, 0x4a, 0x03, 0x51,
-	0x0c, 0x85, 0x69, 0x6d, 0xa7, 0x9d, 0x28, 0x2e, 0x06, 0xc1, 0x8b, 0x20, 0x8a, 0xb8, 0x70, 0xd5,
-	0x2e, 0x7c, 0x03, 0xf5, 0x09, 0x54, 0x5c, 0xb8, 0x19, 0x66, 0xda, 0x78, 0x8d, 0xce, 0x6d, 0x86,
-	0x34, 0xf5, 0x3d, 0x7c, 0xe3, 0x92, 0xcc, 0xcf, 0xf2, 0x7c, 0x5f, 0x38, 0x09, 0x81, 0xcb, 0xef,
-	0xaa, 0xa5, 0xf5, 0xef, 0xa1, 0xc6, 0xf5, 0x1f, 0xca, 0x9e, 0x78, 0xb7, 0x6a, 0x85, 0x95, 0x8b,
-	0xdc, 0xc4, 0xca, 0xc4, 0xdd, 0xff, 0x14, 0x16, 0x1f, 0x9d, 0x2c, 0x2e, 0x60, 0x9e, 0xaa, 0x1f,
-	0x96, 0x30, 0xb9, 0x9d, 0x3c, 0xe4, 0xaf, 0x5d, 0x70, 0x4a, 0x3b, 0x96, 0x30, 0xed, 0xa9, 0x85,
-	0xe2, 0x06, 0x4e, 0x23, 0x69, 0xd9, 0xf7, 0x86, 0x13, 0x77, 0x10, 0x49, 0x87, 0xb2, 0x6b, 0xb0,
-	0x54, 0x6e, 0x38, 0x25, 0xd2, 0x30, 0x73, 0x9f, 0x47, 0xd2, 0x67, 0x07, 0xc5, 0x3d, 0x9c, 0x9b,
-	0x56, 0x41, 0x2c, 0xf7, 0x5a, 0x29, 0x86, 0xb9, 0x8f, 0x9c, 0x45, 0xd2, 0x77, 0x41, 0x7c, 0x33,
-	0x66, 0x25, 0xf5, 0x81, 0x9a, 0x6d, 0xb9, 0xb5, 0x89, 0xac, 0x2b, 0x71, 0xf2, 0xd2, 0xeb, 0xc8,
-	0xe3, 0x0d, 0x8b, 0x7e, 0x07, 0x0f, 0x27, 0x5c, 0xc1, 0x72, 0xc3, 0xa9, 0xa5, 0x06, 0x25, 0x2c,
-	0x5d, 0x8e, 0xd9, 0x5c, 0xdb, 0x54, 0xfa, 0xc5, 0x92, 0x42, 0xde, 0xb9, 0x21, 0x3f, 0x65, 0x9f,
-	0x33, 0xfb, 0x4d, 0x9d, 0xf9, 0xb7, 0x1e, 0x8f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x4d, 0x8a,
-	0x4f, 0x48, 0x01, 0x00, 0x00,
-}
diff --git a/pkg/proto/hapi/release/hook.pb.go b/pkg/proto/hapi/release/hook.pb.go
index 5a53080be..bd9391c50 100644
--- a/pkg/proto/hapi/release/hook.pb.go
+++ b/pkg/proto/hapi/release/hook.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/hook.proto
-// DO NOT EDIT!
 
 /*
 Package release is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/release/info.pb.go b/pkg/proto/hapi/release/info.pb.go
index 9485ad058..7a7ccdd74 100644
--- a/pkg/proto/hapi/release/info.pb.go
+++ b/pkg/proto/hapi/release/info.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/info.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go
index 47b321b50..511b543d7 100644
--- a/pkg/proto/hapi/release/release.pb.go
+++ b/pkg/proto/hapi/release/release.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/release.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/status.pb.go b/pkg/proto/hapi/release/status.pb.go
index ea7008d8c..284892642 100644
--- a/pkg/proto/hapi/release/status.pb.go
+++ b/pkg/proto/hapi/release/status.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/status.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/test_run.pb.go b/pkg/proto/hapi/release/test_run.pb.go
index bd3c0ab2b..4d39d17c2 100644
--- a/pkg/proto/hapi/release/test_run.pb.go
+++ b/pkg/proto/hapi/release/test_run.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/test_run.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/test_suite.pb.go b/pkg/proto/hapi/release/test_suite.pb.go
index f168bf1d2..b7fa26147 100644
--- a/pkg/proto/hapi/release/test_suite.pb.go
+++ b/pkg/proto/hapi/release/test_suite.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/test_suite.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/rudder/rudder.pb.go b/pkg/proto/hapi/rudder/rudder.pb.go
index 3f64ba713..6e26d71eb 100644
--- a/pkg/proto/hapi/rudder/rudder.pb.go
+++ b/pkg/proto/hapi/rudder/rudder.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/rudder/rudder.proto
-// DO NOT EDIT!
 
 /*
 Package rudder is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go
index c0f86975b..023749c4f 100644
--- a/pkg/proto/hapi/services/tiller.pb.go
+++ b/pkg/proto/hapi/services/tiller.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/services/tiller.proto
-// DO NOT EDIT!
 
 /*
 Package services is a generated protocol buffer package.
@@ -30,8 +29,6 @@ It has these top-level messages:
 	GetHistoryResponse
 	TestReleaseRequest
 	TestReleaseResponse
-	GetKubeInfoRequest
-	GetKubeInfoResponse
 */
 package services
 
@@ -45,7 +42,6 @@ import hapi_release4 "k8s.io/helm/pkg/proto/hapi/release"
 import hapi_release1 "k8s.io/helm/pkg/proto/hapi/release"
 import hapi_release3 "k8s.io/helm/pkg/proto/hapi/release"
 import hapi_version "k8s.io/helm/pkg/proto/hapi/version"
-import hapi_kube1 "k8s.io/helm/pkg/proto/hapi/kube"
 
 import (
 	context "golang.org/x/net/context"
@@ -893,30 +889,6 @@ func (m *TestReleaseResponse) GetStatus() hapi_release1.TestRun_Status {
 	return hapi_release1.TestRun_UNKNOWN
 }
 
-type GetKubeInfoRequest struct {
-}
-
-func (m *GetKubeInfoRequest) Reset()                    { *m = GetKubeInfoRequest{} }
-func (m *GetKubeInfoRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetKubeInfoRequest) ProtoMessage()               {}
-func (*GetKubeInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-type GetKubeInfoResponse struct {
-	Info *hapi_kube1.Info `protobuf:"bytes,1,opt,name=Info" json:"Info,omitempty"`
-}
-
-func (m *GetKubeInfoResponse) Reset()                    { *m = GetKubeInfoResponse{} }
-func (m *GetKubeInfoResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetKubeInfoResponse) ProtoMessage()               {}
-func (*GetKubeInfoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
-
-func (m *GetKubeInfoResponse) GetInfo() *hapi_kube1.Info {
-	if m != nil {
-		return m.Info
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*ListReleasesRequest)(nil), "hapi.services.tiller.ListReleasesRequest")
 	proto.RegisterType((*ListSort)(nil), "hapi.services.tiller.ListSort")
@@ -939,8 +911,6 @@ func init() {
 	proto.RegisterType((*GetHistoryResponse)(nil), "hapi.services.tiller.GetHistoryResponse")
 	proto.RegisterType((*TestReleaseRequest)(nil), "hapi.services.tiller.TestReleaseRequest")
 	proto.RegisterType((*TestReleaseResponse)(nil), "hapi.services.tiller.TestReleaseResponse")
-	proto.RegisterType((*GetKubeInfoRequest)(nil), "hapi.services.tiller.GetKubeInfoRequest")
-	proto.RegisterType((*GetKubeInfoResponse)(nil), "hapi.services.tiller.GetKubeInfoResponse")
 	proto.RegisterEnum("hapi.services.tiller.ListSort_SortBy", ListSort_SortBy_name, ListSort_SortBy_value)
 	proto.RegisterEnum("hapi.services.tiller.ListSort_SortOrder", ListSort_SortOrder_name, ListSort_SortOrder_value)
 }
@@ -1395,153 +1365,85 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "hapi/services/tiller.proto",
 }
 
-// Client API for InfoService service
-
-type InfoServiceClient interface {
-	GetKubeInfo(ctx context.Context, in *GetKubeInfoRequest, opts ...grpc.CallOption) (*GetKubeInfoResponse, error)
-}
-
-type infoServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewInfoServiceClient(cc *grpc.ClientConn) InfoServiceClient {
-	return &infoServiceClient{cc}
-}
-
-func (c *infoServiceClient) GetKubeInfo(ctx context.Context, in *GetKubeInfoRequest, opts ...grpc.CallOption) (*GetKubeInfoResponse, error) {
-	out := new(GetKubeInfoResponse)
-	err := grpc.Invoke(ctx, "/hapi.services.tiller.InfoService/GetKubeInfo", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for InfoService service
-
-type InfoServiceServer interface {
-	GetKubeInfo(context.Context, *GetKubeInfoRequest) (*GetKubeInfoResponse, error)
-}
-
-func RegisterInfoServiceServer(s *grpc.Server, srv InfoServiceServer) {
-	s.RegisterService(&_InfoService_serviceDesc, srv)
-}
-
-func _InfoService_GetKubeInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetKubeInfoRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(InfoServiceServer).GetKubeInfo(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hapi.services.tiller.InfoService/GetKubeInfo",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InfoServiceServer).GetKubeInfo(ctx, req.(*GetKubeInfoRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _InfoService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "hapi.services.tiller.InfoService",
-	HandlerType: (*InfoServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetKubeInfo",
-			Handler:    _InfoService_GetKubeInfo_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "hapi/services/tiller.proto",
-}
-
 func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1284 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x72, 0xdb, 0xc4,
-	0x17, 0x8f, 0xfc, 0xed, 0xe3, 0xd4, 0x75, 0x37, 0x6e, 0xa2, 0xea, 0xdf, 0x3f, 0x13, 0xd4, 0x81,
-	0xba, 0x85, 0x3a, 0x60, 0xb8, 0x81, 0x61, 0x98, 0x49, 0x53, 0x4f, 0x52, 0x1a, 0xd2, 0x19, 0xb9,
-	0x2d, 0x33, 0x0c, 0xe0, 0x91, 0xed, 0x75, 0x2b, 0x2a, 0x4b, 0x46, 0xbb, 0x0a, 0xcd, 0x2d, 0x77,
-	0x3c, 0x0a, 0x6f, 0xc1, 0x7b, 0x70, 0x09, 0x0f, 0xc2, 0xec, 0x97, 0xa2, 0x55, 0xa4, 0x44, 0xe4,
-	0x46, 0xd6, 0xee, 0x39, 0x7b, 0x3e, 0x7e, 0xe7, 0xe8, 0xb7, 0xc7, 0x60, 0xbd, 0x71, 0xd7, 0xde,
-	0x1e, 0xc1, 0xd1, 0xa9, 0x37, 0xc7, 0x64, 0x8f, 0x7a, 0xbe, 0x8f, 0xa3, 0xe1, 0x3a, 0x0a, 0x69,
-	0x88, 0xfa, 0x4c, 0x36, 0x54, 0xb2, 0xa1, 0x90, 0x59, 0xdb, 0xfc, 0xc4, 0xfc, 0x8d, 0x1b, 0x51,
-	0xf1, 0x14, 0xda, 0xd6, 0x4e, 0x7a, 0x3f, 0x0c, 0x96, 0xde, 0x6b, 0x29, 0x10, 0x2e, 0x22, 0xec,
-	0x63, 0x97, 0x60, 0xf5, 0xab, 0x1d, 0x52, 0x32, 0x2f, 0x58, 0x86, 0x52, 0xf0, 0x3f, 0x4d, 0x40,
-	0x31, 0xa1, 0xd3, 0x28, 0x0e, 0xa4, 0xf0, 0x8e, 0x26, 0x24, 0xd4, 0xa5, 0x31, 0xd1, 0x9c, 0x9d,
-	0xe2, 0x88, 0x78, 0x61, 0xa0, 0x7e, 0xa5, 0x8c, 0xe7, 0xb3, 0xf7, 0x36, 0x9e, 0xa5, 0x3d, 0xd9,
-	0x7f, 0x56, 0x60, 0xeb, 0xd8, 0x23, 0xd4, 0x11, 0xe6, 0x88, 0x83, 0x7f, 0x89, 0x31, 0xa1, 0xa8,
-	0x0f, 0x75, 0xdf, 0x5b, 0x79, 0xd4, 0x34, 0x76, 0x8d, 0x41, 0xd5, 0x11, 0x0b, 0xb4, 0x0d, 0x8d,
-	0x70, 0xb9, 0x24, 0x98, 0x9a, 0x95, 0x5d, 0x63, 0xd0, 0x76, 0xe4, 0x0a, 0x7d, 0x0d, 0x4d, 0x12,
-	0x46, 0x74, 0x3a, 0x3b, 0x33, 0xab, 0xbb, 0xc6, 0xa0, 0x3b, 0xfa, 0x60, 0x98, 0x87, 0xde, 0x90,
-	0x79, 0x9a, 0x84, 0x11, 0x1d, 0xb2, 0xc7, 0xe3, 0x33, 0xa7, 0x41, 0xf8, 0x2f, 0xb3, 0xbb, 0xf4,
-	0x7c, 0x8a, 0x23, 0xb3, 0x26, 0xec, 0x8a, 0x15, 0x3a, 0x04, 0xe0, 0x76, 0xc3, 0x68, 0x81, 0x23,
-	0xb3, 0xce, 0x4d, 0x0f, 0x4a, 0x98, 0x7e, 0xce, 0xf4, 0x9d, 0x36, 0x51, 0xaf, 0xe8, 0x2b, 0xd8,
-	0x14, 0x40, 0x4d, 0xe7, 0xe1, 0x02, 0x13, 0xb3, 0xb1, 0x5b, 0x1d, 0x74, 0x47, 0x77, 0x84, 0x29,
-	0x55, 0x94, 0x89, 0x80, 0xf2, 0x20, 0x5c, 0x60, 0xa7, 0x23, 0xd4, 0xd9, 0x3b, 0x41, 0x77, 0xa1,
-	0x1d, 0xb8, 0x2b, 0x4c, 0xd6, 0xee, 0x1c, 0x9b, 0x4d, 0x1e, 0xe1, 0xf9, 0x86, 0xfd, 0x13, 0xb4,
-	0x94, 0x73, 0x7b, 0x04, 0x0d, 0x91, 0x1a, 0xea, 0x40, 0xf3, 0xe5, 0xc9, 0xb3, 0x93, 0xe7, 0xdf,
-	0x9d, 0xf4, 0x36, 0x50, 0x0b, 0x6a, 0x27, 0xfb, 0xdf, 0x8e, 0x7b, 0x06, 0xba, 0x05, 0x37, 0x8e,
-	0xf7, 0x27, 0x2f, 0xa6, 0xce, 0xf8, 0x78, 0xbc, 0x3f, 0x19, 0x3f, 0xe9, 0x55, 0xec, 0xf7, 0xa0,
-	0x9d, 0xc4, 0x8c, 0x9a, 0x50, 0xdd, 0x9f, 0x1c, 0x88, 0x23, 0x4f, 0xc6, 0x93, 0x83, 0x9e, 0x61,
-	0xff, 0x6e, 0x40, 0x5f, 0x2f, 0x11, 0x59, 0x87, 0x01, 0xc1, 0xac, 0x46, 0xf3, 0x30, 0x0e, 0x92,
-	0x1a, 0xf1, 0x05, 0x42, 0x50, 0x0b, 0xf0, 0x3b, 0x55, 0x21, 0xfe, 0xce, 0x34, 0x69, 0x48, 0x5d,
-	0x9f, 0x57, 0xa7, 0xea, 0x88, 0x05, 0xfa, 0x14, 0x5a, 0x32, 0x75, 0x62, 0xd6, 0x76, 0xab, 0x83,
-	0xce, 0xe8, 0xb6, 0x0e, 0x88, 0xf4, 0xe8, 0x24, 0x6a, 0xf6, 0x21, 0xec, 0x1c, 0x62, 0x15, 0x89,
-	0xc0, 0x4b, 0x75, 0x0c, 0xf3, 0xeb, 0xae, 0x30, 0x0f, 0x86, 0xf9, 0x75, 0x57, 0x18, 0x99, 0xd0,
-	0x94, 0x4d, 0xc8, 0xc3, 0xa9, 0x3b, 0x6a, 0x69, 0x53, 0x30, 0x2f, 0x1a, 0x92, 0x79, 0xe5, 0x59,
-	0xfa, 0x10, 0x6a, 0xac, 0x6b, 0xb9, 0x99, 0xce, 0x08, 0xe9, 0x71, 0x3e, 0x0d, 0x96, 0xa1, 0xc3,
-	0xe5, 0x7a, 0xa9, 0xaa, 0xd9, 0x52, 0x1d, 0xa5, 0xbd, 0x1e, 0x84, 0x01, 0xc5, 0x01, 0xbd, 0x5e,
-	0xfc, 0xc7, 0x70, 0x27, 0xc7, 0x92, 0x4c, 0x60, 0x0f, 0x9a, 0x32, 0x34, 0x6e, 0xad, 0x10, 0x57,
-	0xa5, 0x65, 0xff, 0x5d, 0x81, 0xfe, 0xcb, 0xf5, 0xc2, 0xa5, 0x58, 0x89, 0x2e, 0x09, 0xea, 0x3e,
-	0xd4, 0x39, 0xcf, 0x48, 0x2c, 0x6e, 0x09, 0xdb, 0x82, 0x8c, 0x0e, 0xd8, 0xd3, 0x11, 0x72, 0xf4,
-	0x10, 0x1a, 0xa7, 0xae, 0x1f, 0x63, 0xc2, 0x81, 0x48, 0x50, 0x93, 0x9a, 0x9c, 0xa4, 0x1c, 0xa9,
-	0x81, 0x76, 0xa0, 0xb9, 0x88, 0xce, 0x18, 0xcb, 0xf0, 0x4f, 0xb0, 0xe5, 0x34, 0x16, 0xd1, 0x99,
-	0x13, 0x07, 0xe8, 0x1e, 0xdc, 0x58, 0x78, 0xc4, 0x9d, 0xf9, 0x78, 0xfa, 0x26, 0x0c, 0xdf, 0x12,
-	0xfe, 0x15, 0xb6, 0x9c, 0x4d, 0xb9, 0x79, 0xc4, 0xf6, 0x90, 0xc5, 0x3a, 0x69, 0x1e, 0x61, 0x97,
-	0x62, 0xb3, 0xc1, 0xe5, 0xc9, 0x9a, 0x61, 0x48, 0xbd, 0x15, 0x0e, 0x63, 0xca, 0x3f, 0x9d, 0xaa,
-	0xa3, 0x96, 0xe8, 0x7d, 0xd8, 0x8c, 0x30, 0xc1, 0x74, 0x2a, 0xa3, 0x6c, 0xf1, 0x93, 0x1d, 0xbe,
-	0xf7, 0x4a, 0x84, 0x85, 0xa0, 0xf6, 0xab, 0xeb, 0x51, 0xb3, 0xcd, 0x45, 0xfc, 0x5d, 0x1c, 0x8b,
-	0x09, 0x56, 0xc7, 0x40, 0x1d, 0x8b, 0x09, 0x96, 0xc7, 0xfa, 0x50, 0x5f, 0x86, 0xd1, 0x1c, 0x9b,
-	0x1d, 0x2e, 0x13, 0x0b, 0xfb, 0x08, 0x6e, 0x67, 0x40, 0xbe, 0x6e, 0xbd, 0xfe, 0x31, 0x60, 0xdb,
-	0x09, 0x7d, 0x7f, 0xe6, 0xce, 0xdf, 0x96, 0xa8, 0x58, 0x0a, 0xdc, 0xca, 0xe5, 0xe0, 0x56, 0x73,
-	0xc0, 0x4d, 0x35, 0x61, 0x4d, 0x6b, 0x42, 0x0d, 0xf6, 0x7a, 0x31, 0xec, 0x0d, 0x1d, 0x76, 0x85,
-	0x69, 0x33, 0x85, 0x69, 0x02, 0x58, 0x2b, 0x0d, 0xd8, 0x37, 0xb0, 0x73, 0x21, 0xcb, 0xeb, 0x42,
-	0xf6, 0x47, 0x05, 0x6e, 0x3f, 0x0d, 0x08, 0x75, 0x7d, 0x3f, 0x83, 0x58, 0xd2, 0xcf, 0x46, 0xe9,
-	0x7e, 0xae, 0xfc, 0x97, 0x7e, 0xae, 0x6a, 0x90, 0xab, 0xfa, 0xd4, 0x52, 0xf5, 0x29, 0xd5, 0xe3,
-	0x1a, 0xb3, 0x34, 0x32, 0xcc, 0x82, 0xfe, 0x0f, 0x20, 0x9a, 0x92, 0x1b, 0x17, 0xd0, 0xb6, 0xf9,
-	0xce, 0x89, 0x24, 0x12, 0x55, 0x8d, 0x56, 0x7e, 0x35, 0x52, 0x1d, 0x6e, 0x3f, 0x85, 0xed, 0x2c,
-	0x54, 0xd7, 0x85, 0xfd, 0x37, 0x03, 0x76, 0x5e, 0x06, 0x5e, 0x2e, 0xf0, 0x79, 0xad, 0x7a, 0x01,
-	0x8a, 0x4a, 0x0e, 0x14, 0x7d, 0xa8, 0xaf, 0xe3, 0xe8, 0x35, 0x96, 0xd0, 0x8a, 0x45, 0x3a, 0xc7,
-	0x9a, 0x96, 0xa3, 0x3d, 0x05, 0xf3, 0x62, 0x0c, 0xd7, 0xcc, 0x88, 0x45, 0x9d, 0xdc, 0x04, 0x6d,
-	0xc1, 0xfa, 0xf6, 0x16, 0xdc, 0x3a, 0xc4, 0xf4, 0x95, 0xf8, 0x2c, 0x64, 0x7a, 0xf6, 0x18, 0x50,
-	0x7a, 0xf3, 0xdc, 0x9f, 0xdc, 0xd2, 0xfd, 0xa9, 0x61, 0x49, 0xe9, 0x2b, 0x2d, 0xfb, 0x0b, 0x6e,
-	0xfb, 0xc8, 0x23, 0x34, 0x8c, 0xce, 0x2e, 0x83, 0xae, 0x07, 0xd5, 0x95, 0xfb, 0x4e, 0x5e, 0x14,
-	0xec, 0xd5, 0x3e, 0xe4, 0x11, 0x24, 0x47, 0x65, 0x04, 0xe9, 0x6b, 0xd7, 0x28, 0x77, 0xed, 0xfe,
-	0x00, 0xe8, 0x05, 0x4e, 0x26, 0x80, 0x2b, 0x6e, 0x2c, 0x55, 0x84, 0x8a, 0xde, 0x68, 0x26, 0x34,
-	0xe7, 0x3e, 0x76, 0x83, 0x78, 0x2d, 0xcb, 0xa6, 0x96, 0xf6, 0x8f, 0xb0, 0xa5, 0x59, 0x97, 0x71,
-	0xb2, 0x7c, 0xc8, 0x6b, 0x69, 0x9d, 0xbd, 0xa2, 0xcf, 0xa1, 0x21, 0xc6, 0x22, 0x6e, 0xbb, 0x3b,
-	0xba, 0xab, 0xc7, 0xcd, 0x8d, 0xc4, 0x81, 0x9c, 0xa3, 0x1c, 0xa9, 0x6b, 0xf7, 0x39, 0x0a, 0xcf,
-	0xe2, 0x19, 0xe6, 0xf7, 0xb4, 0xac, 0xce, 0x97, 0xb0, 0xa5, 0xed, 0x4a, 0xa7, 0xf7, 0xa0, 0xc6,
-	0xd6, 0xb2, 0x36, 0x37, 0x85, 0x03, 0x36, 0xb4, 0xca, 0x4b, 0x9e, 0x3d, 0x47, 0x7f, 0xb5, 0xa0,
-	0xab, 0x46, 0x07, 0x31, 0x06, 0x22, 0x0f, 0x36, 0xd3, 0x33, 0x12, 0x7a, 0x50, 0x3c, 0x25, 0x66,
-	0x46, 0x5d, 0xeb, 0x61, 0x19, 0x55, 0x11, 0x9e, 0xbd, 0xf1, 0x89, 0x81, 0x08, 0xf4, 0xb2, 0xa3,
-	0x0b, 0x7a, 0x94, 0x6f, 0xa3, 0x60, 0x56, 0xb2, 0x86, 0x65, 0xd5, 0x95, 0x5b, 0x74, 0xca, 0xbb,
-	0x50, 0x9f, 0x37, 0xd0, 0x95, 0x66, 0xf4, 0x11, 0xc7, 0xda, 0x2b, 0xad, 0x9f, 0xf8, 0xfd, 0x19,
-	0x6e, 0x68, 0x77, 0x26, 0x2a, 0x40, 0x2b, 0x6f, 0x7a, 0xb1, 0x3e, 0x2a, 0xa5, 0x9b, 0xf8, 0x5a,
-	0x41, 0x57, 0xa7, 0x3d, 0x54, 0x60, 0x20, 0xf7, 0x1e, 0xb1, 0x3e, 0x2e, 0xa7, 0x9c, 0xb8, 0x23,
-	0xd0, 0xcb, 0xb2, 0x52, 0x51, 0x1d, 0x0b, 0x18, 0xb4, 0xa8, 0x8e, 0x45, 0x64, 0x67, 0x6f, 0x20,
-	0x17, 0xe0, 0x9c, 0x94, 0xd0, 0xfd, 0xc2, 0x82, 0xe8, 0x5c, 0x66, 0x0d, 0xae, 0x56, 0x4c, 0x5c,
-	0xac, 0xe1, 0x66, 0xe6, 0xd6, 0x46, 0x05, 0xd0, 0xe4, 0x8f, 0x30, 0xd6, 0xa3, 0x92, 0xda, 0x99,
-	0xa4, 0x24, 0xcf, 0x5d, 0x92, 0x94, 0x4e, 0xa2, 0x97, 0x24, 0x95, 0xa1, 0x4c, 0x7b, 0x03, 0x79,
-	0xd0, 0x75, 0xe2, 0x40, 0xba, 0x66, 0x44, 0x83, 0x0a, 0x4e, 0x5f, 0xe4, 0x49, 0xeb, 0x41, 0x09,
-	0xcd, 0xf3, 0xef, 0x7b, 0x44, 0xa0, 0xc3, 0x58, 0x46, 0x31, 0xcb, 0x02, 0x3a, 0x29, 0xa2, 0x42,
-	0xc5, 0x41, 0x67, 0x18, 0xae, 0xc8, 0x6d, 0x0e, 0xeb, 0xd9, 0x1b, 0x8f, 0xe1, 0xfb, 0x96, 0x52,
-	0x9c, 0x35, 0xf8, 0x5f, 0xf3, 0xcf, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x17, 0x8f, 0xe3,
-	0x9e, 0x10, 0x00, 0x00,
+	// 1217 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0xe3, 0xc4,
+	0x17, 0xaf, 0xf3, 0x9d, 0x93, 0x36, 0xff, 0x74, 0x9a, 0xb6, 0xae, 0xff, 0x0b, 0x2a, 0x46, 0xb0,
+	0xd9, 0x85, 0x4d, 0x21, 0x70, 0x83, 0x84, 0x90, 0xba, 0xdd, 0xa8, 0x2d, 0x94, 0xae, 0xe4, 0x6c,
+	0x17, 0x09, 0x01, 0x91, 0x9b, 0x4c, 0x5a, 0xb3, 0x8e, 0x27, 0x78, 0xc6, 0x65, 0x7b, 0xcb, 0x1d,
+	0x8f, 0xc2, 0x5b, 0xf0, 0x1e, 0x5c, 0xc2, 0x83, 0x20, 0xcf, 0x87, 0xeb, 0x49, 0xed, 0xd6, 0xf4,
+	0x26, 0x9e, 0x99, 0xf3, 0xfd, 0x3b, 0x67, 0xce, 0x9c, 0x80, 0x75, 0xe9, 0x2e, 0xbc, 0x3d, 0x8a,
+	0xc3, 0x2b, 0x6f, 0x82, 0xe9, 0x1e, 0xf3, 0x7c, 0x1f, 0x87, 0xfd, 0x45, 0x48, 0x18, 0x41, 0xdd,
+	0x98, 0xd6, 0x57, 0xb4, 0xbe, 0xa0, 0x59, 0x5b, 0x5c, 0x62, 0x72, 0xe9, 0x86, 0x4c, 0xfc, 0x0a,
+	0x6e, 0x6b, 0x3b, 0x7d, 0x4e, 0x82, 0x99, 0x77, 0x21, 0x09, 0xc2, 0x44, 0x88, 0x7d, 0xec, 0x52,
+	0xac, 0xbe, 0x9a, 0x90, 0xa2, 0x79, 0xc1, 0x8c, 0x48, 0xc2, 0xff, 0x35, 0x02, 0xc3, 0x94, 0x8d,
+	0xc3, 0x28, 0x90, 0xc4, 0x1d, 0x8d, 0x48, 0x99, 0xcb, 0x22, 0xaa, 0x19, 0xbb, 0xc2, 0x21, 0xf5,
+	0x48, 0xa0, 0xbe, 0x82, 0x66, 0xff, 0x59, 0x82, 0x8d, 0x13, 0x8f, 0x32, 0x47, 0x08, 0x52, 0x07,
+	0xff, 0x12, 0x61, 0xca, 0x50, 0x17, 0xaa, 0xbe, 0x37, 0xf7, 0x98, 0x69, 0xec, 0x1a, 0xbd, 0xb2,
+	0x23, 0x36, 0x68, 0x0b, 0x6a, 0x64, 0x36, 0xa3, 0x98, 0x99, 0xa5, 0x5d, 0xa3, 0xd7, 0x74, 0xe4,
+	0x0e, 0x7d, 0x05, 0x75, 0x4a, 0x42, 0x36, 0x3e, 0xbf, 0x36, 0xcb, 0xbb, 0x46, 0xaf, 0x3d, 0xf8,
+	0xa0, 0x9f, 0x85, 0x53, 0x3f, 0xb6, 0x34, 0x22, 0x21, 0xeb, 0xc7, 0x3f, 0xcf, 0xaf, 0x9d, 0x1a,
+	0xe5, 0xdf, 0x58, 0xef, 0xcc, 0xf3, 0x19, 0x0e, 0xcd, 0x8a, 0xd0, 0x2b, 0x76, 0xe8, 0x10, 0x80,
+	0xeb, 0x25, 0xe1, 0x14, 0x87, 0x66, 0x95, 0xab, 0xee, 0x15, 0x50, 0xfd, 0x32, 0xe6, 0x77, 0x9a,
+	0x54, 0x2d, 0xd1, 0x97, 0xb0, 0x2a, 0x20, 0x19, 0x4f, 0xc8, 0x14, 0x53, 0xb3, 0xb6, 0x5b, 0xee,
+	0xb5, 0x07, 0x3b, 0x42, 0x95, 0x82, 0x7f, 0x24, 0x40, 0x3b, 0x20, 0x53, 0xec, 0xb4, 0x04, 0x7b,
+	0xbc, 0xa6, 0xe8, 0x11, 0x34, 0x03, 0x77, 0x8e, 0xe9, 0xc2, 0x9d, 0x60, 0xb3, 0xce, 0x3d, 0xbc,
+	0x39, 0xb0, 0x7f, 0x82, 0x86, 0x32, 0x6e, 0x0f, 0xa0, 0x26, 0x42, 0x43, 0x2d, 0xa8, 0x9f, 0x9d,
+	0x7e, 0x73, 0xfa, 0xf2, 0xbb, 0xd3, 0xce, 0x0a, 0x6a, 0x40, 0xe5, 0x74, 0xff, 0xdb, 0x61, 0xc7,
+	0x40, 0xeb, 0xb0, 0x76, 0xb2, 0x3f, 0x7a, 0x35, 0x76, 0x86, 0x27, 0xc3, 0xfd, 0xd1, 0xf0, 0x45,
+	0xa7, 0x64, 0xbf, 0x0b, 0xcd, 0xc4, 0x67, 0x54, 0x87, 0xf2, 0xfe, 0xe8, 0x40, 0x88, 0xbc, 0x18,
+	0x8e, 0x0e, 0x3a, 0x86, 0xfd, 0xbb, 0x01, 0x5d, 0x3d, 0x45, 0x74, 0x41, 0x02, 0x8a, 0xe3, 0x1c,
+	0x4d, 0x48, 0x14, 0x24, 0x39, 0xe2, 0x1b, 0x84, 0xa0, 0x12, 0xe0, 0xb7, 0x2a, 0x43, 0x7c, 0x1d,
+	0x73, 0x32, 0xc2, 0x5c, 0x9f, 0x67, 0xa7, 0xec, 0x88, 0x0d, 0xfa, 0x14, 0x1a, 0x32, 0x74, 0x6a,
+	0x56, 0x76, 0xcb, 0xbd, 0xd6, 0x60, 0x53, 0x07, 0x44, 0x5a, 0x74, 0x12, 0x36, 0xfb, 0x10, 0xb6,
+	0x0f, 0xb1, 0xf2, 0x44, 0xe0, 0xa5, 0x2a, 0x26, 0xb6, 0xeb, 0xce, 0x31, 0x77, 0x26, 0xb6, 0xeb,
+	0xce, 0x31, 0x32, 0xa1, 0x2e, 0xcb, 0x8d, 0xbb, 0x53, 0x75, 0xd4, 0xd6, 0x66, 0x60, 0xde, 0x56,
+	0x24, 0xe3, 0xca, 0xd2, 0xf4, 0x21, 0x54, 0xe2, 0x9b, 0xc0, 0xd5, 0xb4, 0x06, 0x48, 0xf7, 0xf3,
+	0x38, 0x98, 0x11, 0x87, 0xd3, 0xf5, 0x54, 0x95, 0x97, 0x53, 0x75, 0x94, 0xb6, 0x7a, 0x40, 0x02,
+	0x86, 0x03, 0xf6, 0x30, 0xff, 0x4f, 0x60, 0x27, 0x43, 0x93, 0x0c, 0x60, 0x0f, 0xea, 0xd2, 0x35,
+	0xae, 0x2d, 0x17, 0x57, 0xc5, 0x65, 0xff, 0x5d, 0x82, 0xee, 0xd9, 0x62, 0xea, 0x32, 0xac, 0x48,
+	0x77, 0x38, 0xf5, 0x18, 0xaa, 0xbc, 0xa3, 0x48, 0x2c, 0xd6, 0x85, 0x6e, 0xd1, 0x76, 0x0e, 0xe2,
+	0x5f, 0x47, 0xd0, 0xd1, 0x53, 0xa8, 0x5d, 0xb9, 0x7e, 0x84, 0x29, 0x07, 0x22, 0x41, 0x4d, 0x72,
+	0xf2, 0x76, 0xe4, 0x48, 0x0e, 0xb4, 0x0d, 0xf5, 0x69, 0x78, 0x1d, 0xf7, 0x13, 0x7e, 0x05, 0x1b,
+	0x4e, 0x6d, 0x1a, 0x5e, 0x3b, 0x51, 0x80, 0xde, 0x87, 0xb5, 0xa9, 0x47, 0xdd, 0x73, 0x1f, 0x8f,
+	0x2f, 0x09, 0x79, 0x43, 0xf9, 0x2d, 0x6c, 0x38, 0xab, 0xf2, 0xf0, 0x28, 0x3e, 0x43, 0x56, 0x5c,
+	0x49, 0x93, 0x10, 0xbb, 0x0c, 0x9b, 0x35, 0x4e, 0x4f, 0xf6, 0x31, 0x86, 0xcc, 0x9b, 0x63, 0x12,
+	0x31, 0x7e, 0x75, 0xca, 0x8e, 0xda, 0xa2, 0xf7, 0x60, 0x35, 0xc4, 0x14, 0xb3, 0xb1, 0xf4, 0xb2,
+	0xc1, 0x25, 0x5b, 0xfc, 0xec, 0xb5, 0x70, 0x0b, 0x41, 0xe5, 0x57, 0xd7, 0x63, 0x66, 0x93, 0x93,
+	0xf8, 0x5a, 0x88, 0x45, 0x14, 0x2b, 0x31, 0x50, 0x62, 0x11, 0xc5, 0x52, 0xac, 0x0b, 0xd5, 0x19,
+	0x09, 0x27, 0xd8, 0x6c, 0x71, 0x9a, 0xd8, 0xd8, 0x47, 0xb0, 0xb9, 0x04, 0xf2, 0x43, 0xf3, 0xf5,
+	0x8f, 0x01, 0x5b, 0x0e, 0xf1, 0xfd, 0x73, 0x77, 0xf2, 0xa6, 0x40, 0xc6, 0x52, 0xe0, 0x96, 0xee,
+	0x06, 0xb7, 0x9c, 0x01, 0x6e, 0xaa, 0x08, 0x2b, 0x5a, 0x11, 0x6a, 0xb0, 0x57, 0xf3, 0x61, 0xaf,
+	0xe9, 0xb0, 0x2b, 0x4c, 0xeb, 0x29, 0x4c, 0x13, 0xc0, 0x1a, 0x69, 0xc0, 0xbe, 0x86, 0xed, 0x5b,
+	0x51, 0x3e, 0x14, 0xb2, 0x3f, 0x4a, 0xb0, 0x79, 0x1c, 0x50, 0xe6, 0xfa, 0xfe, 0x12, 0x62, 0x49,
+	0x3d, 0x1b, 0x85, 0xeb, 0xb9, 0xf4, 0x5f, 0xea, 0xb9, 0xac, 0x41, 0xae, 0xf2, 0x53, 0x49, 0xe5,
+	0xa7, 0x50, 0x8d, 0x6b, 0x9d, 0xa5, 0xb6, 0xd4, 0x59, 0xd0, 0x3b, 0x00, 0xa2, 0x28, 0xb9, 0x72,
+	0x01, 0x6d, 0x93, 0x9f, 0x9c, 0xca, 0x46, 0xa2, 0xb2, 0xd1, 0xc8, 0xce, 0x46, 0xaa, 0xc2, 0xed,
+	0x63, 0xd8, 0x5a, 0x86, 0xea, 0xa1, 0xb0, 0xff, 0x66, 0xc0, 0xf6, 0x59, 0xe0, 0x65, 0x02, 0x9f,
+	0x55, 0xaa, 0xb7, 0xa0, 0x28, 0x65, 0x40, 0xd1, 0x85, 0xea, 0x22, 0x0a, 0x2f, 0xb0, 0x84, 0x56,
+	0x6c, 0xd2, 0x31, 0x56, 0xb4, 0x18, 0xed, 0x31, 0x98, 0xb7, 0x7d, 0x78, 0x60, 0x44, 0xb1, 0xd7,
+	0xc9, 0x4b, 0xd0, 0x14, 0x5d, 0xdf, 0xde, 0x80, 0xf5, 0x43, 0xcc, 0x5e, 0x8b, 0x6b, 0x21, 0xc3,
+	0xb3, 0x87, 0x80, 0xd2, 0x87, 0x37, 0xf6, 0xe4, 0x91, 0x6e, 0x4f, 0x8d, 0x45, 0x8a, 0x5f, 0x71,
+	0xd9, 0x5f, 0x70, 0xdd, 0x47, 0x1e, 0x65, 0x24, 0xbc, 0xbe, 0x0b, 0xba, 0x0e, 0x94, 0xe7, 0xee,
+	0x5b, 0xf9, 0x50, 0xc4, 0x4b, 0xfb, 0x90, 0x7b, 0x90, 0x88, 0x4a, 0x0f, 0xd2, 0xcf, 0xae, 0x51,
+	0xec, 0xd9, 0xfd, 0x01, 0xd0, 0x2b, 0x9c, 0x4c, 0x00, 0xf7, 0xbc, 0x58, 0x2a, 0x09, 0x25, 0xbd,
+	0xd0, 0x4c, 0xa8, 0x4f, 0x7c, 0xec, 0x06, 0xd1, 0x42, 0xa6, 0x4d, 0x6d, 0xed, 0x1f, 0x61, 0x43,
+	0xd3, 0x2e, 0xfd, 0x8c, 0xe3, 0xa1, 0x17, 0x52, 0x7b, 0xbc, 0x44, 0x9f, 0x43, 0x4d, 0x8c, 0x45,
+	0x5c, 0x77, 0x7b, 0xf0, 0x48, 0xf7, 0x9b, 0x2b, 0x89, 0x02, 0x39, 0x47, 0x39, 0x92, 0x77, 0xf0,
+	0x57, 0x03, 0xda, 0xea, 0xa1, 0x17, 0x43, 0x1b, 0xf2, 0x60, 0x35, 0x3d, 0xd1, 0xa0, 0x27, 0xf9,
+	0x33, 0xdd, 0xd2, 0x60, 0x6a, 0x3d, 0x2d, 0xc2, 0x2a, 0x22, 0xb0, 0x57, 0x3e, 0x31, 0x10, 0x85,
+	0xce, 0xf2, 0xa0, 0x81, 0x9e, 0x65, 0xeb, 0xc8, 0x99, 0x6c, 0xac, 0x7e, 0x51, 0x76, 0x65, 0x16,
+	0x5d, 0xf1, 0x9a, 0xd1, 0xa7, 0x03, 0x74, 0xaf, 0x1a, 0x7d, 0x20, 0xb1, 0xf6, 0x0a, 0xf3, 0x27,
+	0x76, 0x7f, 0x86, 0x35, 0xed, 0x85, 0x43, 0x39, 0x68, 0x65, 0xcd, 0x1a, 0xd6, 0x47, 0x85, 0x78,
+	0x13, 0x5b, 0x73, 0x68, 0xeb, 0x4d, 0x0a, 0xe5, 0x28, 0xc8, 0xec, 0xfa, 0xd6, 0xc7, 0xc5, 0x98,
+	0x13, 0x73, 0x14, 0x3a, 0xcb, 0x3d, 0x24, 0x2f, 0x8f, 0x39, 0xfd, 0x2e, 0x2f, 0x8f, 0x79, 0xad,
+	0xc9, 0x5e, 0x41, 0x2e, 0xc0, 0x4d, 0x0b, 0x41, 0x8f, 0x73, 0x13, 0xa2, 0x77, 0x1e, 0xab, 0x77,
+	0x3f, 0x63, 0x62, 0x62, 0x01, 0xff, 0x5b, 0x7a, 0x63, 0x51, 0x0e, 0x34, 0xd9, 0x03, 0x87, 0xf5,
+	0xac, 0x20, 0xf7, 0x52, 0x50, 0xb2, 0x2b, 0xdd, 0x11, 0x94, 0xde, 0xf2, 0xee, 0x08, 0x6a, 0xa9,
+	0xc1, 0xd9, 0x2b, 0xc8, 0x83, 0xb6, 0x13, 0x05, 0xd2, 0x74, 0xdc, 0x16, 0x50, 0x8e, 0xf4, 0xed,
+	0xae, 0x66, 0x3d, 0x29, 0xc0, 0x79, 0x73, 0xbf, 0x9f, 0xc3, 0xf7, 0x0d, 0xc5, 0x7a, 0x5e, 0xe3,
+	0xff, 0x69, 0x3f, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x7c, 0x9c, 0x49, 0xc1, 0x0f, 0x00,
+	0x00,
 }
diff --git a/pkg/proto/hapi/version/version.pb.go b/pkg/proto/hapi/version/version.pb.go
index e3d8a7096..13c8568f0 100644
--- a/pkg/proto/hapi/version/version.pb.go
+++ b/pkg/proto/hapi/version/version.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/version/version.proto
-// DO NOT EDIT!
 
 /*
 Package version is a generated protocol buffer package.
diff --git a/pkg/tiller/info_service.go b/pkg/tiller/info_service.go
deleted file mode 100644
index 0ec0e1ddb..000000000
--- a/pkg/tiller/info_service.go
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors All rights reserved.
-
-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 tiller
-
-import (
-	"golang.org/x/net/context"
-	"k8s.io/helm/pkg/proto/hapi/kube"
-	"k8s.io/helm/pkg/proto/hapi/services"
-	"k8s.io/helm/pkg/tiller/environment"
-	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-)
-
-// InfoServer implements the server-side gRPC endpoint for the HAPI info service.
-type InfoServer struct {
-	clientset internalclientset.Interface
-	env       *environment.Environment
-}
-
-// GetKubeInfo returns Kubernetes server information.
-func (s *InfoServer) GetKubeInfo(context.Context, *services.GetKubeInfoRequest) (*services.GetKubeInfoResponse, error) {
-	v, err := s.clientset.Discovery().ServerVersion()
-	if err != nil {
-		return nil, err
-	}
-	i := &kube.Info{
-		Version: &kube.Version{
-			Major:        v.Major,
-			Minor:        v.Minor,
-			GitVersion:   v.GitVersion,
-			GitCommit:    v.GitCommit,
-			GitTreeState: v.GitTreeState,
-			BuildDate:    v.BuildDate,
-			GoVersion:    v.GoVersion,
-			Compiler:     v.Compiler,
-			Platform:     v.Platform,
-		},
-	}
-	return &services.GetKubeInfoResponse{Info: i}, nil
-}
-
-// NewInfoServer returns a new InfoServer.
-func NewInfoServer(env *environment.Environment, clientset internalclientset.Interface) *InfoServer {
-	return &InfoServer{
-		env:       env,
-		clientset: clientset,
-	}
-}
diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go
index 6ac67610d..44d5d847a 100644
--- a/pkg/tiller/release_server.go
+++ b/pkg/tiller/release_server.go
@@ -78,7 +78,7 @@ var ListDefaultLimit int64 = 512
 // prevents an empty string from matching.
 var ValidName = regexp.MustCompile("^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])+$")
 
-// ReleaseServer implements the server-side gRPC endpoint for the release service.
+// ReleaseServer implements the server-side gRPC endpoint for the HAPI services.
 type ReleaseServer struct {
 	ReleaseModule
 	env       *environment.Environment