diff --git a/doc/source/firehose_schema.rst b/doc/source/firehose_schema.rst
index bf3da9817c..7325ae1fe1 100644
--- a/doc/source/firehose_schema.rst
+++ b/doc/source/firehose_schema.rst
@@ -153,9 +153,8 @@ An example is::
 Ansible
 =======
 
-We have mqtt events emitted from ansible being run on
-:ref:`puppetmaster.openstack.org`. These events are generated using a
-`MQTT Ansible Callback Plugin`_.
+We have mqtt events emitted from ansible being run on :ref:`puppet-master`.
+These events are generated using a `MQTT Ansible Callback Plugin`_.
 
 .. _MQTT Ansible Callback Plugin: http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/openstack_project/files/puppetmaster/mqtt.py
 
diff --git a/doc/source/systems.rst b/doc/source/systems.rst
index ad6c885f2b..d8cce7f784 100644
--- a/doc/source/systems.rst
+++ b/doc/source/systems.rst
@@ -42,17 +42,6 @@ Major Systems
    signing
    firehose
    firehose_schema
-   pholio
    github
-
-.. NOTE(dhellmann): These projects were not listed above, or in any
-   other toctree, which breaks the build. It's not clear why they were
-   left out of the toctree but remained in the source dir. Rather than
-   deleting them, I've added them to a hidden toctree to eliminate
-   that build error.
-
-.. toctree::
-   :hidden:
-
    activity
    asterisk