diff --git a/etc/glance-glare-paste.ini b/etc/glance-glare-paste.ini
deleted file mode 100644
index 621c0607..00000000
--- a/etc/glance-glare-paste.ini
+++ /dev/null
@@ -1,60 +0,0 @@
-# Use this pipeline for no auth - DEFAULT
-[pipeline:glare-api]
-pipeline = cors healthcheck versionnegotiation osprofiler unauthenticated-context rootapp
-
-# Use this pipeline for keystone auth
-[pipeline:glare-api-keystone]
-pipeline = cors healthcheck versionnegotiation osprofiler authtoken context rootapp
-
-[composite:rootapp]
-paste.composite_factory = glance.api:root_app_factory
-/: apiversions
-/v0.1: glareapi
-
-[app:apiversions]
-paste.app_factory = glance.api.glare.versions:create_resource
-
-[app:glareapi]
-paste.app_factory = glance.api.glare.v0_1.router:API.factory
-
-[filter:healthcheck]
-paste.filter_factory = oslo_middleware:Healthcheck.factory
-backends = disable_by_file
-disable_by_file_path = /etc/glance/healthcheck_disable
-
-[filter:versionnegotiation]
-paste.filter_factory = glance.api.middleware.version_negotiation:GlareVersionNegotiationFilter.factory
-
-[filter:context]
-paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
-
-[filter:unauthenticated-context]
-paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-delay_auth_decision = true
-
-[filter:osprofiler]
-paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
-
-[filter:cors]
-paste.filter_factory =  oslo_middleware.cors:filter_factory
-oslo_config_project = glance
-oslo_config_program = glance-glare
-# Basic Headers (Automatic)
-# Accept = Origin, Accept, Accept-Language, Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma
-# Expose = Origin, Accept, Accept-Language, Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma
-
-# Glance Headers
-# Accept = Content-MD5, Accept-Encoding
-
-# Keystone Headers
-# Accept = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id
-# Expose = X-Auth-Token, X-Subject-Token, X-Service-Token
-
-# Request ID Middleware Headers
-# Accept = X-OpenStack-Request-ID
-# Expose = X-OpenStack-Request-ID
-latent_allow_headers = Content-MD5, Accept-Encoding, X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
-latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID
diff --git a/setup.cfg b/setup.cfg
index 78137b9c..c8d6605b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,7 +34,6 @@ console_scripts =
     glance-registry = glance.cmd.registry:main
     glance-replicator = glance.cmd.replicator:main
     glance-scrubber = glance.cmd.scrubber:main
-    glance-glare = glance.cmd.glare:main
 glance.common.image_location_strategy.modules =
     location_order_strategy = glance.common.location_strategy.location_order
     store_type_strategy = glance.common.location_strategy.store_type
@@ -44,15 +43,12 @@ oslo.config.opts =
     glance.scrubber = glance.opts:list_scrubber_opts
     glance.cache= glance.opts:list_cache_opts
     glance.manage = glance.opts:list_manage_opts
-    glance.glare = glance.opts:list_artifacts_opts
 oslo.config.opts.defaults =
     glance.api = glance.common.config:set_cors_middleware_defaults
 glance.database.migration_backend =
     sqlalchemy = oslo_db.sqlalchemy.migration
 glance.database.metadata_backend =
     sqlalchemy = glance.db.sqlalchemy.metadata
-glance.artifacts.types =
-    MyArtifact = glance.contrib.plugins.artifacts_sample:MY_ARTIFACT
 
 glance.flows =
     import = glance.async.flows.base_import:get_flow
@@ -87,4 +83,4 @@ mapping_file = babel.cfg
 output_file = glance/locale/glance.pot
 
 [pbr]
-autodoc_tree_index_modules = True
\ No newline at end of file
+autodoc_tree_index_modules = True
diff --git a/tox.ini b/tox.ini
index ebf22552..1b3bb2c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,6 @@ commands =
   oslo-config-generator --config-file etc/oslo-config-generator/glance-scrubber.conf
   oslo-config-generator --config-file etc/oslo-config-generator/glance-cache.conf
   oslo-config-generator --config-file etc/oslo-config-generator/glance-manage.conf
-  oslo-config-generator --config-file etc/oslo-config-generator/glance-glare.conf
 
 [testenv:api-ref]
 # This environment is called from CI scripts to test and publish