diff --git a/Makefile b/Makefile
index 1d2eeab9b..9017f2f30 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ BINARY_VERSION ?= ${GIT_TAG}
 
 # Only set Version if building a tag or VERSION is set
 ifneq ($(BINARY_VERSION),)
-	LDFLAGS += -X k8s.io/helm/pkg/version.Version=${BINARY_VERSION}
+	LDFLAGS += -X k8s.io/helm/pkg/version.version=${BINARY_VERSION}
 endif
 
 # Clear the "unreleased" string in BuildMetadata
diff --git a/_proto/Makefile b/_proto/Makefile
index cd0568510..5418bd5ca 100644
--- a/_proto/Makefile
+++ b/_proto/Makefile
@@ -23,14 +23,10 @@ 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
-
 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 version
+all: chart release services
 
 .PHONY: chart
 chart:
@@ -38,15 +34,11 @@ chart:
 
 .PHONY: release
 release:
-	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(google_deps),$(chart_ias),$(version_ias):$(dst) $(release_pbs)
+	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(google_deps),$(chart_ias):$(dst) $(release_pbs)
 
 .PHONY: services
 services:
-	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(google_deps),$(chart_ias),$(version_ias),$(release_ias):$(dst) $(services_pbs)
-
-.PHONY: version
-version:
-	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(google_deps):$(dst) $(version_pbs)
+	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(google_deps),$(chart_ias),$(release_ias):$(dst) $(services_pbs)
 
 .PHONY: clean
 clean:
diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 5897676ab..b1bbdb9ce 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -22,69 +22,9 @@ import "hapi/release/release.proto";
 import "hapi/release/info.proto";
 import "hapi/release/test_run.proto";
 import "hapi/release/status.proto";
-import "hapi/version/version.proto";
 
 option go_package = "services";
 
-// ReleaseService is the service that a helm application uses to mutate,
-// query, and manage releases.
-//
-//		Release: A named installation composed of a chart and
-// 				 config. At any given time a release has one
-//				 chart and one config.
-//
-//		Config:  A config is a YAML file that supplies values
-//				 to the parametrizable templates of a chart.
-//
-//		Chart:   A chart is a helm package that contains
-//				 metadata, a default config, zero or more
-//				 optionally parameterizable templates, and
-//				 zero or more charts (dependencies).
-service ReleaseService {
-	// ListReleases retrieves release history.
-	// TODO: Allow filtering the set of releases by
-	// release status. By default, ListAllReleases returns the releases who
-	// current status is "Active".
-	rpc ListReleases(ListReleasesRequest) returns (stream ListReleasesResponse) {
-	}
-
-	// GetReleasesStatus retrieves status information for the specified release.
-	rpc GetReleaseStatus(GetReleaseStatusRequest) returns (GetReleaseStatusResponse) {
-	}
-
-	// GetReleaseContent retrieves the release content (chart + value) for the specified release.
-	rpc GetReleaseContent(GetReleaseContentRequest) returns (GetReleaseContentResponse) {
-	}
-
-	// UpdateRelease updates release content.
-	rpc UpdateRelease(UpdateReleaseRequest) returns (UpdateReleaseResponse) {
-	}
-
-	// InstallRelease requests installation of a chart as a new release.
-	rpc InstallRelease(InstallReleaseRequest) returns (InstallReleaseResponse) {
-	}
-
-	// UninstallRelease requests deletion of a named release.
-	rpc UninstallRelease(UninstallReleaseRequest) returns (UninstallReleaseResponse) {
-	}
-
-    // GetVersion returns the current version of the server.
-    rpc GetVersion(GetVersionRequest) returns (GetVersionResponse) {
-    }
-
-    // RollbackRelease rolls back a release to a previous version.
-    rpc RollbackRelease(RollbackReleaseRequest) returns (RollbackReleaseResponse) {
-    }
-
-    // ReleaseHistory retrieves a releasse's history.
-    rpc GetHistory(GetHistoryRequest) returns (GetHistoryResponse) {
-    }
-
-    // RunReleaseTest executes the tests defined of a named release
-    rpc RunReleaseTest(TestReleaseRequest) returns (stream TestReleaseResponse) {
-    }
-}
-
 // ListReleasesRequest requests a list of releases.
 //
 // Releases can be retrieved in chunks by setting limit and offset.
@@ -177,12 +117,6 @@ message GetReleaseContentRequest {
 	int32 version = 2;
 }
 
-// GetReleaseContentResponse is a response containing the contents of a release.
-message GetReleaseContentResponse {
-	// The release content
-	hapi.release.Release release = 1;
-}
-
 // UpdateReleaseRequest updates a release.
 message UpdateReleaseRequest {
 	// The name of the release
@@ -211,11 +145,6 @@ message UpdateReleaseRequest {
 	bool force = 11;
 }
 
-// UpdateReleaseResponse is the response to an update request.
-message UpdateReleaseResponse {
-	hapi.release.Release release = 1;
-}
-
 message RollbackReleaseRequest {
 	// The name of the release
 	string name = 1;
@@ -236,11 +165,6 @@ message RollbackReleaseRequest {
 	bool force = 8;
 }
 
-// RollbackReleaseResponse is the response to an update request.
-message RollbackReleaseResponse {
-	hapi.release.Release release = 1;
-}
-
 // InstallReleaseRequest is the request for an installation of a chart.
 message InstallReleaseRequest {
 	// Chart is the protobuf representation of a chart.
@@ -273,11 +197,6 @@ message InstallReleaseRequest {
 	bool wait = 9;
 }
 
-// InstallReleaseResponse is the response from a release installation.
-message InstallReleaseResponse {
-	hapi.release.Release release = 1;
-}
-
 // UninstallReleaseRequest represents a request to uninstall a named release.
 message UninstallReleaseRequest {
 	// Name is the name of the release to delete.
@@ -298,14 +217,6 @@ message UninstallReleaseResponse {
 	string info = 2;
 }
 
-// GetVersionRequest requests for version information.
-message GetVersionRequest {
-}
-
-message GetVersionResponse {
-  hapi.version.Version Version = 1;
-}
-
 // GetHistoryRequest requests a release's history.
 message GetHistoryRequest {
 	// The name of the release.
@@ -314,11 +225,6 @@ message GetHistoryRequest {
 	int32 max = 2;
 }
 
-// GetHistoryResponse is received in response to a GetHistory rpc.
-message GetHistoryResponse {
-	repeated hapi.release.Release releases = 1;
-}
-
 // TestReleaseRequest is a request to get the status of a release.
 message TestReleaseRequest {
 	// Name is the name of the release
diff --git a/_proto/hapi/version/version.proto b/_proto/hapi/version/version.proto
deleted file mode 100644
index 0ae0985b7..000000000
--- a/_proto/hapi/version/version.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 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.version;
-
-option go_package = "version";
-
-message Version {
-  // Sem ver string for the version
-  string sem_ver = 1;
-  string git_commit = 2;
-  string git_tree_state = 3;
-}
diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index ffedcff6a..0c8ffe565 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	pb "k8s.io/helm/pkg/proto/hapi/version"
 	"k8s.io/helm/pkg/version"
 )
 
@@ -77,7 +76,7 @@ func (v *versionCmd) run() error {
 	return nil
 }
 
-func formatVersion(v *pb.Version, short bool) string {
+func formatVersion(v *version.Version, short bool) string {
 	if short {
 		return fmt.Sprintf("%s+g%s", v.SemVer, v.GitCommit[:7])
 	}
diff --git a/pkg/chartutil/capabilities.go b/pkg/chartutil/capabilities.go
index c87c0368e..256042802 100644
--- a/pkg/chartutil/capabilities.go
+++ b/pkg/chartutil/capabilities.go
@@ -20,7 +20,8 @@ import (
 	"runtime"
 
 	"k8s.io/apimachinery/pkg/version"
-	tversion "k8s.io/helm/pkg/proto/hapi/version"
+
+	tversion "k8s.io/helm/pkg/version"
 )
 
 var (
diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index dd678c234..011e82458 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -52,13 +52,14 @@ func (c *FakeClient) ListReleases(opts ...ReleaseListOption) ([]*release.Release
 	return c.Rels, nil
 }
 
-// InstallRelease creates a new release and returns a InstallReleaseResponse containing that release
+// InstallRelease creates a new release and returns the release
 func (c *FakeClient) InstallRelease(chStr, ns string, opts ...InstallOption) (*release.Release, error) {
 	chart := &chart.Chart{}
 	return c.InstallReleaseFromChart(chart, ns, opts...)
 }
 
-// InstallReleaseFromChart adds a new MockRelease to the fake client and returns a InstallReleaseResponse containing that release
+// InstallReleaseFromChart adds a new MockRelease to the fake client and
+// returns the release
 func (c *FakeClient) InstallReleaseFromChart(chart *chart.Chart, ns string, opts ...InstallOption) (*release.Release, error) {
 	for _, opt := range opts {
 		opt(&c.Opts)
@@ -91,12 +92,12 @@ func (c *FakeClient) DeleteRelease(rlsName string, opts ...DeleteOption) (*rls.U
 	return nil, fmt.Errorf("No such release: %s", rlsName)
 }
 
-// UpdateRelease returns an UpdateReleaseResponse containing the updated release, if it exists
+// UpdateRelease returns the updated release, if it exists
 func (c *FakeClient) UpdateRelease(rlsName string, chStr string, opts ...UpdateOption) (*release.Release, error) {
 	return c.UpdateReleaseFromChart(rlsName, &chart.Chart{}, opts...)
 }
 
-// UpdateReleaseFromChart returns an UpdateReleaseResponse containing the updated release, if it exists
+// UpdateReleaseFromChart returns the updated release, if it exists
 func (c *FakeClient) UpdateReleaseFromChart(rlsName string, chart *chart.Chart, opts ...UpdateOption) (*release.Release, error) {
 	// Check to see if the release already exists.
 	return c.ReleaseContent(rlsName, 0)
diff --git a/pkg/proto/hapi/rudder/rudder.pb.go b/pkg/proto/hapi/rudder/rudder.pb.go
deleted file mode 100644
index de3e3d650..000000000
--- a/pkg/proto/hapi/rudder/rudder.pb.go
+++ /dev/null
@@ -1,470 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: hapi/rudder/rudder.proto
-
-/*
-Package rudder is a generated protocol buffer package.
-
-It is generated from these files:
-	hapi/rudder/rudder.proto
-
-It has these top-level messages:
-	Result
-	VersionReleaseRequest
-	VersionReleaseResponse
-	InstallReleaseRequest
-	InstallReleaseResponse
-	DeleteReleaseRequest
-	DeleteReleaseResponse
-	UpgradeReleaseRequest
-	UpgradeReleaseResponse
-	RollbackReleaseRequest
-	RollbackReleaseResponse
-	ReleaseStatusRequest
-	ReleaseStatusResponse
-*/
-package rudder
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import hapi_release3 "k8s.io/helm/pkg/proto/hapi/release"
-import hapi_release5 "k8s.io/helm/pkg/proto/hapi/release"
-
-// 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 Result_Status int32
-
-const (
-	// No status set
-	Result_UNKNOWN Result_Status = 0
-	// Operation was successful
-	Result_SUCCESS Result_Status = 1
-	// Operation had no results (e.g. upgrade identical, rollback to same, delete non-existent)
-	Result_UNCHANGED Result_Status = 2
-	// Operation failed
-	Result_ERROR Result_Status = 3
-)
-
-var Result_Status_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "SUCCESS",
-	2: "UNCHANGED",
-	3: "ERROR",
-}
-var Result_Status_value = map[string]int32{
-	"UNKNOWN":   0,
-	"SUCCESS":   1,
-	"UNCHANGED": 2,
-	"ERROR":     3,
-}
-
-func (x Result_Status) String() string {
-	return proto.EnumName(Result_Status_name, int32(x))
-}
-func (Result_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-type Result struct {
-	Info string   `protobuf:"bytes,1,opt,name=info" json:"info,omitempty"`
-	Log  []string `protobuf:"bytes,2,rep,name=log" json:"log,omitempty"`
-}
-
-func (m *Result) Reset()                    { *m = Result{} }
-func (m *Result) String() string            { return proto.CompactTextString(m) }
-func (*Result) ProtoMessage()               {}
-func (*Result) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Result) GetInfo() string {
-	if m != nil {
-		return m.Info
-	}
-	return ""
-}
-
-func (m *Result) GetLog() []string {
-	if m != nil {
-		return m.Log
-	}
-	return nil
-}
-
-type VersionReleaseRequest struct {
-}
-
-func (m *VersionReleaseRequest) Reset()                    { *m = VersionReleaseRequest{} }
-func (m *VersionReleaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*VersionReleaseRequest) ProtoMessage()               {}
-func (*VersionReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type VersionReleaseResponse struct {
-	Name    string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Version string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-}
-
-func (m *VersionReleaseResponse) Reset()                    { *m = VersionReleaseResponse{} }
-func (m *VersionReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*VersionReleaseResponse) ProtoMessage()               {}
-func (*VersionReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *VersionReleaseResponse) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *VersionReleaseResponse) GetVersion() string {
-	if m != nil {
-		return m.Version
-	}
-	return ""
-}
-
-type InstallReleaseRequest struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *InstallReleaseRequest) Reset()                    { *m = InstallReleaseRequest{} }
-func (m *InstallReleaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*InstallReleaseRequest) ProtoMessage()               {}
-func (*InstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *InstallReleaseRequest) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-type InstallReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-	Result  *Result                `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *InstallReleaseResponse) Reset()                    { *m = InstallReleaseResponse{} }
-func (m *InstallReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*InstallReleaseResponse) ProtoMessage()               {}
-func (*InstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *InstallReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-func (m *InstallReleaseResponse) GetResult() *Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-type DeleteReleaseRequest struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *DeleteReleaseRequest) Reset()                    { *m = DeleteReleaseRequest{} }
-func (m *DeleteReleaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*DeleteReleaseRequest) ProtoMessage()               {}
-func (*DeleteReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *DeleteReleaseRequest) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-type DeleteReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-	Result  *Result                `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *DeleteReleaseResponse) Reset()                    { *m = DeleteReleaseResponse{} }
-func (m *DeleteReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*DeleteReleaseResponse) ProtoMessage()               {}
-func (*DeleteReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *DeleteReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-func (m *DeleteReleaseResponse) GetResult() *Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-type UpgradeReleaseRequest struct {
-	Current  *hapi_release5.Release `protobuf:"bytes,1,opt,name=current" json:"current,omitempty"`
-	Target   *hapi_release5.Release `protobuf:"bytes,2,opt,name=target" json:"target,omitempty"`
-	Timeout  int64                  `protobuf:"varint,3,opt,name=Timeout" json:"Timeout,omitempty"`
-	Wait     bool                   `protobuf:"varint,4,opt,name=Wait" json:"Wait,omitempty"`
-	Recreate bool                   `protobuf:"varint,5,opt,name=Recreate" json:"Recreate,omitempty"`
-	Force    bool                   `protobuf:"varint,6,opt,name=Force" json:"Force,omitempty"`
-}
-
-func (m *UpgradeReleaseRequest) Reset()                    { *m = UpgradeReleaseRequest{} }
-func (m *UpgradeReleaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*UpgradeReleaseRequest) ProtoMessage()               {}
-func (*UpgradeReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *UpgradeReleaseRequest) GetCurrent() *hapi_release5.Release {
-	if m != nil {
-		return m.Current
-	}
-	return nil
-}
-
-func (m *UpgradeReleaseRequest) GetTarget() *hapi_release5.Release {
-	if m != nil {
-		return m.Target
-	}
-	return nil
-}
-
-func (m *UpgradeReleaseRequest) GetTimeout() int64 {
-	if m != nil {
-		return m.Timeout
-	}
-	return 0
-}
-
-func (m *UpgradeReleaseRequest) GetWait() bool {
-	if m != nil {
-		return m.Wait
-	}
-	return false
-}
-
-func (m *UpgradeReleaseRequest) GetRecreate() bool {
-	if m != nil {
-		return m.Recreate
-	}
-	return false
-}
-
-func (m *UpgradeReleaseRequest) GetForce() bool {
-	if m != nil {
-		return m.Force
-	}
-	return false
-}
-
-type UpgradeReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-	Result  *Result                `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *UpgradeReleaseResponse) Reset()                    { *m = UpgradeReleaseResponse{} }
-func (m *UpgradeReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*UpgradeReleaseResponse) ProtoMessage()               {}
-func (*UpgradeReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *UpgradeReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-func (m *UpgradeReleaseResponse) GetResult() *Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-type RollbackReleaseRequest struct {
-	Current  *hapi_release5.Release `protobuf:"bytes,1,opt,name=current" json:"current,omitempty"`
-	Target   *hapi_release5.Release `protobuf:"bytes,2,opt,name=target" json:"target,omitempty"`
-	Timeout  int64                  `protobuf:"varint,3,opt,name=Timeout" json:"Timeout,omitempty"`
-	Wait     bool                   `protobuf:"varint,4,opt,name=Wait" json:"Wait,omitempty"`
-	Recreate bool                   `protobuf:"varint,5,opt,name=Recreate" json:"Recreate,omitempty"`
-	Force    bool                   `protobuf:"varint,6,opt,name=Force" json:"Force,omitempty"`
-}
-
-func (m *RollbackReleaseRequest) Reset()                    { *m = RollbackReleaseRequest{} }
-func (m *RollbackReleaseRequest) String() string            { return proto.CompactTextString(m) }
-func (*RollbackReleaseRequest) ProtoMessage()               {}
-func (*RollbackReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *RollbackReleaseRequest) GetCurrent() *hapi_release5.Release {
-	if m != nil {
-		return m.Current
-	}
-	return nil
-}
-
-func (m *RollbackReleaseRequest) GetTarget() *hapi_release5.Release {
-	if m != nil {
-		return m.Target
-	}
-	return nil
-}
-
-func (m *RollbackReleaseRequest) GetTimeout() int64 {
-	if m != nil {
-		return m.Timeout
-	}
-	return 0
-}
-
-func (m *RollbackReleaseRequest) GetWait() bool {
-	if m != nil {
-		return m.Wait
-	}
-	return false
-}
-
-func (m *RollbackReleaseRequest) GetRecreate() bool {
-	if m != nil {
-		return m.Recreate
-	}
-	return false
-}
-
-func (m *RollbackReleaseRequest) GetForce() bool {
-	if m != nil {
-		return m.Force
-	}
-	return false
-}
-
-type RollbackReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-	Result  *Result                `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
-}
-
-func (m *RollbackReleaseResponse) Reset()                    { *m = RollbackReleaseResponse{} }
-func (m *RollbackReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*RollbackReleaseResponse) ProtoMessage()               {}
-func (*RollbackReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *RollbackReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-func (m *RollbackReleaseResponse) GetResult() *Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-type ReleaseStatusRequest struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *ReleaseStatusRequest) Reset()                    { *m = ReleaseStatusRequest{} }
-func (m *ReleaseStatusRequest) String() string            { return proto.CompactTextString(m) }
-func (*ReleaseStatusRequest) ProtoMessage()               {}
-func (*ReleaseStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-func (m *ReleaseStatusRequest) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-type ReleaseStatusResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-	Info    *hapi_release3.Info    `protobuf:"bytes,2,opt,name=info" json:"info,omitempty"`
-}
-
-func (m *ReleaseStatusResponse) Reset()                    { *m = ReleaseStatusResponse{} }
-func (m *ReleaseStatusResponse) String() string            { return proto.CompactTextString(m) }
-func (*ReleaseStatusResponse) ProtoMessage()               {}
-func (*ReleaseStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *ReleaseStatusResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
-func (m *ReleaseStatusResponse) GetInfo() *hapi_release3.Info {
-	if m != nil {
-		return m.Info
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Result)(nil), "hapi.services.rudder.Result")
-	proto.RegisterType((*VersionReleaseRequest)(nil), "hapi.services.rudder.VersionReleaseRequest")
-	proto.RegisterType((*VersionReleaseResponse)(nil), "hapi.services.rudder.VersionReleaseResponse")
-	proto.RegisterType((*InstallReleaseRequest)(nil), "hapi.services.rudder.InstallReleaseRequest")
-	proto.RegisterType((*InstallReleaseResponse)(nil), "hapi.services.rudder.InstallReleaseResponse")
-	proto.RegisterType((*DeleteReleaseRequest)(nil), "hapi.services.rudder.DeleteReleaseRequest")
-	proto.RegisterType((*DeleteReleaseResponse)(nil), "hapi.services.rudder.DeleteReleaseResponse")
-	proto.RegisterType((*UpgradeReleaseRequest)(nil), "hapi.services.rudder.UpgradeReleaseRequest")
-	proto.RegisterType((*UpgradeReleaseResponse)(nil), "hapi.services.rudder.UpgradeReleaseResponse")
-	proto.RegisterType((*RollbackReleaseRequest)(nil), "hapi.services.rudder.RollbackReleaseRequest")
-	proto.RegisterType((*RollbackReleaseResponse)(nil), "hapi.services.rudder.RollbackReleaseResponse")
-	proto.RegisterType((*ReleaseStatusRequest)(nil), "hapi.services.rudder.ReleaseStatusRequest")
-	proto.RegisterType((*ReleaseStatusResponse)(nil), "hapi.services.rudder.ReleaseStatusResponse")
-	proto.RegisterEnum("hapi.services.rudder.Result_Status", Result_Status_name, Result_Status_value)
-}
-
-func init() { proto.RegisterFile("hapi/rudder/rudder.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 597 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x5f, 0x8f, 0xd2, 0x4e,
-	0x14, 0xa5, 0xb0, 0x14, 0xb8, 0x64, 0x7f, 0x3f, 0x32, 0xa1, 0xd0, 0x34, 0x3e, 0x90, 0x3e, 0x18,
-	0xe2, 0xba, 0x25, 0x41, 0x1f, 0x7d, 0x51, 0x96, 0xfd, 0x13, 0x23, 0x9b, 0x0c, 0xe2, 0x26, 0xbe,
-	0x75, 0xe1, 0x82, 0xd5, 0xd2, 0xd6, 0xe9, 0x74, 0x1f, 0xd5, 0x4f, 0xe3, 0x57, 0xd2, 0x8f, 0x63,
-	0xda, 0x69, 0x89, 0xad, 0xd3, 0x88, 0x6b, 0xc2, 0x83, 0x4f, 0x9d, 0xe9, 0x3d, 0xdc, 0x39, 0xe7,
-	0xf4, 0xce, 0x09, 0xa0, 0xbf, 0xb3, 0x03, 0x67, 0xc4, 0xa2, 0xd5, 0x0a, 0x59, 0xfa, 0xb0, 0x02,
-	0xe6, 0x73, 0x9f, 0x74, 0xe3, 0x8a, 0x15, 0x22, 0xbb, 0x73, 0x96, 0x18, 0x5a, 0xa2, 0x66, 0xf4,
-	0x05, 0x1e, 0x5d, 0xb4, 0x43, 0x1c, 0x39, 0xde, 0xda, 0x17, 0x70, 0xc3, 0xc8, 0x15, 0xd2, 0xa7,
-	0xa8, 0x99, 0x2e, 0xa8, 0x14, 0xc3, 0xc8, 0xe5, 0x84, 0xc0, 0x51, 0xfc, 0x1b, 0x5d, 0x19, 0x28,
-	0xc3, 0x16, 0x4d, 0xd6, 0xa4, 0x03, 0x35, 0xd7, 0xdf, 0xe8, 0xd5, 0x41, 0x6d, 0xd8, 0xa2, 0xf1,
-	0xd2, 0x7c, 0x06, 0xea, 0x9c, 0xdb, 0x3c, 0x0a, 0x49, 0x1b, 0x1a, 0x8b, 0xd9, 0xcb, 0xd9, 0xf5,
-	0xcd, 0xac, 0x53, 0x89, 0x37, 0xf3, 0xc5, 0x64, 0x32, 0x9d, 0xcf, 0x3b, 0x0a, 0x39, 0x86, 0xd6,
-	0x62, 0x36, 0xb9, 0x7c, 0x3e, 0xbb, 0x98, 0x9e, 0x75, 0xaa, 0xa4, 0x05, 0xf5, 0x29, 0xa5, 0xd7,
-	0xb4, 0x53, 0x33, 0xfb, 0xa0, 0xbd, 0x41, 0x16, 0x3a, 0xbe, 0x47, 0x05, 0x0b, 0x8a, 0x1f, 0x23,
-	0x0c, 0xb9, 0x79, 0x0e, 0xbd, 0x62, 0x21, 0x0c, 0x7c, 0x2f, 0xc4, 0x98, 0x96, 0x67, 0x6f, 0x31,
-	0xa3, 0x15, 0xaf, 0x89, 0x0e, 0x8d, 0x3b, 0x81, 0xd6, 0xab, 0xc9, 0xeb, 0x6c, 0x6b, 0x5e, 0x82,
-	0x76, 0xe5, 0x85, 0xdc, 0x76, 0xdd, 0xfc, 0x01, 0x64, 0x04, 0x8d, 0x54, 0x78, 0xd2, 0xa9, 0x3d,
-	0xd6, 0xac, 0xc4, 0xc4, 0xcc, 0x8d, 0x0c, 0x9e, 0xa1, 0xcc, 0xcf, 0xd0, 0x2b, 0x76, 0x4a, 0x19,
-	0xfd, 0x69, 0x2b, 0xf2, 0x14, 0x54, 0x96, 0x78, 0x9c, 0xb0, 0x6d, 0x8f, 0x1f, 0x58, 0xb2, 0xef,
-	0x67, 0x89, 0xef, 0x40, 0x53, 0xac, 0x79, 0x01, 0xdd, 0x33, 0x74, 0x91, 0xe3, 0xdf, 0x2a, 0xf9,
-	0x04, 0x5a, 0xa1, 0xd1, 0x61, 0x85, 0x7c, 0x53, 0x40, 0x5b, 0x04, 0x1b, 0x66, 0xaf, 0x24, 0x52,
-	0x96, 0x11, 0x63, 0xe8, 0xf1, 0xdf, 0x10, 0x48, 0x51, 0xe4, 0x14, 0x54, 0x6e, 0xb3, 0x0d, 0x66,
-	0x04, 0x4a, 0xf0, 0x29, 0x28, 0x9e, 0x93, 0xd7, 0xce, 0x16, 0xfd, 0x88, 0xeb, 0xb5, 0x81, 0x32,
-	0xac, 0xd1, 0x6c, 0x1b, 0x4f, 0xd5, 0x8d, 0xed, 0x70, 0xfd, 0x68, 0xa0, 0x0c, 0x9b, 0x34, 0x59,
-	0x13, 0x03, 0x9a, 0x14, 0x97, 0x0c, 0x6d, 0x8e, 0x7a, 0x3d, 0x79, 0xbf, 0xdb, 0x93, 0x2e, 0xd4,
-	0xcf, 0x7d, 0xb6, 0x44, 0x5d, 0x4d, 0x0a, 0x62, 0x13, 0xcf, 0x48, 0x51, 0xd8, 0x61, 0xad, 0xfd,
-	0xae, 0x40, 0x8f, 0xfa, 0xae, 0x7b, 0x6b, 0x2f, 0x3f, 0xfc, 0x63, 0xde, 0x7e, 0x51, 0xa0, 0xff,
-	0x8b, 0xb4, 0x83, 0xdf, 0xc0, 0xb4, 0x93, 0x88, 0xbc, 0x7b, 0xdf, 0xc0, 0x00, 0xb4, 0x42, 0xa3,
-	0xfb, 0x0a, 0x79, 0x98, 0x86, 0xb4, 0x90, 0x41, 0xf2, 0xe8, 0x2b, 0x6f, 0xed, 0x8b, 0xe0, 0x1e,
-	0x7f, 0xad, 0xef, 0xb8, 0xbf, 0xf2, 0x57, 0x91, 0x8b, 0x73, 0x21, 0x95, 0xac, 0xa1, 0x91, 0x06,
-	0x2d, 0x39, 0x91, 0x9b, 0x20, 0x0d, 0x68, 0xe3, 0xf1, 0x7e, 0x60, 0xa1, 0xcb, 0xac, 0x90, 0x2d,
-	0xfc, 0x97, 0x8f, 0xcf, 0xb2, 0xe3, 0xa4, 0x71, 0x5d, 0x76, 0x9c, 0x3c, 0x91, 0xcd, 0x0a, 0x79,
-	0x0f, 0xc7, 0xb9, 0x8c, 0x23, 0x8f, 0xe4, 0x0d, 0x64, 0x89, 0x6a, 0x9c, 0xec, 0x85, 0xdd, 0x9d,
-	0x15, 0xc0, 0xff, 0x85, 0xc1, 0x24, 0x25, 0x74, 0xe5, 0x57, 0xd3, 0x38, 0xdd, 0x13, 0xfd, 0xb3,
-	0x99, 0xf9, 0x9c, 0x29, 0x33, 0x53, 0x1a, 0xb3, 0x65, 0x66, 0xca, 0xa3, 0x4b, 0x98, 0x99, 0x1b,
-	0xd7, 0x32, 0x33, 0x65, 0x97, 0xa3, 0xcc, 0x4c, 0xe9, 0xfc, 0x9b, 0x95, 0x17, 0xcd, 0xb7, 0xaa,
-	0x40, 0xdc, 0xaa, 0xc9, 0x1f, 0x92, 0x27, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xa5, 0x37,
-	0x75, 0xf7, 0x08, 0x00, 0x00,
-}
diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go
index 8a52fff93..d0387643e 100644
--- a/pkg/proto/hapi/services/tiller.pb.go
+++ b/pkg/proto/hapi/services/tiller.pb.go
@@ -14,19 +14,12 @@ It has these top-level messages:
 	GetReleaseStatusRequest
 	GetReleaseStatusResponse
 	GetReleaseContentRequest
-	GetReleaseContentResponse
 	UpdateReleaseRequest
-	UpdateReleaseResponse
 	RollbackReleaseRequest
-	RollbackReleaseResponse
 	InstallReleaseRequest
-	InstallReleaseResponse
 	UninstallReleaseRequest
 	UninstallReleaseResponse
-	GetVersionRequest
-	GetVersionResponse
 	GetHistoryRequest
-	GetHistoryResponse
 	TestReleaseRequest
 	TestReleaseResponse
 */
@@ -41,7 +34,6 @@ import hapi_release5 "k8s.io/helm/pkg/proto/hapi/release"
 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"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -327,24 +319,6 @@ func (m *GetReleaseContentRequest) GetVersion() int32 {
 	return 0
 }
 
-// GetReleaseContentResponse is a response containing the contents of a release.
-type GetReleaseContentResponse struct {
-	// The release content
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *GetReleaseContentResponse) Reset()                    { *m = GetReleaseContentResponse{} }
-func (m *GetReleaseContentResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetReleaseContentResponse) ProtoMessage()               {}
-func (*GetReleaseContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *GetReleaseContentResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
 // UpdateReleaseRequest updates a release.
 type UpdateReleaseRequest struct {
 	// The name of the release
@@ -376,7 +350,7 @@ type UpdateReleaseRequest struct {
 func (m *UpdateReleaseRequest) Reset()                    { *m = UpdateReleaseRequest{} }
 func (m *UpdateReleaseRequest) String() string            { return proto.CompactTextString(m) }
 func (*UpdateReleaseRequest) ProtoMessage()               {}
-func (*UpdateReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+func (*UpdateReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
 func (m *UpdateReleaseRequest) GetName() string {
 	if m != nil {
@@ -455,23 +429,6 @@ func (m *UpdateReleaseRequest) GetForce() bool {
 	return false
 }
 
-// UpdateReleaseResponse is the response to an update request.
-type UpdateReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *UpdateReleaseResponse) Reset()                    { *m = UpdateReleaseResponse{} }
-func (m *UpdateReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*UpdateReleaseResponse) ProtoMessage()               {}
-func (*UpdateReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *UpdateReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
 type RollbackReleaseRequest struct {
 	// The name of the release
 	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
@@ -495,7 +452,7 @@ type RollbackReleaseRequest struct {
 func (m *RollbackReleaseRequest) Reset()                    { *m = RollbackReleaseRequest{} }
 func (m *RollbackReleaseRequest) String() string            { return proto.CompactTextString(m) }
 func (*RollbackReleaseRequest) ProtoMessage()               {}
-func (*RollbackReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+func (*RollbackReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
 func (m *RollbackReleaseRequest) GetName() string {
 	if m != nil {
@@ -553,23 +510,6 @@ func (m *RollbackReleaseRequest) GetForce() bool {
 	return false
 }
 
-// RollbackReleaseResponse is the response to an update request.
-type RollbackReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *RollbackReleaseResponse) Reset()                    { *m = RollbackReleaseResponse{} }
-func (m *RollbackReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*RollbackReleaseResponse) ProtoMessage()               {}
-func (*RollbackReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-func (m *RollbackReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
 // InstallReleaseRequest is the request for an installation of a chart.
 type InstallReleaseRequest struct {
 	// Chart is the protobuf representation of a chart.
@@ -600,7 +540,7 @@ type InstallReleaseRequest struct {
 func (m *InstallReleaseRequest) Reset()                    { *m = InstallReleaseRequest{} }
 func (m *InstallReleaseRequest) String() string            { return proto.CompactTextString(m) }
 func (*InstallReleaseRequest) ProtoMessage()               {}
-func (*InstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+func (*InstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
 func (m *InstallReleaseRequest) GetChart() *hapi_chart3.Chart {
 	if m != nil {
@@ -665,23 +605,6 @@ func (m *InstallReleaseRequest) GetWait() bool {
 	return false
 }
 
-// InstallReleaseResponse is the response from a release installation.
-type InstallReleaseResponse struct {
-	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
-}
-
-func (m *InstallReleaseResponse) Reset()                    { *m = InstallReleaseResponse{} }
-func (m *InstallReleaseResponse) String() string            { return proto.CompactTextString(m) }
-func (*InstallReleaseResponse) ProtoMessage()               {}
-func (*InstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *InstallReleaseResponse) GetRelease() *hapi_release5.Release {
-	if m != nil {
-		return m.Release
-	}
-	return nil
-}
-
 // UninstallReleaseRequest represents a request to uninstall a named release.
 type UninstallReleaseRequest struct {
 	// Name is the name of the release to delete.
@@ -697,7 +620,7 @@ type UninstallReleaseRequest struct {
 func (m *UninstallReleaseRequest) Reset()                    { *m = UninstallReleaseRequest{} }
 func (m *UninstallReleaseRequest) String() string            { return proto.CompactTextString(m) }
 func (*UninstallReleaseRequest) ProtoMessage()               {}
-func (*UninstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (*UninstallReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
 func (m *UninstallReleaseRequest) GetName() string {
 	if m != nil {
@@ -738,7 +661,7 @@ type UninstallReleaseResponse struct {
 func (m *UninstallReleaseResponse) Reset()                    { *m = UninstallReleaseResponse{} }
 func (m *UninstallReleaseResponse) String() string            { return proto.CompactTextString(m) }
 func (*UninstallReleaseResponse) ProtoMessage()               {}
-func (*UninstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (*UninstallReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
 func (m *UninstallReleaseResponse) GetRelease() *hapi_release5.Release {
 	if m != nil {
@@ -754,31 +677,6 @@ func (m *UninstallReleaseResponse) GetInfo() string {
 	return ""
 }
 
-// GetVersionRequest requests for version information.
-type GetVersionRequest struct {
-}
-
-func (m *GetVersionRequest) Reset()                    { *m = GetVersionRequest{} }
-func (m *GetVersionRequest) String() string            { return proto.CompactTextString(m) }
-func (*GetVersionRequest) ProtoMessage()               {}
-func (*GetVersionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-type GetVersionResponse struct {
-	Version *hapi_version.Version `protobuf:"bytes,1,opt,name=Version" json:"Version,omitempty"`
-}
-
-func (m *GetVersionResponse) Reset()                    { *m = GetVersionResponse{} }
-func (m *GetVersionResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetVersionResponse) ProtoMessage()               {}
-func (*GetVersionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-func (m *GetVersionResponse) GetVersion() *hapi_version.Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
 // GetHistoryRequest requests a release's history.
 type GetHistoryRequest struct {
 	// The name of the release.
@@ -790,7 +688,7 @@ type GetHistoryRequest struct {
 func (m *GetHistoryRequest) Reset()                    { *m = GetHistoryRequest{} }
 func (m *GetHistoryRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetHistoryRequest) ProtoMessage()               {}
-func (*GetHistoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (*GetHistoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
 
 func (m *GetHistoryRequest) GetName() string {
 	if m != nil {
@@ -806,23 +704,6 @@ func (m *GetHistoryRequest) GetMax() int32 {
 	return 0
 }
 
-// GetHistoryResponse is received in response to a GetHistory rpc.
-type GetHistoryResponse struct {
-	Releases []*hapi_release5.Release `protobuf:"bytes,1,rep,name=releases" json:"releases,omitempty"`
-}
-
-func (m *GetHistoryResponse) Reset()                    { *m = GetHistoryResponse{} }
-func (m *GetHistoryResponse) String() string            { return proto.CompactTextString(m) }
-func (*GetHistoryResponse) ProtoMessage()               {}
-func (*GetHistoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-func (m *GetHistoryResponse) GetReleases() []*hapi_release5.Release {
-	if m != nil {
-		return m.Releases
-	}
-	return nil
-}
-
 // TestReleaseRequest is a request to get the status of a release.
 type TestReleaseRequest struct {
 	// Name is the name of the release
@@ -836,7 +717,7 @@ type TestReleaseRequest struct {
 func (m *TestReleaseRequest) Reset()                    { *m = TestReleaseRequest{} }
 func (m *TestReleaseRequest) String() string            { return proto.CompactTextString(m) }
 func (*TestReleaseRequest) ProtoMessage()               {}
-func (*TestReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+func (*TestReleaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
 
 func (m *TestReleaseRequest) GetName() string {
 	if m != nil {
@@ -868,7 +749,7 @@ type TestReleaseResponse struct {
 func (m *TestReleaseResponse) Reset()                    { *m = TestReleaseResponse{} }
 func (m *TestReleaseResponse) String() string            { return proto.CompactTextString(m) }
 func (*TestReleaseResponse) ProtoMessage()               {}
-func (*TestReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
+func (*TestReleaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
 
 func (m *TestReleaseResponse) GetMsg() string {
 	if m != nil {
@@ -891,19 +772,12 @@ func init() {
 	proto.RegisterType((*GetReleaseStatusRequest)(nil), "hapi.services.tiller.GetReleaseStatusRequest")
 	proto.RegisterType((*GetReleaseStatusResponse)(nil), "hapi.services.tiller.GetReleaseStatusResponse")
 	proto.RegisterType((*GetReleaseContentRequest)(nil), "hapi.services.tiller.GetReleaseContentRequest")
-	proto.RegisterType((*GetReleaseContentResponse)(nil), "hapi.services.tiller.GetReleaseContentResponse")
 	proto.RegisterType((*UpdateReleaseRequest)(nil), "hapi.services.tiller.UpdateReleaseRequest")
-	proto.RegisterType((*UpdateReleaseResponse)(nil), "hapi.services.tiller.UpdateReleaseResponse")
 	proto.RegisterType((*RollbackReleaseRequest)(nil), "hapi.services.tiller.RollbackReleaseRequest")
-	proto.RegisterType((*RollbackReleaseResponse)(nil), "hapi.services.tiller.RollbackReleaseResponse")
 	proto.RegisterType((*InstallReleaseRequest)(nil), "hapi.services.tiller.InstallReleaseRequest")
-	proto.RegisterType((*InstallReleaseResponse)(nil), "hapi.services.tiller.InstallReleaseResponse")
 	proto.RegisterType((*UninstallReleaseRequest)(nil), "hapi.services.tiller.UninstallReleaseRequest")
 	proto.RegisterType((*UninstallReleaseResponse)(nil), "hapi.services.tiller.UninstallReleaseResponse")
-	proto.RegisterType((*GetVersionRequest)(nil), "hapi.services.tiller.GetVersionRequest")
-	proto.RegisterType((*GetVersionResponse)(nil), "hapi.services.tiller.GetVersionResponse")
 	proto.RegisterType((*GetHistoryRequest)(nil), "hapi.services.tiller.GetHistoryRequest")
-	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.RegisterEnum("hapi.services.tiller.ListSort_SortBy", ListSort_SortBy_name, ListSort_SortBy_value)
@@ -913,82 +787,65 @@ func init() {
 func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 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,
+	// 948 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x5f, 0x6f, 0x1b, 0x45,
+	0x10, 0xe7, 0x7c, 0xf6, 0xd9, 0x1e, 0xa7, 0x91, 0xb3, 0x75, 0x93, 0x6b, 0x28, 0xc8, 0x1c, 0x02,
+	0x2c, 0x1e, 0x1c, 0x61, 0x78, 0x41, 0x42, 0x48, 0xa9, 0x6b, 0x25, 0x15, 0xc1, 0x95, 0xd6, 0x0d,
+	0x48, 0x08, 0xb0, 0x2e, 0xf6, 0x38, 0x39, 0xf5, 0x7c, 0x6b, 0x76, 0xf7, 0x42, 0xfd, 0xca, 0x1b,
+	0x1f, 0x85, 0x6f, 0xc1, 0x77, 0x81, 0x0f, 0x82, 0xf6, 0x9f, 0xb9, 0x4b, 0xdc, 0x10, 0xfa, 0x72,
+	0xde, 0xd9, 0xf9, 0xb3, 0xbf, 0xf9, 0xcd, 0xec, 0xac, 0xe1, 0xf0, 0x2a, 0x5e, 0x25, 0x47, 0x02,
+	0xf9, 0x75, 0x32, 0x43, 0x71, 0x24, 0x93, 0x34, 0x45, 0xde, 0x5f, 0x71, 0x26, 0x19, 0xe9, 0x28,
+	0x5d, 0xdf, 0xe9, 0xfa, 0x46, 0x77, 0xb8, 0xaf, 0x3d, 0x66, 0x57, 0x31, 0x97, 0xe6, 0x6b, 0xac,
+	0x0f, 0x0f, 0x8a, 0xfb, 0x2c, 0x5b, 0x24, 0x97, 0x56, 0x61, 0x8e, 0xe0, 0x98, 0x62, 0x2c, 0xd0,
+	0xfd, 0x96, 0x9c, 0x9c, 0x2e, 0xc9, 0x16, 0xcc, 0x2a, 0xde, 0x2d, 0x29, 0x24, 0x0a, 0x39, 0xe5,
+	0x79, 0x66, 0x95, 0x8f, 0x4b, 0x4a, 0x21, 0x63, 0x99, 0x0b, 0xa3, 0x8a, 0xfe, 0xac, 0xc0, 0xc3,
+	0xb3, 0x44, 0x48, 0x6a, 0x94, 0x82, 0xe2, 0x2f, 0x39, 0x0a, 0x49, 0x3a, 0x50, 0x4b, 0x93, 0x65,
+	0x22, 0x43, 0xaf, 0xeb, 0xf5, 0x7c, 0x6a, 0x04, 0xb2, 0x0f, 0x01, 0x5b, 0x2c, 0x04, 0xca, 0xb0,
+	0xd2, 0xf5, 0x7a, 0x4d, 0x6a, 0x25, 0xf2, 0x35, 0xd4, 0x05, 0xe3, 0x72, 0x7a, 0xb1, 0x0e, 0xfd,
+	0xae, 0xd7, 0xdb, 0x1d, 0x7c, 0xd4, 0xdf, 0xc6, 0x45, 0x5f, 0x9d, 0x34, 0x61, 0x5c, 0xf6, 0xd5,
+	0xe7, 0xe9, 0x9a, 0x06, 0x42, 0xff, 0xaa, 0xb8, 0x8b, 0x24, 0x95, 0xc8, 0xc3, 0xaa, 0x89, 0x6b,
+	0x24, 0x72, 0x02, 0xa0, 0xe3, 0x32, 0x3e, 0x47, 0x1e, 0xd6, 0x74, 0xe8, 0xde, 0x3d, 0x42, 0xbf,
+	0x50, 0xf6, 0xb4, 0x29, 0xdc, 0x92, 0x7c, 0x05, 0x3b, 0x26, 0xed, 0xe9, 0x8c, 0xcd, 0x51, 0x84,
+	0x41, 0xd7, 0xef, 0xed, 0x0e, 0x1e, 0x9b, 0x50, 0x8e, 0xe2, 0x89, 0x21, 0x66, 0xc8, 0xe6, 0x48,
+	0x5b, 0xc6, 0x5c, 0xad, 0x05, 0x79, 0x02, 0xcd, 0x2c, 0x5e, 0xa2, 0x58, 0xc5, 0x33, 0x0c, 0xeb,
+	0x1a, 0xe1, 0xbf, 0x1b, 0xd1, 0xcf, 0xd0, 0x70, 0x87, 0x47, 0x03, 0x08, 0x4c, 0x6a, 0xa4, 0x05,
+	0xf5, 0xf3, 0xf1, 0x37, 0xe3, 0x17, 0xdf, 0x8f, 0xdb, 0xef, 0x90, 0x06, 0x54, 0xc7, 0xc7, 0xdf,
+	0x8e, 0xda, 0x1e, 0xd9, 0x83, 0x07, 0x67, 0xc7, 0x93, 0x97, 0x53, 0x3a, 0x3a, 0x1b, 0x1d, 0x4f,
+	0x46, 0xcf, 0xda, 0x95, 0xe8, 0x7d, 0x68, 0x6e, 0x30, 0x93, 0x3a, 0xf8, 0xc7, 0x93, 0xa1, 0x71,
+	0x79, 0x36, 0x9a, 0x0c, 0xdb, 0x5e, 0xf4, 0xbb, 0x07, 0x9d, 0x72, 0x89, 0xc4, 0x8a, 0x65, 0x02,
+	0x55, 0x8d, 0x66, 0x2c, 0xcf, 0x36, 0x35, 0xd2, 0x02, 0x21, 0x50, 0xcd, 0xf0, 0xb5, 0xab, 0x90,
+	0x5e, 0x2b, 0x4b, 0xc9, 0x64, 0x9c, 0xea, 0xea, 0xf8, 0xd4, 0x08, 0xe4, 0x33, 0x68, 0xd8, 0xd4,
+	0x45, 0x58, 0xed, 0xfa, 0xbd, 0xd6, 0xe0, 0x51, 0x99, 0x10, 0x7b, 0x22, 0xdd, 0x98, 0x45, 0x27,
+	0x70, 0x70, 0x82, 0x0e, 0x89, 0xe1, 0xcb, 0x75, 0x8c, 0x3a, 0x37, 0x5e, 0xa2, 0x06, 0xa3, 0xce,
+	0x8d, 0x97, 0x48, 0x42, 0xa8, 0x5f, 0x23, 0x17, 0x09, 0xcb, 0x34, 0x9c, 0x1a, 0x75, 0x62, 0x24,
+	0x21, 0xbc, 0x1d, 0xc8, 0xe6, 0xb5, 0x2d, 0xd2, 0xc7, 0x50, 0x55, 0xdd, 0xae, 0xc3, 0xb4, 0x06,
+	0xa4, 0x8c, 0xf3, 0x79, 0xb6, 0x60, 0x54, 0xeb, 0xcb, 0xa5, 0xf2, 0x6f, 0x96, 0xea, 0xb4, 0x78,
+	0xea, 0x90, 0x65, 0x12, 0x33, 0xf9, 0x76, 0xf8, 0xff, 0xaa, 0x40, 0xe7, 0x7c, 0x35, 0x8f, 0x25,
+	0x3a, 0x92, 0xee, 0x08, 0xf3, 0x09, 0xd4, 0xf4, 0x3d, 0xb7, 0xe8, 0xf7, 0x0c, 0x7a, 0x33, 0x0c,
+	0x86, 0xea, 0x4b, 0x8d, 0x9e, 0x7c, 0x0a, 0xc1, 0x75, 0x9c, 0xe6, 0x28, 0x34, 0xf4, 0x4d, 0x9e,
+	0xd6, 0x52, 0x0f, 0x09, 0x6a, 0x2d, 0xc8, 0x01, 0xd4, 0xe7, 0x7c, 0xad, 0x6e, 0xb9, 0xbe, 0x34,
+	0x0d, 0x1a, 0xcc, 0xf9, 0x9a, 0xe6, 0x19, 0xf9, 0x10, 0x1e, 0xcc, 0x13, 0x11, 0x5f, 0xa4, 0x38,
+	0xbd, 0x62, 0xec, 0x95, 0xd0, 0xf7, 0xa6, 0x41, 0x77, 0xec, 0xe6, 0xa9, 0xda, 0x23, 0x87, 0xaa,
+	0xf6, 0x33, 0x8e, 0xb1, 0xc4, 0x30, 0xd0, 0xfa, 0x8d, 0xac, 0xb2, 0x96, 0xc9, 0x12, 0x59, 0x2e,
+	0x75, 0xb3, 0xfb, 0xd4, 0x89, 0xe4, 0x03, 0xd8, 0xe1, 0x28, 0x50, 0x4e, 0x2d, 0xca, 0x86, 0xf6,
+	0x6c, 0xe9, 0xbd, 0xef, 0x0c, 0x2c, 0x02, 0xd5, 0x5f, 0xe3, 0x44, 0x86, 0x4d, 0xad, 0xd2, 0x6b,
+	0xe3, 0x96, 0x0b, 0x74, 0x6e, 0xe0, 0xdc, 0x72, 0x81, 0xd6, 0xad, 0x03, 0xb5, 0x05, 0xe3, 0x33,
+	0x0c, 0x5b, 0x5a, 0x67, 0x84, 0xe8, 0x6f, 0x0f, 0xf6, 0x29, 0x4b, 0xd3, 0x8b, 0x78, 0xf6, 0xea,
+	0x1e, 0x3c, 0x17, 0x28, 0xa9, 0xdc, 0x4d, 0x89, 0xbf, 0x85, 0x92, 0x42, 0xb1, 0xab, 0xa5, 0x62,
+	0x97, 0xc8, 0xaa, 0xbd, 0x99, 0xac, 0xa0, 0x4c, 0x96, 0x63, 0xa2, 0x5e, 0x60, 0x62, 0x93, 0x66,
+	0xa3, 0x98, 0xe6, 0x1f, 0x15, 0x78, 0xf4, 0x3c, 0x13, 0x32, 0x4e, 0xd3, 0x1b, 0x59, 0x6e, 0x3a,
+	0xc7, 0xbb, 0x77, 0xe7, 0x54, 0xfe, 0x4f, 0xe7, 0xf8, 0x25, 0x9a, 0x1c, 0xa7, 0xd5, 0x02, 0xa7,
+	0xf7, 0xea, 0xa6, 0xd2, 0xad, 0x0b, 0x6e, 0xdc, 0x3a, 0xf2, 0x1e, 0x80, 0x29, 0xbf, 0x0e, 0x6e,
+	0xe8, 0x68, 0xea, 0x9d, 0xb1, 0xbd, 0x64, 0x8e, 0xc1, 0xc6, 0x76, 0x06, 0x0b, 0xbd, 0x14, 0xfd,
+	0xe6, 0xc1, 0xc1, 0x79, 0x96, 0x6c, 0x65, 0x6b, 0x5b, 0x4f, 0xdc, 0xc2, 0x5f, 0xd9, 0x82, 0xbf,
+	0x03, 0xb5, 0x55, 0xce, 0x2f, 0xd1, 0xf2, 0x61, 0x84, 0x22, 0xb0, 0x6a, 0x09, 0x58, 0x34, 0x85,
+	0xf0, 0x36, 0x06, 0x3b, 0xbd, 0x8e, 0xa0, 0x6e, 0xe7, 0x92, 0x2d, 0xda, 0x1b, 0x86, 0xaa, 0xb3,
+	0x52, 0xa8, 0x37, 0xa3, 0xad, 0x69, 0xc6, 0x58, 0xf4, 0x25, 0xec, 0x9d, 0xa0, 0x3c, 0x4d, 0x84,
+	0x64, 0x7c, 0x7d, 0x57, 0x7a, 0x6d, 0xf0, 0x97, 0xf1, 0x6b, 0x3b, 0x9d, 0xd4, 0x32, 0xfa, 0x11,
+	0xc8, 0x4b, 0xdc, 0xbc, 0x16, 0xff, 0x31, 0xdd, 0x5c, 0x7e, 0x95, 0x32, 0xf1, 0x21, 0xd4, 0x67,
+	0x29, 0xc6, 0x59, 0xbe, 0xb2, 0x8c, 0x38, 0x31, 0xfa, 0x09, 0x1e, 0x96, 0xa2, 0xdb, 0xa4, 0x15,
+	0x0c, 0x71, 0x69, 0xa3, 0xab, 0x25, 0xf9, 0x02, 0x02, 0xf3, 0x84, 0xea, 0xd8, 0xbb, 0x83, 0x27,
+	0x65, 0x16, 0x74, 0x90, 0x3c, 0xb3, 0x6f, 0x2e, 0xb5, 0xb6, 0x4f, 0xe1, 0x87, 0x86, 0x7b, 0xd8,
+	0x2f, 0x02, 0xfd, 0x0f, 0xe5, 0xf3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x31, 0x61, 0x13, 0xb4,
+	0x73, 0x09, 0x00, 0x00,
 }
diff --git a/pkg/proto/hapi/version/version.pb.go b/pkg/proto/hapi/version/version.pb.go
deleted file mode 100644
index 13c8568f0..000000000
--- a/pkg/proto/hapi/version/version.pb.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: hapi/version/version.proto
-
-/*
-Package version is a generated protocol buffer package.
-
-It is generated from these files:
-	hapi/version/version.proto
-
-It has these top-level messages:
-	Version
-*/
-package version
-
-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 Version struct {
-	// Sem ver string for the version
-	SemVer       string `protobuf:"bytes,1,opt,name=sem_ver,json=semVer" json:"sem_ver,omitempty"`
-	GitCommit    string `protobuf:"bytes,2,opt,name=git_commit,json=gitCommit" json:"git_commit,omitempty"`
-	GitTreeState string `protobuf:"bytes,3,opt,name=git_tree_state,json=gitTreeState" json:"git_tree_state,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 fileDescriptor0, []int{0} }
-
-func (m *Version) GetSemVer() string {
-	if m != nil {
-		return m.SemVer
-	}
-	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 init() {
-	proto.RegisterType((*Version)(nil), "hapi.version.Version")
-}
-
-func init() { proto.RegisterFile("hapi/version/version.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 151 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x48, 0x2c, 0xc8,
-	0xd4, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9,
-	0x42, 0x3c, 0x20, 0x39, 0x3d, 0xa8, 0x98, 0x52, 0x3a, 0x17, 0x7b, 0x18, 0x84, 0x29, 0x24, 0xce,
-	0xc5, 0x5e, 0x9c, 0x9a, 0x1b, 0x5f, 0x96, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4,
-	0x56, 0x9c, 0x9a, 0x1b, 0x96, 0x5a, 0x24, 0x24, 0xcb, 0xc5, 0x95, 0x9e, 0x59, 0x12, 0x9f, 0x9c,
-	0x9f, 0x9b, 0x9b, 0x59, 0x22, 0xc1, 0x04, 0x96, 0xe3, 0x4c, 0xcf, 0x2c, 0x71, 0x06, 0x0b, 0x08,
-	0xa9, 0x70, 0xf1, 0x81, 0xa4, 0x4b, 0x8a, 0x52, 0x53, 0xe3, 0x8b, 0x4b, 0x12, 0x4b, 0x52, 0x25,
-	0x98, 0xc1, 0x4a, 0x78, 0xd2, 0x33, 0x4b, 0x42, 0x8a, 0x52, 0x53, 0x83, 0x41, 0x62, 0x4e, 0x9c,
-	0x51, 0xec, 0x50, 0x3b, 0x93, 0xd8, 0xc0, 0x0e, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x20,
-	0xcc, 0x0e, 0x1b, 0xa6, 0x00, 0x00, 0x00,
-}
diff --git a/pkg/tiller/release_install_test.go b/pkg/tiller/release_install_test.go
index 9effc625d..7f55ad62a 100644
--- a/pkg/tiller/release_install_test.go
+++ b/pkg/tiller/release_install_test.go
@@ -23,7 +23,6 @@ import (
 
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
-	"k8s.io/helm/pkg/version"
 )
 
 func TestInstallRelease(t *testing.T) {
@@ -198,37 +197,6 @@ func TestInstallRelease_WithNotesRendered(t *testing.T) {
 	}
 }
 
-func TestInstallRelease_TillerVersion(t *testing.T) {
-	version.Version = "2.2.0"
-	rs := rsFixture()
-
-	req := installRequest(
-		withChart(withTiller(">=2.2.0")),
-	)
-	_, err := rs.InstallRelease(req)
-	if err != nil {
-		t.Fatalf("Expected valid range. Got %q", err)
-	}
-}
-
-func TestInstallRelease_WrongTillerVersion(t *testing.T) {
-	version.Version = "2.2.0"
-	rs := rsFixture()
-
-	req := installRequest(
-		withChart(withTiller("<2.0.0")),
-	)
-	_, err := rs.InstallRelease(req)
-	if err == nil {
-		t.Fatalf("Expected to fail because of wrong version")
-	}
-
-	expect := "Chart incompatible with Tiller"
-	if !strings.Contains(err.Error(), expect) {
-		t.Errorf("Expected %q to contain %q", err.Error(), expect)
-	}
-}
-
 func TestInstallRelease_WithChartAndDependencyNotes(t *testing.T) {
 	rs := rsFixture()
 
diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go
index d68fa83e4..1a5571013 100644
--- a/pkg/tiller/release_server_test.go
+++ b/pkg/tiller/release_server_test.go
@@ -133,12 +133,6 @@ func withKube(version string) chartOption {
 	}
 }
 
-func withTiller(version string) chartOption {
-	return func(opts *chartOptions) {
-		opts.Metadata.TillerVersion = version
-	}
-}
-
 func withDependency(dependencyOpts ...chartOption) chartOption {
 	return func(opts *chartOptions) {
 		opts.Dependencies = append(opts.Dependencies, buildChart(dependencyOpts...))
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 6f5a1a452..255ca22cd 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -16,8 +16,6 @@ limitations under the License.
 
 package version // import "k8s.io/helm/pkg/version"
 
-import "k8s.io/helm/pkg/proto/hapi/version"
-
 var (
 	// Version is the current version of the Helm.
 	// Update this whenever making a new release.
@@ -26,7 +24,7 @@ var (
 	// Increment major number for new feature additions and behavioral changes.
 	// Increment minor number for bug fixes and performance enhancements.
 	// Increment patch number for critical fixes to existing releases.
-	Version = "v2.8"
+	version = "v2.8"
 
 	// BuildMetadata is extra build time data
 	BuildMetadata = "unreleased"
@@ -39,14 +37,21 @@ var (
 // GetVersion returns the semver string of the version
 func GetVersion() string {
 	if BuildMetadata == "" {
-		return Version
+		return version
 	}
-	return Version + "+" + BuildMetadata
+	return version + "+" + BuildMetadata
+}
+
+type Version struct {
+	// Sem ver string for the version
+	SemVer       string `json:"sem_ver,omitempty"`
+	GitCommit    string `json:"git_commit,omitempty"`
+	GitTreeState string `json:"git_tree_state,omitempty"`
 }
 
 // GetVersionProto returns protobuf representing the version
-func GetVersionProto() *version.Version {
-	return &version.Version{
+func GetVersionProto() *Version {
+	return &Version{
 		SemVer:       GetVersion(),
 		GitCommit:    GitCommit,
 		GitTreeState: GitTreeState,
diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go
index e0e4cac0f..e403e68b6 100644
--- a/pkg/version/version_test.go
+++ b/pkg/version/version_test.go
@@ -18,7 +18,6 @@ limitations under the License.
 package version // import "k8s.io/helm/pkg/version"
 
 import "testing"
-import "k8s.io/helm/pkg/proto/hapi/version"
 
 func TestGetVersionProto(t *testing.T) {
 	tests := []struct {
@@ -26,16 +25,16 @@ func TestGetVersionProto(t *testing.T) {
 		buildMetadata string
 		gitCommit     string
 		gitTreeState  string
-		expected      version.Version
+		expected      Version
 	}{
-		{"", "", "", "", version.Version{SemVer: "", GitCommit: "", GitTreeState: ""}},
-		{"v1.0.0", "", "", "", version.Version{SemVer: "v1.0.0", GitCommit: "", GitTreeState: ""}},
-		{"v1.0.0", "79d5c5f7", "", "", version.Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "", GitTreeState: ""}},
-		{"v1.0.0", "79d5c5f7", "0d399baec2acda578a217d1aec8d7d707c71e44d", "", version.Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "0d399baec2acda578a217d1aec8d7d707c71e44d", GitTreeState: ""}},
-		{"v1.0.0", "79d5c5f7", "0d399baec2acda578a217d1aec8d7d707c71e44d", "clean", version.Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "0d399baec2acda578a217d1aec8d7d707c71e44d", GitTreeState: "clean"}},
+		{"", "", "", "", Version{SemVer: "", GitCommit: "", GitTreeState: ""}},
+		{"v1.0.0", "", "", "", Version{SemVer: "v1.0.0", GitCommit: "", GitTreeState: ""}},
+		{"v1.0.0", "79d5c5f7", "", "", Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "", GitTreeState: ""}},
+		{"v1.0.0", "79d5c5f7", "0d399baec2acda578a217d1aec8d7d707c71e44d", "", Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "0d399baec2acda578a217d1aec8d7d707c71e44d", GitTreeState: ""}},
+		{"v1.0.0", "79d5c5f7", "0d399baec2acda578a217d1aec8d7d707c71e44d", "clean", Version{SemVer: "v1.0.0+79d5c5f7", GitCommit: "0d399baec2acda578a217d1aec8d7d707c71e44d", GitTreeState: "clean"}},
 	}
 	for _, tt := range tests {
-		Version = tt.version
+		version = tt.version
 		BuildMetadata = tt.buildMetadata
 		GitCommit = tt.gitCommit
 		GitTreeState = tt.gitTreeState