diff --git a/hooks/neutron_api_utils.py b/hooks/neutron_api_utils.py
index a13fc057..733def00 100644
--- a/hooks/neutron_api_utils.py
+++ b/hooks/neutron_api_utils.py
@@ -151,21 +151,6 @@ def restart_map():
                         for cfg, v in resource_map().iteritems()
                         if v['services']])
 
-def auth_token_config(setting):                                                                                                                                                                               
-    """
-    Returns currently configured value for setting in api-paste.ini's
-    authtoken section, or None.
-    """
-    config = ConfigParser.RawConfigParser()
-    config.read('/etc/neutron/api-paste.ini')
-    try:
-        value = config.get('filter:authtoken', setting)
-    except:
-        return None
-    if value.startswith('%'):
-        return None
-    return value
-
 def keystone_ca_cert_b64():                                                                                                                                                                                   
     '''Returns the local Keystone-provided CA cert if it exists, or None.'''
     if not os.path.isfile(CA_CERT_PATH):
diff --git a/templates/icehouse/etc_nova_api-paste.ini b/templates/icehouse/etc_nova_api-paste.ini
deleted file mode 100644
index aad3d0f3..00000000
--- a/templates/icehouse/etc_nova_api-paste.ini
+++ /dev/null
@@ -1,124 +0,0 @@
-############
-# Metadata #
-############
-[composite:metadata]
-use = egg:Paste#urlmap
-/: meta
-
-[pipeline:meta]
-pipeline = ec2faultwrap logrequest metaapp
-
-[app:metaapp]
-paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
-
-#######
-# EC2 #
-#######
-
-[composite:ec2]
-use = egg:Paste#urlmap
-/services/Cloud: ec2cloud
-
-[composite:ec2cloud]
-use = call:nova.api.auth:pipeline_factory
-noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
-keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
-
-[filter:ec2faultwrap]
-paste.filter_factory = nova.api.ec2:FaultWrapper.factory
-
-[filter:logrequest]
-paste.filter_factory = nova.api.ec2:RequestLogging.factory
-
-[filter:ec2lockout]
-paste.filter_factory = nova.api.ec2:Lockout.factory
-
-[filter:ec2keystoneauth]
-paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
-
-[filter:ec2noauth]
-paste.filter_factory = nova.api.ec2:NoAuth.factory
-
-[filter:cloudrequest]
-controller = nova.api.ec2.cloud.CloudController
-paste.filter_factory = nova.api.ec2:Requestify.factory
-
-[filter:authorizer]
-paste.filter_factory = nova.api.ec2:Authorizer.factory
-
-[filter:validator]
-paste.filter_factory = nova.api.ec2:Validator.factory
-
-[app:ec2executor]
-paste.app_factory = nova.api.ec2:Executor.factory
-
-#############
-# OpenStack #
-#############
-
-[composite:osapi_compute]
-use = call:nova.api.openstack.urlmap:urlmap_factory
-/: oscomputeversions
-/v1.1: openstack_compute_api_v2
-/v2: openstack_compute_api_v2
-/v3: openstack_compute_api_v3
-
-[composite:openstack_compute_api_v2]
-use = call:nova.api.auth:pipeline_factory
-noauth = faultwrap sizelimit noauth ratelimit osapi_compute_app_v2
-keystone = faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2
-keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2
-
-[composite:openstack_compute_api_v3]
-use = call:nova.api.auth:pipeline_factory_v3
-noauth = faultwrap sizelimit noauth_v3 osapi_compute_app_v3
-keystone = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3
-
-[filter:faultwrap]
-paste.filter_factory = nova.api.openstack:FaultWrapper.factory
-
-[filter:noauth]
-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
-
-[filter:noauth_v3]
-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory
-
-[filter:ratelimit]
-paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
-
-[filter:sizelimit]
-paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory
-
-[app:osapi_compute_app_v2]
-paste.app_factory = nova.api.openstack.compute:APIRouter.factory
-
-[app:osapi_compute_app_v3]
-paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory
-
-[pipeline:oscomputeversions]
-pipeline = faultwrap oscomputeversionapp
-
-[app:oscomputeversionapp]
-paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
-
-##########
-# Shared #
-##########
-
-[filter:keystonecontext]
-paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
-
-[filter:authtoken]
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-{% if service_host -%}
-# NOTE(jamespage) - not used - but required for relation to nova-compute
-service_protocol = {{ service_protocol }}
-service_host = {{ service_host }}
-service_port = {{ service_port }}
-auth_host = {{ auth_host }}
-auth_port = {{ auth_port }}
-auth_protocol =  {{ auth_protocol }}
-admin_tenant_name = {{ admin_tenant_name }}
-admin_user = {{ admin_user }}
-admin_password = {{ admin_password }}
-{% endif -%}