diff --git a/source/openstack_environment-database.rst b/source/openstack_environment-database.rst
deleted file mode 100644
index 84b9e017..00000000
--- a/source/openstack_environment-database.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-Database
-########
-
-Most OpenStack* services use an SQL database to store information. The
-database typically runs on the controller node. The procedures in this
-guide use MariaDB.
-
-Install and configure the database server
------------------------------------------
-
-#. Install MariaDB bundle::
-
-     # clr_bundle_add database-mariadb
-
-#. Create the ``/etc/mariadb/`` folder and the ``/etc/mariadb/openstack.cnf`` file::
-
-     # mkdir /etc/mariadb
-     # touch /etc/mariadb/openstack.cnf
-
-#. Add the ``[mysqld]`` section, set the bind-address key to the
-   management IP address of the controller node to enable access by
-   other nodes via the management network and enable useful options for
-   UTF-8 character set::
-
-    [mysqld]
-    bind-address = 10.0.0.11
-    default-storage-engine = innodb
-    innodb_file_per_table
-    collation-server = utf8_general_ci
-    init-connect = 'SET NAMES utf8'
-    character-set-server = utf8
-
-Finalizing database installation
---------------------------------
-
-Complete the following steps to finalize database installation:
-
-#. Start the database service and configure it to start when the system
-   boots::
-
-    # systemctl enable mariadb.service
-    # systemctl start mariadb.service
-
-#. Secure the database service including choosing a suitable password
-   for the root account::
-
-    # mysql_secure_installation
diff --git a/source/openstack_environment-messaging.rst b/source/openstack_environment-messaging.rst
deleted file mode 100644
index 9f78c556..00000000
--- a/source/openstack_environment-messaging.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-Message queue
-#############
-
-OpenStack* uses a `message queue` to coordinate operations and
-status information among services. The message queue service typically
-runs on the controller node. OpenStack supports several message queue
-services. This guide implements the RabbitMQ message queue service.
-
-Install the message queue service
----------------------------------
-
-#. Install the message queue bundle::
-
-      # clr_bundle_add message-broker-rabbitmq
-
-Configuring the message broker service
---------------------------------------
-
-Complete the following steps to configure the message broker service:
-
-#. Message broker service needs to be able to resolve to itself. Add the
-   following line to ``/etc/hosts``::
-
-    127.0.0.1 controller
-
-#. Start the message broker service and configure it to start when the
-   system boots::
-
-    # systemctl enable rabbitmq-server.service
-    # systemctl start rabbitmq-server.service
-
-#. Add the OpenStack user::
-
-    # rabbitmqctl add_user openstack RABBIT_PASS
-    Creating user openstack ...
-    ...done.
-
-   Replace ``RABBIT_PASS`` with a suitable password.
-
-#. Permit configuration, write, and read access for the OpenStack user::
-
-    # rabbitmqctl set_permissions openstack ".*" ".*" ".*"
-    Setting permissions for user "openstack" in vhost "/" ...
-    ...done.