diff --git a/etc/heat/heat-api-cfn.conf b/etc/heat/heat-api-cfn.conf
deleted file mode 100644
index 17fb3fa178..0000000000
--- a/etc/heat/heat-api-cfn.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-[DEFAULT]
-# Show more verbose log output (sets INFO log level output)
-verbose = True
-
-# Show debugging output in logs (sets DEBUG log level output)
-debug = True
-
-# Address to bind the server to
-bind_host = 0.0.0.0
-
-# Port the bind the server to
-bind_port = 8000
-
-# Turn off standard error logging
-use_stderr = False
-
-# Log to this file. Make sure the user running heat-api-cfn has
-# permissions to write to this file!
-log_file = /var/log/heat/api-cfn.log
-
-# ================= Syslog Options ============================
-
-# Send logs to syslog (/dev/log) instead of to file specified
-# by `log_file`
-use_syslog = False
-
-# Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL0
-
-rpc_backend=heat.openstack.common.rpc.impl_qpid
-
-# Uncomment to deploy different flavor of heat-api-cfn pipeline:
-# [paste_deploy]
-# flavor = standalone
-
-[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-auth_uri = http://127.0.0.1:5000/v2.0
-
-# These must be set to your local values in order for the token
-# authentication to work.
-admin_tenant_name = service
-admin_user = heat
-admin_password = verybadpass
-
-[ec2authtoken]
-auth_uri = http://127.0.0.1:5000/v2.0
diff --git a/etc/heat/heat-api-cloudwatch.conf b/etc/heat/heat-api-cloudwatch.conf
deleted file mode 100644
index 5c3f4b6628..0000000000
--- a/etc/heat/heat-api-cloudwatch.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-[DEFAULT]
-# Show more verbose log output (sets INFO log level output)
-verbose = True
-
-# Show debugging output in logs (sets DEBUG log level output)
-debug = True
-
-# Turn off standard error logging
-use_stderr = False
-
-# Log to this file. Make sure the user running heat-api has
-# permissions to write to this file!
-log_file = /var/log/heat/api-cloudwatch.log
-
-# Send logs to syslog (/dev/log) instead of to file specified
-# by `log_file`
-use_syslog = False
-
-# Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL0
-
-# Address to bind the server to
-bind_host = 0.0.0.0
-
-# Port the bind the server to
-bind_port = 8003
-
-rpc_backend=heat.openstack.common.rpc.impl_qpid
-
-# Uncomment to deploy different flavor of heat-api-cloudwatch pipeline:
-# [paste_deploy]
-# flavor = standalone
-
-[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-auth_uri = http://127.0.0.1:5000/v2.0
-
-# These must be set to your local values in order for the token
-# authentication to work.
-admin_tenant_name = service
-admin_user = heat
-admin_password = verybadpass
-
-[ec2authtoken]
-auth_uri = http://127.0.0.1:5000/v2.0
diff --git a/etc/heat/heat-api.conf b/etc/heat/heat-api.conf
deleted file mode 100644
index 8566ab9b0d..0000000000
--- a/etc/heat/heat-api.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-[DEFAULT]
-# Show more verbose log output (sets INFO log level output)
-verbose = True
-
-# Show debugging output in logs (sets DEBUG log level output)
-debug = True
-
-# Turn off standard error logging
-use_stderr = False
-
-# Log to this file. Make sure the user running heat-api-cfn has
-# permissions to write to this file!
-log_file = /var/log/heat/api.log
-
-# Send logs to syslog (/dev/log) instead of to file specified
-# by `log_file`
-use_syslog = False
-
-# Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL0
-
-# Address to bind the server to
-bind_host = 0.0.0.0
-
-# Port the bind the server to
-bind_port = 8004
-
-rpc_backend=heat.openstack.common.rpc.impl_qpid
-
-
-
-# Uncomment to deploy different flavor of heat-api pipeline:
-# [paste_deploy]
-# flavor = custombackend
-# flavor = standalone
-
-[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-auth_uri = http://127.0.0.1:5000/v2.0
-
-# These must be set to your local values in order for the token
-# authentication to work.
-admin_tenant_name = service
-admin_user = heat
-admin_password = verybadpass
diff --git a/etc/heat/heat-engine.conf b/etc/heat/heat-engine.conf
deleted file mode 100644
index c88cef7692..0000000000
--- a/etc/heat/heat-engine.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-[DEFAULT]
-# Show more verbose log output (sets INFO log level output)
-verbose = True
-
-# Show debugging output in logs (sets DEBUG log level output)
-debug = True
-
-# Turn off standard error logging
-use_stderr = False
-
-# Log to this file. Make sure the user running heat-api has
-# permissions to write to this file!
-log_file = /var/log/heat/engine.log
-
-# Send logs to syslog (/dev/log) instead of to file specified
-# by `log_file`
-use_syslog = False
-
-# Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL0
-
-# Keystone role for heat template-defined users
-heat_stack_user_role = heat_stack_user
-
-# Make instances connect to the heat services via https
-# default to off since it will require images and host
-# to be configured correctly to support ssl connections
-instance_connection_is_secure = 0
-
-# If is_secure is set to 1, certificate validation can
-# be enabled or disabled
-instance_connection_https_validate_certificates = 1
-
-# The default user that heat creates in users for ssh
-# administration is `ec2-user`, which is compatible with
-# AWS CloudFormation. You can change it with instance_user
-# instance_user = heat-admin
-
-# URL for instances to connect for metadata
-# ie the IP of the bridge device connecting the
-# instances with the host and the bind_port of
-# the CFN API
-# NOTE : change this from 127.0.0.1 !!
-heat_metadata_server_url = http://127.0.0.1:8000
-
-# URL for instances to connect for notification
-# of waitcondition events (ie via cfn-signal)
-# e.g the IP of the bridge device connecting the
-# instances with the host and the bind_port of
-# the CFN API
-# NOTE : change this from 127.0.0.1 !!
-heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition
-
-# URL for instances to connect for publishing metric
-# data (ie via cfn-push-stats)
-# e.g the IP of the bridge device connecting the
-# instances with the host and the bind_port of
-# the heat-api-cloudwatch API
-# NOTE : change this from 127.0.0.1 !!
-heat_watch_server_url = http://127.0.0.1:8003
-
-# The namespace for the custom backend. Must provide class Clients which will be
-# imported. Defaults to OpenStack if none provided.
-# cloud_backend=deltacloud_heat.client
-
-sql_connection = mysql://heat:heat@localhost/heat
-
-db_backend=heat.db.sqlalchemy.api
-
-rpc_backend=heat.openstack.common.rpc.impl_qpid
-
-auth_encryption_key=%ENCRYPTION_KEY%