diff --git a/guides/common/assembly_api-requests-in-various-languages.adoc b/guides/common/assembly_api-requests-in-various-languages.adoc
index 33954109d2..b49c2946e4 100644
--- a/guides/common/assembly_api-requests-in-various-languages.adoc
+++ b/guides/common/assembly_api-requests-in-various-languages.adoc
@@ -10,8 +10,6 @@ include::modules/proc_listing-users.adoc[leveloffset=+3]
 
 include::modules/proc_creating-and-modifying-resources.adoc[leveloffset=+2]
 
-// TODO: Only include parts?
-//       Use tags to mitigate this?
 include::modules/proc_creating-a-user.adoc[leveloffset=+2]
 
 include::modules/proc_modifying-a-user.adoc[leveloffset=+2]
diff --git a/guides/common/modules/proc_applying-errata-to-a-host-collection.adoc b/guides/common/modules/proc_applying-errata-to-a-host-collection.adoc
index 13fdfef7b4..32ec69f027 100644
--- a/guides/common/modules/proc_applying-errata-to-a-host-collection.adoc
+++ b/guides/common/modules/proc_applying-errata-to-a-host-collection.adoc
@@ -3,6 +3,7 @@
 
 You can use {Project} to apply errata to a host collection.
 
+ifndef::rest-api[]
 [id="cli-applying-errata-to-a-host-collection"]
 .CLI procedure
 [options="nowrap", subs="+quotes,verbatim,attributes"]
@@ -12,6 +13,7 @@ You can use {Project} to apply errata to a host collection.
 --inputs errata=_ERRATUM_ID1_,_ERRATUM_ID2_,... \
 --search-query "host_collection = _HOST_COLLECTION_NAME_"
 ----
+endif::[]
 
 [id="api-applying-errata-to-a-host-collection"]
 .API procedure
diff --git a/guides/common/modules/proc_applying-errata-to-hosts.adoc b/guides/common/modules/proc_applying-errata-to-hosts.adoc
index ae28b62b3e..70863bbd5e 100644
--- a/guides/common/modules/proc_applying-errata-to-hosts.adoc
+++ b/guides/common/modules/proc_applying-errata-to-hosts.adoc
@@ -2,6 +2,7 @@
 = Applying errata to hosts
 
 You can use {Project} apply errata to hosts.
+ifndef::rest-api[]
 To use the API instead of the {ProjectWebUI}, see the xref:api-applying-errata-to-hosts[].
 
 .Procedure
@@ -9,6 +10,7 @@ To use the API instead of the {ProjectWebUI}, see the xref:api-applying-errata-t
 . Select a host collection.
 . On the *Actions* tab, click *Errata Installation*.
 . Follow the {ProjectWebUI} to install errata.
+endif::[]
 
 [id="api-applying-errata-to-hosts"]
 .API procedure
diff --git a/guides/common/modules/proc_creating-a-user.adoc b/guides/common/modules/proc_creating-a-user.adoc
index e4c2638c4d..1a97d5b229 100644
--- a/guides/common/modules/proc_creating-a-user.adoc
+++ b/guides/common/modules/proc_creating-a-user.adoc
@@ -2,6 +2,7 @@
 = Creating a user
 
 Use this procedure to create a user.
+ifndef::rest-api[]
 To use the CLI instead of the {ProjectWebUI}, see the xref:cli-creating-a-user_{context}[].
 
 .Procedure
@@ -46,7 +47,8 @@ You can modify the user details later by using the `hammer user update` command.
 
 .Additional resources
 * For more information about creating user accounts by using Hammer, enter `hammer user create --help`.
- 
+endif::[]
+
 [id="api-creating-a-user"]
 .API request
 [options="nowrap", subs="+quotes,attributes"]