diff --git a/admin-guide/puppet/roles/desktop.rst b/admin-guide/puppet/roles/desktop.rst
deleted file mode 100644
index aca4eced..00000000
--- a/admin-guide/puppet/roles/desktop.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-``role::desktop``
-======================
-
-This role implements a generic desktop system. The following features are
-supported:
-
-- AFS (optional), with automatic token renewal
-- AD authentication
-- Printing via the PSI CUPS server
-- Multiple keyboard layouts on the login screen
-- Kerberos support for Firefox
-
-
-Parameters
-----------
-
-``local_homes``
-~~~~~~~~~~~~~~~
-
-If ``true``, then home directories are on local disk in ``/home``, otherwise the
-home directory is determined by AD.
-
-
-``priv_users``
-~~~~~~~~~~~~~~
-
-A list of privileged users. Every user on this list has full root and is a
-member of the wheel group.n
diff --git a/admin-guide/puppet/roles/media_station.rst b/admin-guide/puppet/roles/media_station.rst
deleted file mode 100644
index 58c246ae..00000000
--- a/admin-guide/puppet/roles/media_station.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-``role::media_station``
-=======================
-
-A media station, ie. a workstation for transferring experimental data to
-external media (usually USB disks) and for managing said media.
-
diff --git a/admin-guide/puppet/roles/zookeeper.rst b/admin-guide/puppet/roles/zookeeper.rst
deleted file mode 100644
index af7e92cc..00000000
--- a/admin-guide/puppet/roles/zookeeper.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-``role::zookeeper``
-===================
-
-This role implements a `zookeeper <https://zookeeper.apache.org/>`_ server. It
-only writes the configuration files and enables and starts the service. It *does
-not* install the necessary packages.
-
-
-Parameters
-----------
-
-Technically this role has no parameters, but the following parameters are used
-by ``profile::zookeeper``.
-
-=================  =========  =========================================
-myid               string     hiera('zookeeper::myid')
-zookeeper_nodes    array      hiera('zookeeper::zookeeper_nodes', [])
-=================  =========  =========================================
-
-
-``myid``
-~~~~~~~~
-
-The unique ID of the zookeeper node.
-
-
-``zookeeper_nodes``
-~~~~~~~~~~~~~~~~~~~
-
-The list off zookeeper nodes in the cluster.