diff --git a/docsrc/imap/concepts/deployment/storage.rst b/docsrc/imap/concepts/deployment/storage.rst
index 682db62f4f..926ddc2d5b 100644
--- a/docsrc/imap/concepts/deployment/storage.rst
+++ b/docsrc/imap/concepts/deployment/storage.rst
@@ -969,11 +969,3 @@ chunks, which may not be what you require at that moment.
 .. _Cluster LVM: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Logical_Volume_Manager_Administration/LVM_Cluster_Overview.html
 .. _dm-cache: http://en.wikipedia.org/wiki/Dm-cache
 .. _Kolab Systems AG: https://kolabsys.com
-
-.. glossary::
-        MTBF
-            Mean Time Between Failures
-
-.. glossary::
-        HBA
-            Host Bus Adapter - connects a host system (computer) to other network and storage devices
diff --git a/docsrc/imap/concepts/features/server-aggregation.rst b/docsrc/imap/concepts/features/server-aggregation.rst
index 0c99fadd38..f73ecb01be 100644
--- a/docsrc/imap/concepts/features/server-aggregation.rst
+++ b/docsrc/imap/concepts/features/server-aggregation.rst
@@ -387,13 +387,3 @@ Back to :ref:`imap-features`
 
     Including but not limited to ``SELECT``, ``UID MOVE``, ``RENAME``,
     etc.
-
-.. glossary::
-
-    frontend
-	  the user interface
-
-.. glossary::
-
-	backend
-	  the server components