diff --git a/Makefile b/Makefile
index 79fd02437..573807817 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS := expandybird/. resourcifier/. manager/. client/.
+SUBDIRS := expandybird/. resourcifier/. manager/.
 TARGETS := all build test push container clean
 
 SUBDIRS_TARGETS := \
diff --git a/client/Makefile b/client/Makefile
deleted file mode 100644
index ccbb326fb..000000000
--- a/client/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for the Docker image gcr.io/$(PROJECT)/expandybird
-# MAINTAINER: Jack Greenfield <jackgr@google.com>
-# If you update this image please check the tag value before pushing.
-
-.PHONY : all build test push container clean
-
-test: client
-	client --action=expand test/guestbook.yaml test/replicatedservice.py test/redis.jinja > /dev/null
-
-client:
-	go get -v ./...
-	go install -v ./...
diff --git a/client/client.go b/client/client.go
index e47431a9c..746fe1fe6 100644
--- a/client/client.go
+++ b/client/client.go
@@ -38,18 +38,17 @@ import (
 var (
 	action        = flag.String("action", "deploy", "expand | deploy | list | get | delete | update | listtypes | listtypeinstances | types")
 	name          = flag.String("name", "", "Name of template or deployment")
-	service       = flag.String("service", "http://localhost:8080", "URL for deployment manager")
-	type_registry = flag.String("type_registry", "kubernetes/deployment-manager", "Type registry [owner/repo], defaults to kubernetes/deployment-manager")
-	binary        = flag.String("binary", "../expandybird/expansion/expansion.py",
-		"Path to template expansion binary")
-
-	properties = flag.String("properties", "", "Properties to use when deploying a type (e.g., --properties k1=v1,k2=v2)")
+	service       = flag.String("service", "http://localhost:8001/api/v1/proxy/namespaces/default/services/manager-service:manager", "URL for deployment manager")
+	type_registry = flag.String("registry", "kubernetes/deployment-manager", "Type registry [owner/repo], defaults to kubernetes/deployment-manager")
+	binary        = flag.String("binary", "../expandybird/expansion/expansion.py", "Path to template expansion binary")
+	properties    = flag.String("properties", "", "Properties to use when deploying a type (e.g., --properties k1=v1,k2=v2)")
 )
 
 var usage = func() {
 	message := "usage: %s [<flags>] (name | (<template> [<import1>...<importN>]))\n"
 	fmt.Fprintf(os.Stderr, message, os.Args[0])
 	flag.PrintDefaults()
+	os.Exit(1)
 }
 
 func getGitRegistry() *registry.GithubRegistry {
@@ -108,6 +107,8 @@ func main() {
 	case "listtypeinstances":
 		path := fmt.Sprintf("types/%s/instances", url.QueryEscape(name))
 		callService(path, "GET", name, nil)
+	default:
+		usage()
 	}
 }
 
@@ -148,7 +149,6 @@ func loadTemplate(name string) *expander.Template {
 	args := flag.Args()
 	if len(args) < 1 {
 		usage()
-		os.Exit(1)
 	}
 
 	var template *expander.Template
diff --git a/client/test/bootstrap.yaml b/client/test/bootstrap.yaml
deleted file mode 100644
index 602c7d224..000000000
--- a/client/test/bootstrap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-######################################################################
-# Copyright 2015 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.
-######################################################################
-
-imports:
-- path: replicatedservice.py
-resources:
-- name: expandybird
-  type: replicatedservice.py
-  properties:
-    service_port: 8081
-    target_port: 8080
-    container_port: 8080
-    external_service: false
-    replicas: 2
-    image: gcr.io/PROJECT/expandybird:latest
-    labels:
-      app: dm
-- name: resourcifier
-  type: replicatedservice.py
-  properties:
-    service_port: 8082
-    target_port: 8080
-    container_port: 8080
-    external_service: false
-    replicas: 2
-    image: gcr.io/PROJECT/resourcifier:latest
-    labels:
-      app: dm
-- name: manager
-  type: replicatedservice.py
-  properties:
-    service_port: 8080
-    target_port: 8080
-    container_port: 8080
-    external_service: true
-    replicas: 1
-    image: gcr.io/PROJECT/manager:latest
-    labels:
-      app: dm
diff --git a/client/test/guestbook.yaml b/client/test/guestbook.yaml
deleted file mode 100644
index 9d9e332b3..000000000
--- a/client/test/guestbook.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-######################################################################
-# Copyright 2015 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.
-######################################################################
-
-imports:
-- path: redis.jinja
-- path: replicatedservice.py
-resources:
-- name: frontend
-  type: replicatedservice.py
-  properties:
-    service_port: 80
-    container_port: 80
-    external_service: true
-    replicas: 3
-    image: gcr.io/google_containers/example-guestbook-php-redis:v3
-- name: redis
-  type: redis.jinja
-  properties: null
diff --git a/client/test/redis.jinja b/client/test/redis.jinja
deleted file mode 100644
index a0c01e16d..000000000
--- a/client/test/redis.jinja
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set REDIS_PORT = 6379 %}
-{% set WORKERS = properties['workers'] or 2 %}
-
-resources:
-- name: redis-master
-  type: replicatedservice.py
-  properties:
-    # This has to be overwritten since service names are hard coded in the code
-    service_name: redis-master
-    service_port: {{ REDIS_PORT }}
-    target_port: {{ REDIS_PORT }}
-    container_port: {{ REDIS_PORT }}
-    replicas: 1
-    container_name: master
-    image: redis
-
-- name: redis-slave
-  type: replicatedservice.py
-  properties:
-    # This has to be overwritten since service names are hard coded in the code
-    service_name: redis-slave
-    service_port: {{ REDIS_PORT }}
-    container_port: {{ REDIS_PORT }}
-    replicas: {{ WORKERS }}
-    container_name: worker
-    image: kubernetes/redis-slave:v2
-    # An example of how to specify env variables.
-    env:
-    - name: GET_HOSTS_FROM
-      value: env
-    - name: REDIS_MASTER_SERVICE_HOST
-      value: redis-master
diff --git a/client/test/replicatedservice.py b/client/test/replicatedservice.py
deleted file mode 100644
index 6c345a51f..000000000
--- a/client/test/replicatedservice.py
+++ /dev/null
@@ -1,200 +0,0 @@
-######################################################################
-# Copyright 2015 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.
-######################################################################
-
-"""Defines a ReplicatedService type by creating both a Service and an RC.
-
-This module creates a typical abstraction for running a service in a
-Kubernetes cluster, namely a replication controller and a service packaged
-together into a single unit.
-"""
-
-import yaml
-
-SERVICE_TYPE_COLLECTION = 'Service'
-RC_TYPE_COLLECTION = 'ReplicationController'
-
-
-def GenerateConfig(context):
-  """Generates a Replication Controller and a matching Service.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             container_name - Name to use for container. If omitted, name is
-                              used.
-             namespace - Namespace to create the resources in. If omitted,
-                         'default' is used.
-             service_name - Name to use for service. If omitted name-service is
-                            used.
-             protocol - Protocol to use for the service
-             service_port - Port to use for the service
-             target_port - Target port for the service
-             container_port - Container port to use
-             replicas - Number of replicas to create in RC
-             image - Docker image to use for replicas. Required.
-             labels - labels to apply.
-             env - Environmental variables to apply (list of maps). Format
-                   should be:
-                      [{'name': ENV_VAR_NAME, 'value':'ENV_VALUE'},
-                       {'name': ENV_VAR_NAME_2, 'value':'ENV_VALUE_2'}]
-             external_service - If set to true, enable external Load Balancer
-
-  Returns:
-    A Container Manifest as a YAML string.
-  """
-  # YAML config that we're going to create for both RC & Service
-  config = {'resources': []}
-
-  name = context.env['name']
-  container_name = context.properties.get('container_name', name)
-  namespace = context.properties.get('namespace', 'default')
-
-  # Define things that the Service cares about
-  service_name = context.properties.get('service_name', name + '-service')
-  service_type = SERVICE_TYPE_COLLECTION
-
-  # Define things that the Replication Controller (rc) cares about
-  rc_name = name + '-rc'
-  rc_type = RC_TYPE_COLLECTION
-
-  service = {
-      'name': service_name,
-      'type': service_type,
-      'properties': {
-          'apiVersion': 'v1',
-          'kind': 'Service',
-          'namespace': namespace,
-          'metadata': {
-              'name': service_name,
-              'labels': GenerateLabels(context, service_name),
-          },
-          'spec': {
-              'ports': [GenerateServicePorts(context, container_name)],
-              'selector': GenerateLabels(context, name)
-          }
-      }
-  }
-  set_up_external_lb = context.properties.get('external_service', None)
-  if set_up_external_lb:
-    service['properties']['spec']['type'] = 'LoadBalancer'
-  config['resources'].append(service)
-
-  rc = {
-      'name': rc_name,
-      'type': rc_type,
-      'properties': {
-          'apiVersion': 'v1',
-          'kind': 'ReplicationController',
-          'namespace': namespace,
-          'metadata': {
-              'name': rc_name,
-              'labels': GenerateLabels(context, rc_name),
-          },
-          'spec': {
-              'replicas': context.properties['replicas'],
-              'selector': GenerateLabels(context, name),
-              'template': {
-                  'metadata': {
-                      'labels': GenerateLabels(context, name),
-                  },
-                  'spec': {
-                      'containers': [
-                          {
-                              'env': GenerateEnv(context),
-                              'name': container_name,
-                              'image': context.properties['image'],
-                              'ports': [
-                                  {
-                                      'name': container_name,
-                                      'containerPort': context.properties['container_port'],
-                                  }
-                              ]
-                          }
-                      ]
-                  }
-              }
-          }
-      }
-  }
-
-  config['resources'].append(rc)
-  return yaml.dump(config)
-
-
-# Generates labels either from the context.properties['labels'] or generates
-# a default label 'name':name
-def GenerateLabels(context, name):
-  """Generates labels from context.properties['labels'] or creates default.
-
-  We make a deep copy of the context.properties['labels'] section to avoid
-  linking in the yaml document, which I believe reduces readability of the
-  expanded template. If no labels are given, generate a default 'name':name.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             labels - Labels to generate
-
-  Returns:
-    A dict containing labels in a name:value format
-  """
-  tmp_labels = context.properties.get('labels', None)
-  ret_labels = {'name': name}
-  if isinstance(tmp_labels, dict):
-    for key, value in tmp_labels.iteritems():
-      ret_labels[key] = value
-  return ret_labels
-
-
-def GenerateServicePorts(context, name):
-  """Generates a ports section for a service.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             service_port - Port to use for the service
-             target_port - Target port for the service
-             protocol - Protocol to use.
-
-  Returns:
-    A dict containing a port definition
-  """
-  service_port = context.properties.get('service_port', None)
-  target_port = context.properties.get('target_port', None)
-  protocol = context.properties.get('protocol')
-
-  ports = {}
-  if name:
-    ports['name'] = name
-  if service_port:
-    ports['port'] = service_port
-  if target_port:
-    ports['targetPort'] = target_port
-  if protocol:
-    ports['protocol'] = protocol
-
-  return ports
-
-def GenerateEnv(context):
-  """Generates environmental variables for a pod.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             env - Environment variables to set.
-
-  Returns:
-    A list containing env variables in dict format {name: 'name', value: 'value'}
-  """
-  env = []
-  tmp_env = context.properties.get('env', [])
-  for entry in tmp_env:
-    if isinstance(entry, dict):
-      env.append({'name': entry.get('name'), 'value': entry.get('value')})
-  return env
diff --git a/examples/redis/redis.jinja b/examples/redis/redis.jinja
deleted file mode 100644
index 9f9967cf4..000000000
--- a/examples/redis/redis.jinja
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set REDIS_PORT = 6379 %}
-{% set WORKERS = properties['workers'] or 2 %}
-
-resources:
-- name: redis-master
-  type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py
-  properties:
-    # This has to be overwritten since service names are hard coded in the code
-    service_name: redis-master
-    service_port: {{ REDIS_PORT }}
-    target_port: {{ REDIS_PORT }}
-    container_port: {{ REDIS_PORT }}
-    replicas: 1
-    container_name: master
-    image: redis
-
-- name: redis-slave
-  type: https://raw.githubusercontent.com/kubernetes/deployment-manager/master/examples/replicatedservice/replicatedservice.py
-  properties:
-    # This has to be overwritten since service names are hard coded in the code
-    service_name: redis-slave
-    service_port: {{ REDIS_PORT }}
-    container_port: {{ REDIS_PORT }}
-    replicas: {{ WORKERS }}
-    container_name: worker
-    image: kubernetes/redis-slave:v2
-    # An example of how to specify env variables.
-    env:
-    - name: GET_HOSTS_FROM
-      value: env
-    - name: REDIS_MASTER_SERVICE_HOST
-      value: redis-master
diff --git a/examples/redis/redis.jinja.schema b/examples/redis/redis.jinja.schema
deleted file mode 100644
index cd550d65a..000000000
--- a/examples/redis/redis.jinja.schema
+++ /dev/null
@@ -1,10 +0,0 @@
-info:
-  title: Redis cluster
-  description: Defines a redis cluster, using a single replica
-    replicatedservice for master and replicatedservice for workers.
-
-properties:
-  workers:
-    type: int
-    default: 2
-    description: Number of worker replicas.
diff --git a/examples/replicatedservice/replicatedservice.py b/examples/replicatedservice/replicatedservice.py
deleted file mode 100644
index 72c5f20b0..000000000
--- a/examples/replicatedservice/replicatedservice.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""Defines a ReplicatedService type by creating both a Service and an RC.
-
-This module creates a typical abstraction for running a service in a
-Kubernetes cluster, namely a replication controller and a service packaged
-together into a single unit.
-"""
-
-import yaml
-
-SERVICE_TYPE_COLLECTION = 'Service'
-RC_TYPE_COLLECTION = 'ReplicationController'
-
-
-def GenerateConfig(context):
-  """Generates a Replication Controller and a matching Service.
-
-  Args:
-    context: Template context. See schema for context properties.
-
-  Returns:
-    A Container Manifest as a YAML string.
-  """
-  # YAML config that we're going to create for both RC & Service
-  config = {'resources': []}
-
-  name = context.env['name']
-  container_name = context.properties.get('container_name', name)
-  namespace = context.properties.get('namespace', 'default')
-
-  # Define things that the Service cares about
-  service_name = context.properties.get('service_name', name + '-service')
-  service_type = SERVICE_TYPE_COLLECTION
-
-  # Define things that the Replication Controller (rc) cares about
-  rc_name = name + '-rc'
-  rc_type = RC_TYPE_COLLECTION
-
-  service = {
-      'name': service_name,
-      'type': service_type,
-      'properties': {
-          'apiVersion': 'v1',
-          'kind': 'Service',
-          'namespace': namespace,
-          'metadata': {
-              'name': service_name,
-              'labels': GenerateLabels(context, service_name),
-          },
-          'spec': {
-              'ports': [GenerateServicePorts(context, container_name)],
-              'selector': GenerateLabels(context, name)
-          }
-      }
-  }
-  set_up_external_lb = context.properties.get('external_service', None)
-  if set_up_external_lb:
-    service['properties']['spec']['type'] = 'LoadBalancer'
-  config['resources'].append(service)
-
-  rc = {
-      'name': rc_name,
-      'type': rc_type,
-      'properties': {
-          'apiVersion': 'v1',
-          'kind': 'ReplicationController',
-          'namespace': namespace,
-          'metadata': {
-              'name': rc_name,
-              'labels': GenerateLabels(context, rc_name),
-          },
-          'spec': {
-              'replicas': context.properties['replicas'],
-              'selector': GenerateLabels(context, name),
-              'template': {
-                  'metadata': {
-                      'labels': GenerateLabels(context, name),
-                  },
-                  'spec': {
-                      'containers': [
-                          {
-                              'env': GenerateEnv(context),
-                              'name': container_name,
-                              'image': context.properties['image'],
-                              'ports': [
-                                  {
-                                      'name': container_name,
-                                      'containerPort': context.properties['container_port'],
-                                  }
-                              ]
-                          }
-                      ]
-                  }
-              }
-          }
-      }
-  }
-
-  config['resources'].append(rc)
-  return yaml.dump(config)
-
-
-# Generates labels either from the context.properties['labels'] or generates
-# a default label 'name':name
-def GenerateLabels(context, name):
-  """Generates labels from context.properties['labels'] or creates default.
-
-  We make a deep copy of the context.properties['labels'] section to avoid
-  linking in the yaml document, which I believe reduces readability of the
-  expanded template. If no labels are given, generate a default 'name':name.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             labels - Labels to generate
-
-  Returns:
-    A dict containing labels in a name:value format
-  """
-  tmp_labels = context.properties.get('labels', None)
-  ret_labels = {'name': name}
-  if isinstance(tmp_labels, dict):
-    for key, value in tmp_labels.iteritems():
-      ret_labels[key] = value
-  return ret_labels
-
-
-def GenerateServicePorts(context, name):
-  """Generates a ports section for a service.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             service_port - Port to use for the service
-             target_port - Target port for the service
-             protocol - Protocol to use.
-
-  Returns:
-    A dict containing a port definition
-  """
-  service_port = context.properties.get('service_port', None)
-  target_port = context.properties.get('target_port', None)
-  protocol = context.properties.get('protocol')
-
-  ports = {}
-  if name:
-    ports['name'] = name
-  if service_port:
-    ports['port'] = service_port
-  if target_port:
-    ports['targetPort'] = target_port
-  if protocol:
-    ports['protocol'] = protocol
-
-  return ports
-
-def GenerateEnv(context):
-  """Generates environmental variables for a pod.
-
-  Args:
-    context: Template context, which can contain the following properties:
-             env - Environment variables to set.
-
-  Returns:
-    A list containing env variables in dict format {name: 'name', value: 'value'}
-  """
-  env = []
-  tmp_env = context.properties.get('env', [])
-  for entry in tmp_env:
-    if isinstance(entry, dict):
-      env.append({'name': entry.get('name'), 'value': entry.get('value')})
-  return env
diff --git a/examples/replicatedservice/replicatedservice.py.schema b/examples/replicatedservice/replicatedservice.py.schema
deleted file mode 100644
index c9ce310ab..000000000
--- a/examples/replicatedservice/replicatedservice.py.schema
+++ /dev/null
@@ -1,57 +0,0 @@
-info:
-  title: Replicated Service
-  description: |
-    Defines a ReplicatedService type by creating both a Service and an RC.
-
-    This module creates a typical abstraction for running a service in a
-    Kubernetes cluster, namely a replication controller and a service packaged
-    together into a single unit.
-
-required:
-- image
-
-properties:
-  container_name:
-    type: string
-    description: Name to use for container. If omitted, name is used.
-  service_name:
-    type: string
-    description: Name to use for service. If omitted, name-service is used.
-  namespace:
-    type: string
-    description: Namespace to create resources in. If omitted, 'default' is
-      used.
-    default: default
-  protocol:
-    type: string
-    description: Protocol to use for the service.
-  service_port:
-    type: int
-    description: Port to use for the service.
-  target_port:
-    type: int
-    description: Target port to use for the service.
-  container_port:
-    type: int
-    description: Port to use for the container.
-  replicas:
-    type: int
-    description: Number of replicas to create in RC.
-  image:
-    type: string
-    description: Docker image to use for replicas.
-  labels:
-    type: object
-    description: Labels to apply.
-  env:
-    type: object
-    description: Environment variables to apply.
-    properties:
-      name:
-        type: string
-      value:
-        type: string
-  external_service:
-    type: boolean
-    description: If set to true, enable external load balancer.
-
diff --git a/expandybird/service/service_test.go b/expandybird/service/service_test.go
index 20a54f92b..db458cce9 100644
--- a/expandybird/service/service_test.go
+++ b/expandybird/service/service_test.go
@@ -110,9 +110,9 @@ var ServiceWrapperTestCases = []ServiceWrapperTestCase{
 func TestServiceWrapper(t *testing.T) {
 	backend := expander.NewExpander("../expansion/expansion.py")
 	wrapper := NewService(NewExpansionHandler(backend))
-	container := restful.DefaultContainer
+	container := restful.NewContainer()
+	container.ServeMux = http.NewServeMux()
 	wrapper.Register(container)
-	defer container.Remove(wrapper.WebService)
 	handlerTester := util.NewHandlerTester(container)
 	for _, swtc := range ServiceWrapperTestCases {
 		reader := GetTemplateReader(t, swtc.Description, inputFileName)
@@ -172,7 +172,7 @@ var ExpansionHandlerTestCases = []ExpansionHandlerTestCase{
 }
 
 var malformedExpansionOutput = []byte(`
-this is malformed output
+this: is: invalid: yaml:
 `)
 
 type mockExpander struct {
@@ -182,9 +182,9 @@ type mockExpander struct {
 // expanded configuration as a string on success.
 func (e *mockExpander) ExpandTemplate(template *expander.Template) (string, error) {
 	switch template.Name {
-	case "InvalidFileName":
+	case "InvalidFileName.yaml":
 		return "", fmt.Errorf("expansion error")
-	case "InvalidTypeName":
+	case "InvalidTypeName.yaml":
 		return string(malformedExpansionOutput), nil
 	}
 
@@ -196,7 +196,6 @@ func TestExpansionHandler(t *testing.T) {
 	wrapper := NewService(NewExpansionHandler(backend))
 	container := restful.DefaultContainer
 	wrapper.Register(container)
-	defer container.Remove(wrapper.WebService)
 	handlerTester := util.NewHandlerTester(container)
 	for _, ehtc := range ExpansionHandlerTestCases {
 		reader := GetTemplateReader(t, ehtc.Description, ehtc.TemplateFileName)