diff --git a/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html b/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
index 2f1a95cd0a8d9d821f998577cc1702cb8f9fe0a8..7ac2f4ce4bce76d701945e6d363e028327f3fafc 100644
--- a/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
+++ b/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
@@ -1,8 +1,6 @@
 <div id="o_cal_config_below_cal_container">
 	<div class="o_cal_toptoolbar clearfix">
-		<div class="o_cal_toptoolbar_help">
-			$r.contextHelp("Calendar")
-		</div>
+		$r.contextHelpWithWrapper("Calendar")
 		#if ($r.available("calsubscription"))
 			$r.render("calsubscription")
 		#end
diff --git a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html b/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html
deleted file mode 100644
index 837229212382356ef999f24860e954d1cf140a02..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
-	<b>$r.translate("selection.forumAsPopup.label"):</b> $r.translate("chelp.inl")  
diff --git a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html b/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html
deleted file mode 100644
index 28c99d12aef68dcfead309e0b32ac1fb84c8de77..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
-	$r.translate("chelp.upl1") $r.translate("chelp.upl2") 
-
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html
deleted file mode 100644
index be6336cd19147a6030aa02aba897aae4fc7381ff..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/><b>$r.translate("file.name"):</b> $r.translate("chelp.qtiFile1-self") <br/><br/>
-	$r.translate("chelp.qtiFile2-self") <br/><br/>
-	$r.translate("chelp.caution") $r.translate("chelp.qtiFile3-self")<br/>
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html
deleted file mode 100644
index 099464ddff5d4253d65d5a3f089ae53b9199a408..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/><b>$r.translate("file.name"):</b> $r.translate("chelp.qtiFile1-surv") <br/><br/>
-	$r.translate("chelp.qtiFile2-surv") <br/><br/>
-	$r.translate("chelp.caution") $r.translate("chelp.qtiFile3-surv")<br/>
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html
deleted file mode 100644
index f800e6c6e866104aa8144c1f66aef5231c76d867..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-self")<br/><br/> 
-
-	<b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b> 
-	$r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/> 
-	$r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html
deleted file mode 100644
index b91ef6e917e72d7451eeade3392c7dbf10eb20cb..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-surv")<br/><br/> 
-
-	<b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b> 
-	$r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/> 
-	$r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html
deleted file mode 100644
index e427138ed5ff832da74b348472ac98a03d4ca45c..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-test")<br/><br/> 
-
-	<b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b> 
-	$r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/> 
-	$r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
index 1909d6dc9387502b2c503420365906383433536f..20d527afcfac1fd69562df68a8a4876231bf82f8 100644
--- a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
@@ -90,8 +90,7 @@ public class ModulesForm extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("form.modules.title");
-		setFormContextHelp("org.olat.course.nodes.ta","ced-ta-select.html","help.hover.ta-module");
-		
+
 		task = uifactory.addCheckboxesHorizontal("task", "form.modules.task", formLayout, new String[]{"xx"}, new String[]{""});
 		dropbox = uifactory.addCheckboxesHorizontal("dropbox", "form.modules.dropbox", formLayout, new String[]{"xx"}, new String[]{""});
 		returnbox = uifactory.addCheckboxesHorizontal("returnbox", "form.modules.returnbox", formLayout, new String[]{"xx"}, new String[]{""});
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html
deleted file mode 100644
index 9b338d405b1723afea5bdb28c2bd8f89cb1612cc..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html
+++ /dev/null
@@ -1,8 +0,0 @@
- <br/>
- $r.translate("chelp.ass1")<br/><br/> 
-	<b>$r.translate("form.task.text"):</b> $r.translate("chelp.ass2")<br/><br/> 
-	<b>$r.translate("form.task.type"):</b> $r.translate("chelp.ass3")<br/><br/> 
-	<b>$r.translate("form.task.sampling"):</b> <i>&laquo;$r.translate("form.task.sampling.with")&raquo;</i> $r.translate("chelp.ass4")<br/> 
-	<i>&laquo;$r.translate("form.task.sampling.without")&raquo;</i> $r.translate("chelp.ass5")<br/><br/> 
-	<b>$r.translate("form.task.preview"):</b> $r.translate("chelp.ass6")<br/>
-	$r.translate("chelp.ass7")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html
deleted file mode 100644
index 0aad076a8bcb4165369ec720aeac78af73d8f78d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
-	<b>$r.translate("form.dropbox.confirmation"):</b> $r.translate("chelp.conf1")<br/><br/>
-	<b>$r.translate("form.dropbox.enablemail"):</b> $r.translate("chelp.conf2")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html
deleted file mode 100644
index da4d647970885ac4b3ada0579b91c13e59239439..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
-	$r.translate("chelp.sel1")<br/> 
-	$r.translate("chelp.sel2")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html
deleted file mode 100644
index a1bd8d87d817f4c8e5c4fd6c022ae1a82607c057..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
-	$r.translate("chelp.sol1")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html
deleted file mode 100644
index 7b22c8e3eb214259bbb36b605a8c8daaccd88649..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
-	$r.translate("chelp.upl1")<br/><br/> 
-	$r.translate("chelp.upl2")