diff --git a/src/main/java/de/bps/course/nodes/den/DENDatesForm.java b/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
index ddbef89130cf70c74abb77f408b79b584e63c6ad..acf8d0c2b36079b7e9d776ec13b51b1c923605aa 100644
--- a/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
+++ b/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
@@ -77,7 +77,7 @@ public class DENDatesForm extends FormBasicController {
 			showDurationTE = true;
 			showPauseTE = true;
 			showRetakeTE = true;
-			setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-creat.html","help.hover.den");
+			setFormContextHelp("Other#_addentry");
 		} else if(layout == EDIT_SINGLE_DATE_LAYOUT) {
 			showBeginDateChooser = true;
 			showDurationTE = true;
diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html
deleted file mode 100644
index e7610354f175ab03f2d08056ba88f210fff265ff..0000000000000000000000000000000000000000
--- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html
+++ /dev/null
@@ -1,7 +0,0 @@
-$r.translate("chelp.denConf") <br/><br/><br/>
-<fieldset>
-	<legend>$r.translate("config.header")</legend> 
-	<b>$r.translate("config.dates")</b> $r.translate("chelp.btnConfDates") <br/><br/>
-	<b>$r.translate("run.enrollment.list")</b> $r.translate("chelp.btnManageParts") <br/><br/>
-	<b>$r.translate("form.enableCancelEnroll"):</b> $r.translate("chelp.optCancEnr") 
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html
deleted file mode 100644
index 44c07317ca0624fa554595990f2834a76c2a24e4..0000000000000000000000000000000000000000
--- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html
+++ /dev/null
@@ -1,13 +0,0 @@
-$r.translate("chelp.createDatesGen") <br/><br/> 
-$r.translate("chelp.btnCreateDates") <br/><br/>
-<fieldset>
-	<legend>$r.translate("config.default.values")</legend>
-	<b>$r.translate("config.dates.subject"):</b> $r.translate("chelp.inputTitle") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.begin"):</b> $r.translate("chelp.inputBegin") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.duration"):</b> $r.translate("chelp.inputDuration") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.pause"):</b> $r.translate("chelp.inputPause") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.retakes"):</b> $r.translate("chelp.inputRetakes") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.participants"):</b> $r.translate("chelp.inputParts") $r.translate("chelp.must") <br/><br/> 
-	<b>$r.translate("config.dates.location"):</b> $r.translate("chelp.inputLocation") $r.translate("chelp.must") <br/><br/>
-	<b>$r.translate("config.dates.comment"):</b> $r.translate("chelp.inputComment") 
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/de/bps/course/nodes/den/_content/edit.html b/src/main/java/de/bps/course/nodes/den/_content/edit.html
index 51e95d03f1d98d83cf6353ced44b127e68258fd2..d4b72e10dfe5f4f4047d6d6df32e9dd1e5868d09 100644
--- a/src/main/java/de/bps/course/nodes/den/_content/edit.html
+++ b/src/main/java/de/bps/course/nodes/den/_content/edit.html
@@ -1,6 +1,6 @@
 <fieldset>
 	<legend>$r.translate("config.header")</legend>
-	$r.contextHelpWithWrapper("de.bps.course.nodes.den","ced-den-conf.html","help.hover.den")
+	$r.contextHelpWithWrapper("Other#_terminvergabe")
 	<div>$r.render("config.dates")&nbsp;$r.render("run.enrollment.list")</div>
 	<br />
 	<div>$r.render("dateform")</div>
diff --git a/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html b/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html
deleted file mode 100644
index 470e3e2cc8e7a76e55857086a2f4da55f6d88fbe..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<br/>
-$r.translate("chelp.flexion.define") <br/><br/>
-$r.translate("chelp.flexions.get.button") <br/><br/>
-$r.translate("chelp.no.morph.service") <br/><br/>
-$r.translate("chelp.morph.service") <br/><br/>
-$r.translate("chelp.morph.service.example") <br/><br/> 
-<br/>
-$r.translate("chelp.morph.intro") <br/><br/>
-$r.translate("chelp.morph.example") <br/><br/>
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html b/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html
index 4de551c3e5e94ee6f00d8ec0f6e92360277866ce..f4e5a30751f6f29cf894ceb90de491d8d4799f70 100644
--- a/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html
+++ b/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html
@@ -1,5 +1,5 @@
 <br/>
-<div style="padding-right:1em; padding-top:0.5em;">$r.contextHelpWithWrapper("org.olat.core.commons.modules.glossary","glossary-flexion.html","help.hover.flexion")</div>
+<div style="padding-right:1em; padding-top:0.5em;"></div>
 $r.translate("flexions.intro")
 $r.translate("flexions.intro.ms") <br/><br/>
 $r.translate("choose.morph.service")
diff --git a/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html b/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html
deleted file mode 100644
index 4bb266cd83cd055d5b5c0053a39edc5edb7be387..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<br />
-	<b>$r.translate("mailtemplateform.sendMailSwitchElem"):</b> $r.translate("chelp.sendMail1")<br /><br />
-	<b>$r.translate("mailtemplateform.subject"):</b>$r.translate("chelp.mailtempsubject")<br /><br />
-	<b>$r.translate("mailtemplateform.body"):</b>$r.translate("chelp.mailtemplateformbody")<br /><br />
-	$r.translate("chelp.sendMail5")
-	<ul>
-	<li><b>$</b><b>groupname</b> : $r.translate("chelp.sendMail6")</li>
-	<li><b>$</b><b>groupdescription</b> : $r.translate("chelp.sendMail7")</li>
-	<li><b>$</b><b>courselist</b> : $r.translate("chelp.sendMail8")</li>
-	</ul>
-    <b>$r.translate("contact.cp.from") :</b> $r.translate("chelp.sendMail2")<br /><br /> 
-    
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/mail/_content/mailnotification.html b/src/main/java/org/olat/core/util/mail/_content/mailnotification.html
index 0357ed4f616004ca1f0f740eb6c5474ca3b2946b..0b98e3b96d11dab29dd941bf0f990a31ab43e5cb 100644
--- a/src/main/java/org/olat/core/util/mail/_content/mailnotification.html
+++ b/src/main/java/org/olat/core/util/mail/_content/mailnotification.html
@@ -1,5 +1,4 @@
 <fieldset>
 	<legend>$r.translate("mailnotification.title")</legend>
-  	$r.contextHelpWithWrapper("org.olat.core.util.mail","mail-templ.html","help.hover.mail-templ")
 	$r.render("mailForm")
 </fieldset>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html
deleted file mode 100644
index e2b4069416ec038bc1e3a08ba3a320b0f694e02a..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html
+++ /dev/null
@@ -1,4 +0,0 @@
- <br/>
-
-	$r.translate("chelp.projectbroker.themenverantwortliche") <br/>
-	$r.translate("chelp.projectbroker.themenverantwortlicheDelete") <br/>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html
deleted file mode 100644
index 552f49bf7e4bd64ee5c8a8aa9dddf516fb6d5b55..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
-	$r.translate("chelp.projectbroker.editModules") <br/><br/>
-<br/>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html
deleted file mode 100644
index 5538d9d4878fa8fe7421c28dd305567dbf3490f8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html
+++ /dev/null
@@ -1,14 +0,0 @@
- <br/>
-	<b>$r.translate("chelp.projectbroker.themaSg"):</b> $r.translate("chelp.projectbroker.editProjectTheme") <br/> <br/>
-	<b>$r.translate("detailsform.projectleaders.label"):</b> $r.translate("chelp.projectbroker.editProjectResponsible") <br/> <br/>
-	<b>$r.translate("detailsform.description.label"):</b> $r.translate("chelp.projectbroker.editProjectDescription") <br/> <br/>
-	<b>$r.translate("chelp.projectbroker-optionsCustomfields.title"):</b> $r.translate("chelp.projectbroker.editProjectCustomFields") <br/> <br/>
-	<b>$r.translate("enrollment_event.label"):</b> $r.translate("chelp.projectbroker.editProjectEnrollmentEvent") <br/> <br/>
-	<b>$r.translate("handout_event.label"):</b> $r.translate("chelp.projectbroker.editProjectHandoutEvent") <br/> <br/>	
-	$r.translate("chelp.projectbroker.editProjectTermine") <br/> <br/>	
-	<b>$r.translate("detailsform.state.label"):</b> $r.translate("chelp.projectbroker.editProjectStateLabelParticipant") <br/> <br/>
-	$r.translate("chelp.projectbroker.descriptionProjectStateLabelProjectManager") <br/> 
-	$r.translate("chelp.projectbroker.editProjectStateLabelGeneral") <br/> <br/>
-	<b>$r.translate("detailsform.places.label"):</b> $r.translate("chelp.projectbroker.editProjectPlacesLabel") <br/> <br/>
-    <b>$r.translate("detailsform.attachmentfilename.label"):</b> $r.translate("chelp.projectbroker.editProjectAttachmentfilename") <br/> <br/>
-	<b>$r.translate("detailsform.mail.notification.label"):</b> $r.translate("chelp.projectbroker.editProjectDetailsformMailNnotification") <br/> <br/>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html
deleted file mode 100644
index 942b04eeb9203c21459bd17bd4a7c98e4761f519..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
-	$r.translate("chelp.projectbroker.leaderVerantwortliche") <br/> <br/>		
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html
deleted file mode 100644
index b3728d954ff4bb204ab6afa8aa668a18d3ca68ba..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
-	$r.translate("chelp.projectbroker.memberAkzeptierteTeilnehmer") <br/> <br/>		
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html
deleted file mode 100644
index 47c1247c085e9e53d5da92d9a829fc050369a7e5..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html
+++ /dev/null
@@ -1,6 +0,0 @@
- <br/>
-	$r.translate("chelp.projectbroker.customfieldAddFieldLink")<br/>
-	$r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldNameLabel")<br/>
-	$r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldValueLabel")<br/>
-	$r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldTableEnabled")<br/>
-	$r.translate("chelp.projectbroker.customfieldDeleteLink")<br/>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html
deleted file mode 100644
index b324b0db7713b1c0fd731a65d8d916761728c6dd..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html
+++ /dev/null
@@ -1,6 +0,0 @@
- <br/>
-	$r.translate("chelp.projectbroker.formOptionsDateLegend")<br/><br/>
-<b>$r.translate("projectlist.tableheader.event.enrollment_event"):</b> $r.translate("chelp.projectbroker.projectlistTableheaderEventEnrollmentEvent") <br/> <br/>
-
-<b>$r.translate("projectlist.tableheader.event.handout_event"):</b> $r.translate("chelp.projectbroker.projectlistTableheaderEventHandoutEvent") <br/> <br/>
-$r.translate("chelp.projectbroker.eventTableViewEnabled")<br/>
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html
deleted file mode 100644
index faba92686d5b47c64534612e27d88c2a4da9b705..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html
+++ /dev/null
@@ -1,6 +0,0 @@
- <br/>
-	<b>$r.translate("form.options.number.of.topics.per.participant"):</b> $r.translate("chelp.projectbroker.numberOfTopicsPerParticipant") <br/> <br/>
-	<b>$r.translate("form.options.selection.accept"):</b> 
-	$r.translate("chelp.projectbroker.selectionAccept")<br/>
-	$r.translate("chelp.projectbroker.noSelectionAccept")<br/><br/>
-	<b>$r.translate("form.options.auto.sign.out"):</b> $r.translate("chelp.projectbroker.optionsAutoSignOut")<br/>
diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png b/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png
deleted file mode 100644
index 376f0689fac7b769c0b53f6a153daf4851a5cdd9..0000000000000000000000000000000000000000
Binary files a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png and /dev/null differ
diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png b/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png
deleted file mode 100644
index 376f0689fac7b769c0b53f6a153daf4851a5cdd9..0000000000000000000000000000000000000000
Binary files a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png and /dev/null differ
diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html b/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html
deleted file mode 100644
index da555aaa1f45da7170004d28f1ab9132d8345db3..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html
+++ /dev/null
@@ -1,248 +0,0 @@
-$r.translate("chelp.wiked1") 
-$r.translate("chelp.wiked10") 
-<br/>
-<a href="http://jamwiki.org/wiki/en/Wiki_Syntax" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://jamwiki.org/wiki/en/Wiki_Syntax</a>
-<br/><br/>
-$r.translate("chelp.caution") <br/>
-$r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/>
-
-
-<table class="table table-bordered">
-	<thead>
-		<tr>
-			<th width="50%">$r.translateWithPackage("org.olat.course.editor","chelp.synt")</th>
-			<th width="50%">$r.translate("chelp.format") </th> 
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit1") </b></td>
-		</tr>
-
-		<tr>
-			<td>'''$r.translateWithPackage("org.olat.modules.wiki","button.bold") '''</td>
-			<td><b>$r.translateWithPackage("org.olat.modules.wiki","button.bold")</b></td>
-		</tr>
-
-		<tr>
-			<td>''$r.translateWithPackage("org.olat.modules.wiki","button.italic")''</td>
-			<td><i>$r.translateWithPackage("org.olat.modules.wiki","button.italic")</i></td>
-		</tr>
-
-		<tr>
-			<td>==$r.translateWithPackage("org.olat.modules.wiki","button.headline")==</td>
-			<td>
-			<h2>$r.translateWithPackage("org.olat.modules.wiki","button.headline")</h2>
-			</td>
-		</tr>
-
-		<tr>
-			<td>* $r.translateWithPackage("org.olat.modules.wiki","button.list")</td>
-			<td>
-			<ul>
-				<li>$r.translateWithPackage("org.olat.modules.wiki","button.list")</li>
-			</ul>
-			</td>
-		</tr>
-
-		<tr>
-			<td># $r.translateWithPackage("org.olat.modules.wiki","button.numlist")</td>
-			<td>
-			<ol>
-				<li>$r.translateWithPackage("org.olat.modules.wiki","button.numlist")
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit2") </b></td>
-		</tr>
-
-		<tr>
-			<td colspan="2">$r.translate("chelp.wiked2") $r.translate("chelp.wiked3") 
-			$r.translate("chelp.wiked4") $r.translate("chelp.wiked5") </td>
-		</tr>
-
-		<tr>
-			<td>[[$r.translateWithPackage("org.olat.modules.wiki","button.link")]]</td>
-			<td><a name="linktext"></a>$r.translateWithPackage("org.olat.modules.wiki","button.link")</td>
-		</tr>
-
-		<tr>
-			<td>[[$r.translate("chelp.link") | $r.translate("chelp.text")]]</td>
-			<td><a name="linkandtext"></a><a href="#linkandtext">$r.translate("chelp.text")</a></td>
-		</tr>
-
-		<tr>
-			<td colspan="2">$r.translate("chelp.wiked6") $r.translate("chelp.wiked7") </td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.extlink") </td>
-			<td>$r.translate("chelp.extlinkF") </td>
-		</tr>
-
-		<tr>
-			<td>[$r.translate("chelp.extlink") $r.translate("chelp.oorg")]</td>
-			<td><a href="$r.translate("chelp.extlink")" target="_blank">$r.translate("chelp.oorg")</a></td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit3") </b></td>
-		</tr>
-
-		<tr>
-			<td>{|<br/>
-			|$r.translate("chelp.cell") 1<br/>
-			|$r.translate("chelp.cell") 2<br/>
-			|} </td>
-			<td>
-				<table border="0">
-					<tr>
-						<td>$r.translate("chelp.cell") 1</td>
-						<td>$r.translate("chelp.cell") 2</td>
-					</tr>
-				</table></td>
-		</tr>
-
-		<tr>
-			<td>{|	<br/>
-			|$r.translate("chelp.cell") 1<br/>
-			|$r.translate("chelp.cell") 2<br/>
-			|- <br/>
-			|$r.translate("chelp.cell") 3<br/>
-			|$r.translate("chelp.cell") 4<br/>
-			|}</td>
-			<td>
-				<table border="0">
-					<tr>
-						<td>$r.translate("chelp.cell") 1</td>
-						<td>$r.translate("chelp.cell") 2</td>
-					</tr><tr>
-						<td>$r.translate("chelp.cell") 3</td>
-						<td>$r.translate("chelp.cell") 4</td>
-					</tr>
-				</table></td>
-		</tr>
-
-		<tr>
-			<td>{| border="1" <br/>
-			|$r.translate("chelp.cell") 1<br/>
-			|$r.translate("chelp.cell") 2<br/>
-			|- <br/>
-			|$r.translate("chelp.cell") 3<br/>
-			|$r.translate("chelp.cell") 4<br/>
-			|}</td>
-			<td>
-				<table border="1">
-					<tr>
-						<td>$r.translate("chelp.cell") 1</td>
-						<td>$r.translate("chelp.cell") 2</td>
-					</tr>
-					<tr>
-						<td>$r.translate("chelp.cell") 3</td>
-						<td>$r.translate("chelp.cell") 4</td>
-					</tr>
-				</table></td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit4") </b></td>
-		</tr>
-
-		<tr>
-			<td colspan="2">$r.translate("chelp.wiked8") $r.translate("chelp.wiked9") </td>
-		</tr>
-
-		<tr>
-			<td>[[Image:openolat_logo_72.png]]</td>
-			<td><img src="$chelpStaticDirUrl/openolat_logo_72.png" /></td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			$r.translate("chelp.wiked91") </td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.wiked92") <br/>
-			[[Image:openolat_logo_72.png|$r.translate("chelp.wiked922")]]</td>
-			<td><img src="$chelpStaticDirUrl/openolat_logo_72.png" /><br/>
-			$r.translate("chelp.wiked922") </td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.wiked93") <br/>
-			[[Image:openolat_logo_72.png|right]]</td>
-			<td>
-			<div align="right"><img src="$chelpStaticDirUrl/openolat_logo_72.png" /></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.wiked94") <br/>
-			[[Image:openolat_logo_72.png|120px]]</td>
-			<td><img src="$chelpStaticDirUrl/openolat_logo_72.png" width="120px" /></td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.wiked95") $r.translate("chelp.wiked96") <br/>
-			[[Image:openolat_logo_72.png|thumb|20px]]</td>
-			<td><a href="$chelpStaticDirUrl/openolat_logo_72.png" target="_blank"><img
-				src="$chelpStaticDirUrl/openolat_logo_72.png" width="20px" /></a></td>
-		</tr>
-
-		<tr>
-			<td>$r.translate("chelp.wiked97")<br/>
-			[[Image:olat_logo.png|right|30px|thumb|$r.translate("chelp.wiked922") ]]</td>
-			<td>
-			<div align="right"><a href="$chelpStaticDirUrl/openolat_logo_72.png"
-				target="_blank"><img src="$chelpStaticDirUrl/openolat_logo_72.png" width="30px" /></a><br />
-			$r.translate("chelp.wiked922") </div>
-			</td>
-		</tr>
-
-		<tr>
-			<td>[[Media:any.pdf]]</td>
-			<td><a name="pdf"></a><a href="#pdf">any.pdf</a></td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br />
-			<b>$r.translateWithPackage("org.olat.modules.wiki","button.math") </b><br />
-			$r.translate("chelp.wiked121")
-			<br />
-			$r.translate("chelp.wiked122") 
-			<br />
-			<a href="http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html</a>
-			</td>
-		</tr>
-
-		<tr>
-			<td>&lt;math&gt;$r.translateWithPackage("org.olat.modules.wiki","enter.math")&lt;/math&gt;</td>
-			<td>
-				$r.translate("chelp.wiked12") 
-				<br />
-				<a href="http://meta.wikimedia.org/wiki/Help:Formula" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://meta.wikimedia.org/wiki/Help:Formula</a> 
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit5") </b></td>
-		</tr>
-
-		<tr>
-			<td>&lt;nowiki&gt;$r.translateWithPackage("org.olat.modules.wiki","enter.nowiki")&lt;/nowiki&gt;</td>
-			<td>$r.translateWithPackage("org.olat.modules.wiki","enter.nowiki")</td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><br/>
-			<b>$r.translate("chelp.subtit6") </b></td>
-		</tr>
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html b/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html
deleted file mode 100644
index 4cfead5dc93040430a9b2e424a4c1abcb0e76c7f..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<br/>
-	$r.translate("chelp.wiki1") $r.translate("chelp.wiki2") <br/><br/>
-	$r.translate("chelp.wiki3") $r.translate("chelp.wiki4") 
diff --git a/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html b/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html
index 0357ed4f616004ca1f0f740eb6c5474ca3b2946b..0b98e3b96d11dab29dd941bf0f990a31ab43e5cb 100644
--- a/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html
+++ b/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html
@@ -1,5 +1,4 @@
 <fieldset>
 	<legend>$r.translate("mailnotification.title")</legend>
-  	$r.contextHelpWithWrapper("org.olat.core.util.mail","mail-templ.html","help.hover.mail-templ")
 	$r.render("mailForm")
 </fieldset>