diff --git a/docs/00a-preamble/01-what-to-expect-of-an-advanced-level-module.adoc b/docs/00a-preamble/01-what-to-expect-of-an-advanced-level-module.adoc
index b3b2df5..f2c2328 100644
--- a/docs/00a-preamble/01-what-to-expect-of-an-advanced-level-module.adoc
+++ b/docs/00a-preamble/01-what-to-expect-of-an-advanced-level-module.adoc
@@ -13,5 +13,3 @@ Das Modul kann unabhängig von einer CPSA-F-Zertifizierung besucht werden.
 - The certification is done as an assignment. The assessment and oral exam is conducted by experts appointed by the iSAQB.
 // end::EN[]
 
-// tag::REMARK[]
-// end::REMARK[]
diff --git a/docs/00a-preamble/02-advanced-level-knowledge.adoc b/docs/00a-preamble/02-advanced-level-knowledge.adoc
index aae5631..9d5683e 100644
--- a/docs/00a-preamble/02-advanced-level-knowledge.adoc
+++ b/docs/00a-preamble/02-advanced-level-knowledge.adoc
@@ -19,5 +19,3 @@ CPSA-A graduates can:
 - Control and execute architecture-relevant communication in medium to large development teams
 // end::EN[]
 
-// tag::REMARK[]
-// end::REMARK[]
diff --git a/docs/00a-preamble/03-prerequisites.adoc b/docs/00a-preamble/03-prerequisites.adoc
index d667fd1..adc00b6 100644
--- a/docs/00a-preamble/03-prerequisites.adoc
+++ b/docs/00a-preamble/03-prerequisites.adoc
@@ -23,6 +23,3 @@
 [.text-center]
 image:00-preamble/cpsa-a-logo.png[pdfwidth=50%,align=center,alt="Certified Professional for Software Architecture^(R)^ Advanced Level (CPSA-A)"]
 
-
-// tag::REMARK[]
-// end::REMARK[]
diff --git a/docs/00b-basics/03-timing-didactics-and-more.adoc b/docs/00b-basics/03-timing-didactics-and-more.adoc
index 7fed704..a17e838 100644
--- a/docs/00b-basics/03-timing-didactics-and-more.adoc
+++ b/docs/00b-basics/03-timing-didactics-and-more.adoc
@@ -1,9 +1,3 @@
-// tag::REMARK[]
-[NOTE]
-====
-Bitte die **?** durch die Anzahl der Tage sowie die erreichbaren Punkte ersetzen.
-====
-// end::REMARK[]
 :recommended-duration-in-days: 3
 :methodical-credits: 10
 :technical-credits: 20
diff --git a/docs/00b-basics/06-complementary-information.adoc b/docs/00b-basics/06-complementary-information.adoc
index 3b13374..ca22d6a 100644
--- a/docs/00b-basics/06-complementary-information.adoc
+++ b/docs/00b-basics/06-complementary-information.adoc
@@ -11,5 +11,3 @@ Soweit für das Verständnis des Lehrplans erforderlich, haben wir Fachbegriffe
 To the extent necessary for understanding the curriculum, we have added definitions of technical terms to the https://github.com/isaqb-org/glossary[iSAQB glossary] and complemented them by references to (translated) literature.
 // end::EN[]
 
-// tag::REMARK[]
-// end::REMARK[]
diff --git a/docs/config/setup.adoc b/docs/config/setup.adoc
index 16edc7b..9241455 100644
--- a/docs/config/setup.adoc
+++ b/docs/config/setup.adoc
@@ -2,14 +2,6 @@
 :icons: font
 :sectnumlevels: 2
 :imagesdir: images
-
-// if the attribute ":withRemarks:" is set, we amend every content-include
-// by ";REMARK", so that the sections tagged "REMARK" are always included.
-:withRemarks!:
-:remarks:
-ifdef::withRemarks[]
-:remarks: ;REMARK
-endif::withRemarks[]
 :!chapter-signifier:
 
 // ":language:" denotes the language or the target document.
@@ -17,9 +9,8 @@ endif::withRemarks[]
 :language: DE
 
 // ":include_configuration:" always consists of the language, optionally
-// followed by ";REMARK"
 // additional markers might be configured here!
-:include_configuration: tags=**;{language}{remarks};!*
+:include_configuration: tags=**;{language};!*
 
 :curriculum-short: EMBEDDED
 
@@ -32,16 +23,3 @@ ifeval::["{language}" == "EN"]
 :curriculum-name: Dependable Embedded Systems
 :curriculum-header-title: iSAQB curriculum for Advanced Level: {curriculum-short}
 endif::[]
-
-// you might want to output some internal information...
-ifdef::debug_adoc[]
-[NOTE]
-====
-Current configuration:
-
-* Language(s): {language}
-* Document version: {document-version}
-* Include-configuration: {include_configuration}
-
-====
-endif::debug_adoc[]
diff --git a/scripts/includeLearningObjectives.gradle b/scripts/includeLearningObjectives.gradle
index e072584..c11c1b0 100644
--- a/scripts/includeLearningObjectives.gradle
+++ b/scripts/includeLearningObjectives.gradle
@@ -89,13 +89,10 @@ ext.writeLearningObjectives = { contentDE, contentEN ->
 
     println "Learning objectives file: " + outFile.getAbsolutePath()
 
-    final String EMPTYRemark = """// tag::REMARK[]\n// end::REMARK[]\n"""
-
     outFile.withWriter('UTF-8') { writer ->
         writer.writeLine("// this is autogenerated - please do not modify manually!\n")
         writer.writeLine(contentDE)
         writer.writeLine(contentEN)
-        writer.writeLine(EMPTYRemark)
     }
 }