diff --git a/pom.xml b/pom.xml
index 685bf5b1c3ef15aca16d3d391507b9b533081659..ae900cd80b8b87ce31a6b425e1f360c962b58c74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2168,11 +2168,6 @@
 			<artifactId>velocity</artifactId>
 			<version>1.6.2</version>
 		</dependency>
-		<dependency>
-			<groupId>radeox</groupId>
-			<artifactId>radeox</artifactId>
-			<version>1.0-b2</version>
-		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
diff --git a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
index 6f925bbc2b04e1acac8d3a8939f3b366d0c3e420..d34891a9ccf2835f32e030b102526fb7a9b2ab42 100644
--- a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
+++ b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
@@ -581,20 +581,6 @@ public class VelocityRenderDecorator {
 		return f.formatDateAndTime(date);
 	}
 
-	/**
-	 * Interpret this string using the radeox wiki markup language
-	 * 
-	 * @Deprecated The wiki markup area is no longer supported. In the legacy form
-	 *             infrastructure it's still there, but it won't be available in the
-	 *             new flexi forms. In flexi forms use the RichTextElement instead.
-	 * 
-	 * @param wikiMarkupString The original string written in radeox markup
-	 * @return String HTML formatted text
-	 */
-	@Deprecated
-	public String formatWikiMarkup(String wikiMarkupString) {
-		return Formatter.formatWikiMarkup(wikiMarkupString);
-	}
 
 	/**
 	 * Wrapp given html code with a wrapper an add code to transform latex
diff --git a/src/main/java/org/olat/core/util/Formatter.java b/src/main/java/org/olat/core/util/Formatter.java
index eab7e19c82eef31c0bfd24f6aba9a12d7ed9916c..fbe9dc162bd2e66689a7071a1b794ba57a2cd28b 100644
--- a/src/main/java/org/olat/core/util/Formatter.java
+++ b/src/main/java/org/olat/core/util/Formatter.java
@@ -41,12 +41,6 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.olat.core.commons.chiefcontrollers.BaseChiefController;
 import org.olat.core.logging.LogDelegator;
-import org.radeox.api.engine.RenderEngine;
-import org.radeox.api.engine.context.InitialRenderContext;
-import org.radeox.api.engine.context.RenderContext;
-import org.radeox.engine.BaseRenderEngine;
-import org.radeox.engine.context.BaseInitialRenderContext;
-import org.radeox.engine.context.BaseRenderContext;
 
 /**
  * enclosing_type Description: <br>
@@ -57,19 +51,8 @@ import org.radeox.engine.context.BaseRenderContext;
 public class Formatter extends LogDelegator {
 
 	private Locale locale;
-	private static RenderEngine engineWithContext;
-	private static BaseRenderContext baseRenderContext;
 	
-	static {
-		InitialRenderContext initialContext = new BaseInitialRenderContext();
-		Locale loc = new Locale("olat", "olat");
-		initialContext.set(RenderContext.INPUT_LOCALE, loc);
-		initialContext.set(RenderContext.OUTPUT_LOCALE, loc);
-		initialContext.set(RenderContext.INPUT_BUNDLE_NAME, "radeox_markup_olat"); 
-		initialContext.set(RenderContext.OUTPUT_BUNDLE_NAME, "radeox_markup_olat"); 
-		engineWithContext = new BaseRenderEngine(initialContext);
-		baseRenderContext = new BaseRenderContext();
-	}
+	
 
 	/**
 	 * Constructor for Formatter.
@@ -510,64 +493,7 @@ public class Formatter extends LogDelegator {
 	}
 
 	
-	/**
-	 * renders wiki markup like _italic_ to XHTML see also www.radeox.org
-	 * @Deprecated The wiki markup area is no longer supported. In the legacy form
-	 *             infrastructure it's still there, but it won't be available in the
-	 *             new flexi forms. In flexi forms use the RichTextElement instead.
-	 * 
-	 * tested during migration and expanded to prevent radeox failures
-	 * 
-	 * @param originalText
-	 * @return result (rendered originalText) or null if originalText was null
-	 */
-	@Deprecated
-	public static String formatWikiMarkup(String oldValue) {
-		if (oldValue != null) {
-			String newValue = "";
-			// oldValue = oldValue.replaceAll("<>", "&lt;&gt;");
-			// oldValue = oldValue.replaceAll(Pattern.quote("[]"),
-			// "&#91;&#93;");
-
-			// prevent error with {$} interpreted as regexp
-			String marker1 = "piYie6Eigh0phafeiTuk4dahwahvoh7eedoegee2egh8xuj9phah8eop8iuk";
-			oldValue = oldValue.replaceAll(Pattern.quote("{$}"), marker1);
-
-			// \{code} will result in an error => convert
-			String marker2 = "RohbaeW7xahbohk8iewoo7thocaemaech2pahS8oe1UVohkohJiugaagaeco";
-			oldValue = oldValue.replaceAll(Pattern.quote("\\{code}"), marker2);
-
-			// radeox gets an error, if {code} is not a closed tag. prevent at
-			// least the case with one single statement.
-			int nrOfCodeStatements = countOccurrences(oldValue, "{code}");
-			String marker3 = "shagheiph6enieNo0theph9aique0EihoChae6ve2edie4Pohwaok8thaoda";
-			if (nrOfCodeStatements == 1) {
-				oldValue = oldValue.replaceAll(Pattern.quote("{code}"), marker3);
-			}
-			if (nrOfCodeStatements % 2 != 0 && nrOfCodeStatements != 1) {
-				Formatter fInst = Formatter.getInstance(new Locale("olat"));
-				fInst.log("There will be a Warning/NPE from Radeox soon, as there are not enough {code} statements in a text.");
-				fInst.log("Old value of text will be kept! " + oldValue);
-			}
-
-			//added for compatibility with wikimedia syntax used in the new wiki component. org.olat.core.gui.components.wiki.WikiMarkupComponent
-			//filters " ''' " for bold and " ''''' " for bold/italic
-			oldValue = oldValue.replaceAll("(^|>|[\\p{Punct}\\p{Space}]+)'{3}(.*?)'{3}([\\p{Punct}\\p{Space}]+|<|$)", "$1*$2*$3");
-			oldValue = oldValue.replaceAll("(^|>|[\\p{Punct}\\p{Space}]+)'{5}(.*?)'{5}([\\p{Punct}\\p{Space}]+|<|$)", "$1_*$2*_$3");
-			
-			// try-catch not usable, as Radeox doesn't throw an exception,
-			// it just prints warnings and returns unconverted value!
-			newValue = engineWithContext.render(oldValue, baseRenderContext);
-			
-			// convert back
-			newValue = newValue.replaceAll(marker1, Matcher.quoteReplacement("{$}"));
-			newValue = newValue.replaceAll(marker2, Matcher.quoteReplacement("\\{code}"));
-			newValue = newValue.replaceAll(marker3, Matcher.quoteReplacement("{code}"));
-
-			return newValue;
-		} else
-			return null;
-	}
+	
 			
   private static int countOccurrences(String arg1, String arg2) {
     int count = 0;
diff --git a/src/main/java/org/olat/core/util/radeox/AngelFilter.java b/src/main/java/org/olat/core/util/radeox/AngelFilter.java
deleted file mode 100644
index ac182f180aff9ff4841aa44819de1fd15206e1ee..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/AngelFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class AngelFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public AngelFilter() {
-		super("(O:-\\)|O:\\)|o:-\\)|o:\\))(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"angel\" class=\"b_emoticons_angel\"/>");
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/AngryFilter.java b/src/main/java/org/olat/core/util/radeox/AngryFilter.java
deleted file mode 100644
index bd56f817ad7d08de7c0bb1bdda7c2b8421da09ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/AngryFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class AngryFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public AngryFilter() {
-		super("(:-@|:@)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"angry\" class=\"b_emoticons_angry\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/ConfusedFilter.java b/src/main/java/org/olat/core/util/radeox/ConfusedFilter.java
deleted file mode 100644
index f30f564df3632d94c399a9e5282a1da56690401b..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/ConfusedFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class ConfusedFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public ConfusedFilter() {
-		super("(:-S|:S|:-s|:s)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"confused\" class=\"b_emoticons_confused\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/CryFilter.java b/src/main/java/org/olat/core/util/radeox/CryFilter.java
deleted file mode 100644
index 363e468440103792453ca2c8257f651df0d4e70c..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/CryFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- * Description:<br>
- * TODO: rhaag Class Description for CryFilter
- * 
- * <P>
- * Initial Date:  17.06.2009 <br>
- * @author rhaag
- */
-public class CryFilter extends RegexReplaceFilter {
-
-	public CryFilter(){
-		super(":-V", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"cry\" class=\"b_emoticons_cry\"/>");
-	}
-	
-}
diff --git a/src/main/java/org/olat/core/util/radeox/DevilFilter.java b/src/main/java/org/olat/core/util/radeox/DevilFilter.java
deleted file mode 100644
index 55d463293d8aeada13ed69a02305286123476df9..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/DevilFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class DevilFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public DevilFilter() {
-		super("(]:-\\)|]:\\)|]:->)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/emoticicons/devil.gif") + "\" alt=\"devil\" />");
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/EmbarrassedFilter.java b/src/main/java/org/olat/core/util/radeox/EmbarrassedFilter.java
deleted file mode 100644
index 6c5bfe4a8bc362f4295923ba69bd15d623526c2f..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/EmbarrassedFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class EmbarrassedFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public EmbarrassedFilter() {
-		super("(:-\\$|:\\$)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"blushing\" class=\"b_emoticons_blushing\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/ForumQuoteFilter.java b/src/main/java/org/olat/core/util/radeox/ForumQuoteFilter.java
deleted file mode 100644
index e707f405603c3b2c48a121a21d7275cb3b0e4978..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/ForumQuoteFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class ForumQuoteFilter extends RegexReplaceFilter {
-		/**
-		 *
-		 */
-		public ForumQuoteFilter() {
-			super("^(\\&#62;|\\&gt;|>)(.*?)$", "<blockquote class=\"b_quote\">$2</blockquote>");
-		}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/GenericFilterForMigration.java b/src/main/java/org/olat/core/util/radeox/GenericFilterForMigration.java
deleted file mode 100644
index 8aff4e3ada180a66212b3849a05c75f02000ec49..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/GenericFilterForMigration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-package org.olat.core.util.radeox;
-
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- * Description:<br>
- * TODO: rhaag Class Description for GenericFilterForMigration
- * 
- * <P>
- * Initial Date:  16.06.2009 <br>
- * @author rhaag
- */
-public class GenericFilterForMigration extends RegexReplaceFilter {
-	
-	public GenericFilterForMigration(){
-		super();
-	}
-}
diff --git a/src/main/java/org/olat/core/util/radeox/ItalicFilter.java b/src/main/java/org/olat/core/util/radeox/ItalicFilter.java
deleted file mode 100644
index 5ec13ffc04d1db8d0db1eb9990169f359952844c..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/ItalicFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- * Description:<br>
- * Italic filter that is added for compatibillity with the wikimedia synatx form
- * the WikiMarkupComponent. Filters " ''word-xy''  " and replaces it with <i>word-xy<i>
- * <P>
- * Initial Date: Jul 24, 2006 <br>
- * 
- * @author guido
- */
-public class ItalicFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public ItalicFilter() {
-		super("(^|>|[\\p{Punct}\\p{Space}]+)'{2}(.*?)'{2}([\\p{Punct}\\p{Space}]+|<|$)", "$1<i>$2</i>$3");
-	}
-
-}
diff --git a/src/main/java/org/olat/core/util/radeox/KissFilter.java b/src/main/java/org/olat/core/util/radeox/KissFilter.java
deleted file mode 100644
index 9f5fc1bfb53caa0f1afbc81852e4005c06d2ffe5..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/KissFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- * Description:<br>
- * TODO: rhaag Class Description for KissFilter
- * 
- * <P>
- * Initial Date:  17.06.2009 <br>
- * @author rhaag
- */
-public class KissFilter extends RegexReplaceFilter {
-
-	public KissFilter(){
-		super(":-x|:-\\*|:\\*", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"kiss\" class=\"b_emoticons_kiss\"/>");
-	}
-	
-}
diff --git a/src/main/java/org/olat/core/util/radeox/MovieButtonMacro.java b/src/main/java/org/olat/core/util/radeox/MovieButtonMacro.java
deleted file mode 100644
index 7780227c6c52e4e046be46143cbb9b50279b6573..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/MovieButtonMacro.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.macro.BaseMacro;
-import org.radeox.macro.parameter.MacroParameter;
-
-/**
- * Description:<BR>
- * Implements the timemarker play wiki tag. still beta
- * 
- * <P>
- * Initial Date:  Dec 22, 2004
- *
- * @author gnaegi 
- */
-public class MovieButtonMacro extends BaseMacro {
-	private static final String CONTROLLER_MOV = StaticMediaDispatcher.createStaticURIFor("movie/controller.mov");
-	
-	private static final String NAME = "name";
-	private static final String STARTTIME = "start";
-	private static final String ENDTIME = "end";
-	private static final String ADDRESS = "url";
-	private static final String DISPLAYDURATION = "displayduration";
-
-	/**
-	 * 
-	 */
-	public MovieButtonMacro() {
-		super();
-	}
-
-	/** 
-	 * @see org.radeox.macro.Macro#getName()
-	 */
-	public String getName() {
-		return "movieButton";
-	}
-
-	/** 
-	 * @see org.radeox.macro.Macro#execute(java.io.Writer, org.radeox.macro.parameter.MacroParameter)
-	 */
-	public void execute(Writer writer, MacroParameter params) throws IllegalArgumentException, IOException {
-		
-		String name = params.get(NAME);
-		String starttime = params.get(STARTTIME);
-		String endtime = params.get(ENDTIME);
-		String address = params.get(ADDRESS);
-		String displayduration = params.get(DISPLAYDURATION);
-		String displayname = params.getContent();
-		
-		StringBuilder movieInfo = new StringBuilder();
-		movieInfo.append("<movieinfo>");
-		if (address != null) {
-			movieInfo.append("<address>");
-			movieInfo.append(address);
-			movieInfo.append("</address>");
-		}		
-		if (name != null) {
-			movieInfo.append("<name>");
-			movieInfo.append(name);
-			movieInfo.append("</name>");
-		} else {
-			// default name
-			movieInfo.append("<name>remotelyControlled</name>");
-		}
-		if (starttime != null) {
-			movieInfo.append("<starttime>");
-			movieInfo.append(starttime);
-			movieInfo.append("</starttime>");
-		}
-		if (endtime != null) {
-			movieInfo.append("<endtime>");
-			movieInfo.append(endtime);
-			movieInfo.append("</endtime>");
-		}
-		if (displayname != null) {
-			movieInfo.append("<label>");
-			movieInfo.append(displayname);
-			movieInfo.append("</label>");
-		}
-		if (displayname != null) {
-			movieInfo.append("<displayname>");
-			movieInfo.append(displayname);
-			movieInfo.append("</displayname>");
-		}
-		movieInfo.append("</movieinfo>");
-		
-		
-		writer.write("<span class=\"b_wiki_timemarker_play\"><object classid=\"clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B\"  width=\"17\" height=\"16\" codebase=\"http://www.apple.com/qtactivex/qtplugin.cab\">");
-		writer.write("<param name=\"SRC\" value=\"" + CONTROLLER_MOV + "\">");
-		writer.write("<param name=\"CONTROLLER\" value=\"FALSE\">");
-		writer.write("<param name=\"AUTOPLAY\" value=\"FALSE\">");
-		writer.write("<param name=\"CACHE\" value=\"FALSE\">");
-		writer.write("<param name = \"MovieQTList\" value=");
-		writer.write("\"");
-		writer.write(movieInfo.toString());
-		writer.write("\">");
-		writer.write("<embed");
-		writer.write(" src=\"" + CONTROLLER_MOV + "\"");
-		writer.write(" width=\"17\" height=\"16\"");
-		writer.write(" controller=\"FALSE\"");
-		writer.write(" autoplay=\"FALSE\"");
-		writer.write(" cache=\"FALSE\"");
-		writer.write(" MovieQTList=");
-		writer.write("\"");
-		writer.write(movieInfo.toString());
-		writer.write("\"");
-		writer.write(" type=\"video/quicktime\"");
-		writer.write(" pluginspage=\"http://www.apple.com/quicktime/download/\">");
-		writer.write("</embed>");
-		writer.write("</object> ");
-		if (displayname != null) {
-			writer.write(displayname);
-			if (displayduration != null) {
-				writer.write(": ");
-			}
-		}
-		if (displayduration != null) {
-			writer.write(displayduration);
-		}			
-		writer.write("</span>");
-	}
-
-}
diff --git a/src/main/java/org/olat/core/util/radeox/MovieViewerMacro.java b/src/main/java/org/olat/core/util/radeox/MovieViewerMacro.java
deleted file mode 100644
index be5b872c9209f67a15670548b8910afe785e52e6..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/MovieViewerMacro.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.radeox.macro.BaseMacro;
-import org.radeox.macro.parameter.MacroParameter;
-
-/**
- * Description:<BR>
- * Implements timemarker movie viewer makro, still beta
- * <P>
- * Initial Date:  Dec 22, 2004
- *
- * @author gnaegi 
- */
-public class MovieViewerMacro extends BaseMacro {
-	// allowed macro attributes
-	private static final String NAME = "name";
-	private static final String ADDRESS = "url";
-	private static final String WIDTH = "width";
-	private static final String HEIGHT = "height";
-	private static final String DISPLAYDURATION = "displayduration";
-	
-	// default height and width of player window
-	private static final int DEFAULT_WIDTH = 320;
-	private static final int DEFAULT_HEIGHT = 240;
-	// additional pixels used by the video controller for sliding etc
-	private static final int CONTROLLER_HEIGHT = 16;
-	// offset to have enouth space
-	// height+60 (some browsers need this space) + 20 (to show playButton tag)
-	// width+40 (some browsers need this space)
-	private static final int HEIGHT_OFFSET = 80;
-	private static final int WIDTH_OFFSET = 40;
-
-	/**
-	 * 
-	 */
-	public MovieViewerMacro() {
-		super();
-	}
-
-	/** 
-	 * @see org.radeox.macro.Macro#getName()
-	 */
-	public String getName() {
-		return "movieViewer";
-	}
-
-	/** 
-	 * @see org.radeox.macro.Macro#execute(java.io.Writer, org.radeox.macro.parameter.MacroParameter)
-	 */
-	public void execute(Writer writer, MacroParameter params) throws IllegalArgumentException, IOException {
-
-		String name = params.get(NAME);
-		String address = params.get(ADDRESS);
-		String height = params.get(HEIGHT);
-		String width = params.get(WIDTH);
-		String displayduration = params.get(DISPLAYDURATION);
-		String displayname = params.getContent();
-
-		if (address == null) {
-			writer.write("<p>movieViewer: illegal format: missing attribute " + ADDRESS + "</p>");
-			return;
-		}
-		// default values for unset optional parameter
-		if (name == null) name = "remotelyControlled";
-		if (width == null) width = Integer.toString(DEFAULT_WIDTH);
-		if (height == null) height = Integer.toString(DEFAULT_HEIGHT);
-		
-		try {
-			int iHeigt = Integer.parseInt(height);
-			height = Integer.toString(iHeigt + CONTROLLER_HEIGHT );
-		} catch (NumberFormatException e) {
-			// using default values
-			width = Integer.toString(DEFAULT_WIDTH);
-			height = Integer.toString(DEFAULT_HEIGHT + CONTROLLER_HEIGHT);		
-		}
-
-		writer.write("<span class=\"b_wiki_timemarker_viewer\">");
-		// show popup link
-		writer.write("<a href=\"javascript:void(");
-		// open window a bit bitter than the movie size itself
-		String args = "width=" + (Integer.parseInt(width) + WIDTH_OFFSET) + ",height=" + (Integer.parseInt(height) + HEIGHT_OFFSET) + ",resizable=yes,scrollbars=yes";
-		writer.write("window.open(o_info.o_baseURI + '/movie/popup.html?maddress=' + encodeURIComponent('" + address + "') + '&mname=' + encodeURIComponent('" + name + 
-				"') + '&displayname=' + encodeURIComponent('" + displayname + "') + '&displayduration=' + encodeURIComponent('" + displayduration + "') + '&width=" + width + "&height=" + height + "', '" + name +"', '" + args + "')");
-		writer.write(")\">Open movie player");
-		if (displayname != null) {
-			writer.write(": ");
-			writer.write(displayname);
-			if (displayduration != null) {
-				writer.write(": ");
-			}
-		}
-		if (displayduration != null) {
-			writer.write(displayduration);
-		}			
-		writer.write("</a>");
-		writer.write("</span>");
-	}
-
-}
diff --git a/src/main/java/org/olat/core/util/radeox/OmgFilter.java b/src/main/java/org/olat/core/util/radeox/OmgFilter.java
deleted file mode 100644
index f3e078ff07713b84fd805305953eb9993b55c283..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/OmgFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class OmgFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public OmgFilter() {
-		super("(:-O|:O|:-o|:o)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"ohoh\" class=\"b_emoticons_ohoh\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/SadFilter.java b/src/main/java/org/olat/core/util/radeox/SadFilter.java
deleted file mode 100644
index d5e626648c4e6567753a840f5ee5cb1a2990895a..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/SadFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- *  
- */
-public class SadFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public SadFilter() {
-		super("(:-\\(|:\\()(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"sad\" class=\"b_emoticons_sad\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/ShadeFilter.java b/src/main/java/org/olat/core/util/radeox/ShadeFilter.java
deleted file mode 100644
index c742ceacfaa02c5ebf96be2ff4636696d16eaed3..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/ShadeFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class ShadeFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public ShadeFilter() {
-		super("(8-\\)|8\\))(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"cool\" class=\"b_emoticons_cool\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/SmileFilter.java b/src/main/java/org/olat/core/util/radeox/SmileFilter.java
deleted file mode 100644
index f2034cdfd87505ca0d61e675b355882e04935cf7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/SmileFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class SmileFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public SmileFilter() {
-		super("(:-\\)|:\\))(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"smile\" class=\"b_emoticons_smile\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/TeethFilter.java b/src/main/java/org/olat/core/util/radeox/TeethFilter.java
deleted file mode 100644
index 4cde4511aa049cda4c99137f46b888c66e418a23..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/TeethFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class TeethFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public TeethFilter() {
-		super("(:-D|:D|:-d|:d)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"grin\" class=\"b_emoticons_grin\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/TongueFilter.java b/src/main/java/org/olat/core/util/radeox/TongueFilter.java
deleted file mode 100644
index 5dd745000c92a675b76fa183fc6db8ed7e3c68c7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/TongueFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class TongueFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public TongueFilter() {
-		super("(:-P|:P|:-p|:p)(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"tongue\" class=\"b_emoticons_tongue\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/UglyFilter.java b/src/main/java/org/olat/core/util/radeox/UglyFilter.java
deleted file mode 100644
index 2cd399685e3fd05dece0993d910a9d23d1912992..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/UglyFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class UglyFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public UglyFilter() {
-		super("(:-\\||:\\||:-/|:/[.[^/]])(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"ugly\" class=\"b_emoticons_ugly\"/>");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/WinkFilter.java b/src/main/java/org/olat/core/util/radeox/WinkFilter.java
deleted file mode 100644
index a88b090085a0a4d28e29411f33adc91ad2bb7b60..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/util/radeox/WinkFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.  
-* <p>
-*/ 
-
-package org.olat.core.util.radeox;
-
-import org.olat.core.defaults.dispatcher.StaticMediaDispatcher;
-import org.radeox.filter.regex.RegexReplaceFilter;
-
-/**
- *  Initial Date:  Apr 14, 2004
- * 
- *  @author gnaegi
- *  
- *  Comment:  
- *  
- */
-public class WinkFilter extends RegexReplaceFilter {
-
-	/**
-	 * 
-	 */
-	public WinkFilter() {
-		super("(;-\\)|;\\))(\\s|$)", "<img src=\"" + StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false) + "\" alt=\"wink\" class=\"b_emoticons_wink\"/>");
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/radeox/doc/Radeox_Developer.pdf b/src/main/java/org/olat/core/util/radeox/doc/Radeox_Developer.pdf
deleted file mode 100644
index 4d1fe90498e51ffbfd5d7aefeb39396382885526..0000000000000000000000000000000000000000
Binary files a/src/main/java/org/olat/core/util/radeox/doc/Radeox_Developer.pdf and /dev/null differ
diff --git a/src/main/java/org/olat/course/CourseUpgrade.java b/src/main/java/org/olat/course/CourseUpgrade.java
index db9f8472f2d55324e26c150817dc7af5b9d4fa72..087c56e7203c9ebc6a6dfbb2220981658939bd96 100644
--- a/src/main/java/org/olat/course/CourseUpgrade.java
+++ b/src/main/java/org/olat/course/CourseUpgrade.java
@@ -60,142 +60,17 @@ public class CourseUpgrade extends LogDelegator {
 		int migrateTargetVersion = 2;
 		CourseEditorTreeModel editorTreeModel = course.getEditorTreeModel();
 		if (!editorTreeModel.isVersionUpToDate() && editorTreeModel.getVersion() != migrateTargetVersion){
-			upgradeEditorTreeModel(ccourse);
-			editorTreeModel.setVersion(migrateTargetVersion);
-			ccourse.setEditorTreeModel(editorTreeModel);
-			ccourse.saveEditorTreeModel();
+			logError("as of OpenOLAT 8, old courses with verison 1 are no longer supported. No migration done! Upgrade to 7.0 first!", null);
 		}		
 		Structure runStructure = course.getRunStructure();
 		if (!runStructure.isVersionUpToDate() && runStructure.getVersion() != migrateTargetVersion){
-			upgradeRunStructure(ccourse);						
-			ccourse.getRunStructure().setVersion(migrateTargetVersion);
-			ccourse.setRunStructure(runStructure);
-			ccourse.saveRunStructure();
+			logError("as of OpenOLAT 8, old courses with verison 1 are no longer supported. No migration done! Upgrade to 7.0 first!", null);
 		}
 	}
 
 	
-	private void upgradeRunStructure(ICourse course) {
-		Structure cR = course.getRunStructure();
-		CourseNode rsRootNode = cR.getRootNode();
-		final Set<String> allSubTreeids = new HashSet<String>();
-		TreeVisitor tv = new TreeVisitor(new Visitor() {
-			public void visit(INode node) {
-				allSubTreeids.add(node.getIdent());
-			}
-		}, rsRootNode, true);
-		tv.visitAll();
-		Structure runStructure = course.getRunStructure();
-
-		int nodeCounter = 0;
-		for (Iterator<String> iterator2 = allSubTreeids.iterator(); iterator2.hasNext();) {
-			String nodeId = iterator2.next();
-			CourseNode rsn = runStructure.getNode(nodeId);
-
-			// migrate if this node is a Task
-			if (rsn.getType().equals(TACourseNode.CONF_TASK_TYPE)) {
-				migrateSingleTask(rsn);
-			}
-			// migrate no access text for every node:
-			migrateSingleAccessDeniedExplanation(rsn);
-
-			// migrate assessment nodes
-			if (rsn.getType().equals(MS_TYPE)) {
-				migrateSingleAssessment(rsn);
-			}
-
-			// migrate course node description
-			migrateSingleNodeDesc(rsn);
-
-			nodeCounter++;
-		}
-
-
-		logAudit("**** Lazy migration finished for runStructure of course " + course.getResourceableId() + " with a total of " + nodeCounter
-				+ " course node descriptions. ****", null);
-
-	}
 	
-	private void upgradeEditorTreeModel(ICourse course) {
-		// EDITOR: get all course nodes
-		CourseEditorTreeModel cT = course.getEditorTreeModel();
-		TreeNode rootNode = cT.getRootNode();
-		final Set<String> allSubTreeids = new HashSet<String>();
-		TreeVisitor tv = new TreeVisitor(new Visitor() {
-			public void visit(INode node) {
-				allSubTreeids.add(node.getIdent());
-			}
-		}, rootNode, true);
-		tv.visitAll();
-
-		CourseEditorTreeModel editorTreeModel = course.getEditorTreeModel();
-		// EDITOR: loop all course nodes
-		int nodeCounter = 0;
-		for (Iterator<String> iterator2 = allSubTreeids.iterator(); iterator2.hasNext();) {
-			String nodeId = iterator2.next();
-			CourseNode cetn = editorTreeModel.getCourseNode(nodeId);
-			// migrate if this node is a Task
-			if (cetn.getType().equals(TACourseNode.CONF_TASK_TYPE)) {
-				migrateSingleTask(cetn);
-			}
-			// migrate no access text for every node:
-			migrateSingleAccessDeniedExplanation(cetn);
-
-			// migrate assessment nodes
-			if (cetn.getType().equals(MS_TYPE)) {
-				migrateSingleAssessment(cetn);
-			}
-
-			// migrate course node description
-			migrateSingleNodeDesc(cetn);
-
-			nodeCounter++;
-
-		} //for
-		
-		logAudit("**** Lazy migration finished for editorTreeModel of course " + course.getResourceableId() + " with a total of " + nodeCounter
-				+ " course node descriptions. ****", null);
-	}
 	
-
-	private void migrateSingleTask(CourseNode node) {
-		ModuleConfiguration taskConf = node.getModuleConfiguration();
-		String[] allKeys = new String[] { TACourseNode.CONF_TASK_TEXT, MSCourseNode.CONFIG_KEY_INFOTEXT_USER,
-				MSCourseNode.CONFIG_KEY_INFOTEXT_COACH };
-		for (int i = 0; i < allKeys.length; i++) {
-			String thisKey = allKeys[i];
-			String oldDesc = (String) taskConf.get(thisKey);
-			if (StringHelper.containsNonWhitespace(oldDesc)) {
-				String newDesc = Formatter.formatWikiMarkup(oldDesc);
-				taskConf.set(thisKey, newDesc);
-			}
-		}
-	}
-
-	private void migrateSingleAccessDeniedExplanation(CourseNode node) {
-		String oldDesc = node.getNoAccessExplanation();
-		if (StringHelper.containsNonWhitespace(oldDesc)) {
-			String newDesc = Formatter.formatWikiMarkup(oldDesc);
-			node.setNoAccessExplanation(newDesc);
-		}
-	}
-
-	private void migrateSingleAssessment(CourseNode node) {
-		ModuleConfiguration modConfig = node.getModuleConfiguration();
-		String infoUser = (String) modConfig.get(MSCourseNode.CONFIG_KEY_INFOTEXT_USER);
-		String newInfoUser = Formatter.formatWikiMarkup(infoUser);
-		modConfig.set(MSCourseNode.CONFIG_KEY_INFOTEXT_USER, newInfoUser);
-		String infoCoach = (String) modConfig.get(MSCourseNode.CONFIG_KEY_INFOTEXT_COACH);
-		String newInfoCoach = Formatter.formatWikiMarkup(infoCoach);
-		modConfig.set(MSCourseNode.CONFIG_KEY_INFOTEXT_COACH, newInfoCoach);
-	}
-
 	
-	private void migrateSingleNodeDesc(CourseNode node){
-		String oldDesc = node.getLearningObjectives();
-		if (StringHelper.containsNonWhitespace(oldDesc)) {
-			String newDesc = Formatter.formatWikiMarkup(oldDesc);
-			node.setLearningObjectives(newDesc);
-		}
-	}
+	
 }
diff --git a/src/main/java/org/olat/course/config/ui/CourseEfficencyStatementForm.java b/src/main/java/org/olat/course/config/ui/CourseEfficencyStatementForm.java
index a4d7679ad16ad6562d62995d6b6fb87aeb835ca6..619a3c6861a451f673e415dfe6cebbbadd9fa300 100644
--- a/src/main/java/org/olat/course/config/ui/CourseEfficencyStatementForm.java
+++ b/src/main/java/org/olat/course/config/ui/CourseEfficencyStatementForm.java
@@ -32,8 +32,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.formelements.CheckBoxElement;
-import org.olat.core.gui.translator.Translator;
 /**
  * 
  * Description:<br>
diff --git a/src/main/java/org/olat/test/scratch/RadeoxStrikethroughTestMain.java b/src/main/java/org/olat/test/scratch/RadeoxStrikethroughTestMain.java
deleted file mode 100644
index c6cae10cb84fe2e8718321fac32f78bf0bc130ce..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/test/scratch/RadeoxStrikethroughTestMain.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.test.scratch;
-
-/**
- * Description:<br>
- * Test driver to test radeox regexp for strikethrough and the multiline / dotall issues
- * <P>
- * Initial Date:  Nov 8, 2005 <br>
- * @author gnaegi
- */
-public class RadeoxStrikethroughTestMain {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		
-		// origninal radeox stike pattern
-		String originalPatternString= "([^!-]|^)--(?=.*--)((?:(?:[^-]+)-?)+)--([^-]|$)";
-		// modified radeox stike pattern
-		String modifiedPatternString = "([^-]|^)--([^-$^]+)--([^-]|$)";
-
-		
-		String easyText= "--\r\n1234567890----\r\nAnd now --strike-- and now a --multiline \r\nstrike--";
-		String complicatedText= "--\r\n12345678901234567890----\r\nAnd now --strike-- and now a --multiline \r\nstrike--";
-		String moreComplicatedText= "--\r\n123456789012345678901234567890----\r\nAnd now --strike-it-- and now a --multiline \r\nstrike--\r\nasdf --\r\n--";
-
-		// works well
-		doStrikeFilter(modifiedPatternString, easyText);
-		// performance issue starts
-		doStrikeFilter(modifiedPatternString, complicatedText);
-		// does not work at all
-		doStrikeFilter(modifiedPatternString, moreComplicatedText);
-
-		// now with the original pattern
-		// works well
-		doStrikeFilter(originalPatternString, easyText);
-		// performance issue starts
-		doStrikeFilter(originalPatternString, complicatedText);
-		// does not work at all
-		doStrikeFilter(originalPatternString, moreComplicatedText);
-
-		
-	}
-
-	private static void doStrikeFilter(String patternString, String text) {
-		System.out.println("doStrikeFilter(" + patternString + "," + text + ");");
-		System.out.println("*** START ***");
-		String replacePattern = "$1<strike class=\"strike\">$2</strike>$3";
-
-		// works well using MULTILINE but not DOTALL
-		System.out.println("** Using only MULTILINE");
-		java.util.regex.Pattern jdkPattern = java.util.regex.Pattern.compile(patternString, java.util.regex.Pattern.MULTILINE);
-		java.util.regex.Matcher jdkMatcher = jdkPattern.matcher(text);
-		System.out.println(jdkMatcher.replaceAll(replacePattern));
-		
-		// works sort of, but very, very, very slow
-		System.out.println("** Using DOTALL but not multiline");
-		java.util.regex.Pattern jdkPattern2 = java.util.regex.Pattern.compile(patternString, java.util.regex.Pattern.DOTALL);
-		java.util.regex.Matcher jdkMatcher2 = jdkPattern2.matcher(text);
-		System.out.println(jdkMatcher2.replaceAll(replacePattern));
-		
-		// same with radeox code, internaly using DOTALL
-		System.out.println("** Using RADEOX style, multiline disabled");
-		org.radeox.regex.Pattern radeoxPattern = new org.radeox.regex.JdkPattern(patternString, false);		
-		org.radeox.regex.Matcher radeoxMatcher = org.radeox.regex.Matcher.create(text, radeoxPattern);
-    System.out.println(radeoxMatcher.substitute(replacePattern));
-
-		System.out.println("** DONE **\n\n");
-	}
-	
-}
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_6_2_0.java b/src/main/java/org/olat/upgrade/OLATUpgrade_6_2_0.java
index c3db7920e93c3e4183e972931817a865d9559e86..e44fe5ae6623b8832f605d1eff77351d94d671ac 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_6_2_0.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_6_2_0.java
@@ -543,7 +543,8 @@ public class OLATUpgrade_6_2_0 extends OLATUpgrade {
 		if (log.isDebug()) log.audit("Old String before migration:", oldValue);
 		String newValue = "";
 
-		newValue = Formatter.formatWikiMarkup(oldValue);
+		//newValue = Formatter.formatWikiMarkup(oldValue);
+		log.warn("no wikiMarkupUpdate is done, OpenOLAT 8 does not support the legacy wiki markup forms!");
 		
 		if (log.isDebug()) log.audit("New String after migration:", newValue);
 		return newValue;
diff --git a/src/main/resources/radeox_markup_olat.properties b/src/main/resources/radeox_markup_olat.properties
deleted file mode 100644
index 557bb53a833dc726a688b42b98424d5a577d7a74..0000000000000000000000000000000000000000
--- a/src/main/resources/radeox_markup_olat.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-filter.bold.match=(^|>|[\\p{Punct}\\p{Space}]+)\\*(.*?)\\*([\\p{Punct}\\p{Space}]+|<|$)
-filter.bold.print=$1<strong>$2</strong>$3
-
-##filter.italic.match=(^|>|[\\p{Punct}\\p{Space}]+)_(.*?)_([\\p{Punct}\\p{Space}]+|<|$)
-filter.italic.match=(^|>|[\\p{Punct}\\p{Space}]+)'{2}(.*?)'{2}([\\p{Punct}\\p{Space}]+|<|$)
-filter.italic.print=$1<em>$2</em>$3
-
-filter.newline.match=^(.*)$
-filter.newline.print=$1<br />
-filter.paragraph.match=([ \t\r]*[\n]){2}
-#filter.paragraph.print=<p class=\"paragraph\"/>
-filter.paragraph.print=<p />
-
-filter.strikethrough.match=([^-]|^)--([^-$^]+)--([^-]|$)
-filter.strikethrough.print=$1<strike>$2</strike>$3
-
-filter.url.match=([^\"'=]|^)((http|ftp)s?://(%[\\p{Digit}A-Fa-f][\\p{Digit}A-Fa-f]|[-_.!~*';/?:@#&=+$,\\p{Alnum}])+)
-filter.url.print={0}<a href=\"{1}\" target=\"_blank\" class=\"b_link_extern\">{2}</a>
-
-filter.line.match=-----
-filter.line.print=<hr />
-
-
-
-filter.param.match=\\{\\$([^}]*)\\}
-
-filter.heading.match=^[\\p{Space}]*(1(\\.1)*)[\\p{Space}]+(.*?)$
-filter.heading.print=<h3 class=\"heading-{0}\">{1}</h3>
-filter.list.match=(^[\\p{Space}]*([-#*]+|[-#*]*[iIaA1ghHkKj]+\\.)[\\p{Space}]+([^\r\n]+)[\r\n]*)+
-
-filter.mark.match=(^|[[:space:]]+)neotis([[:space:]]?|[.!,:]?|$)
-##filter.mark.print=<a href=\"http://neotis.de/\">neotis&#174;</a>
-filter.mark.print=
-
-filter.key.match=((Ctrl|Alt|Shift)-[^ ]*)
-filter.key.print=<span class=\"key\">$1</span>
-
-filter.typography.match=([^.]|^)[.][.][.](?!\\.)( |$)
-filter.typography.print=$1&#8230;$2
-
-filter.linktest.match=\\[(.*?)\\]
-filter.escape.match=\\\\(\\\\\\\\)|\\\\(.)|([&<>])
-
-
-macro.isbn.name=isbn
-macro.link.name=link
-macro.quote.name=quote
-macro.mailto.name=mailto
-macro.code.name=code
-macro.apidocs.name=api-docs
-macro.filepath.name=file-path
-macro.api.name=api
-macro.asin.name=asin
-macro.interwiki.name=inter-wiki
-macro.macrolist.name=list-of-macros
-macro.rfc.name=rfc
-macro.table.name=table
-macro.xref.name=xref
-
-macro.code.start=<pre>
-macro.code.end=</pre>
\ No newline at end of file
diff --git a/src/main/webapp/static/images/emoticicons/angel.gif b/src/main/webapp/static/images/emoticicons/angel.gif
deleted file mode 100644
index 7037d07a0e1c424b22215438f50284d7f7031830..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/angel.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/angry.gif b/src/main/webapp/static/images/emoticicons/angry.gif
deleted file mode 100644
index f9946b3974a776a5676b745b31b6476961c8eebe..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/angry.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/blushing.gif b/src/main/webapp/static/images/emoticicons/blushing.gif
deleted file mode 100644
index f00f25b61c117291f425167afc29369f3c95a187..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/blushing.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/confused.gif b/src/main/webapp/static/images/emoticicons/confused.gif
deleted file mode 100644
index 1d296460c201aff98dc281dacc4e0ecdb8b32afb..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/confused.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/cool.gif b/src/main/webapp/static/images/emoticicons/cool.gif
deleted file mode 100644
index 3bde1b0b67b802dd79ac7d9512c34b3b2d62070a..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/cool.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/cry.gif b/src/main/webapp/static/images/emoticicons/cry.gif
deleted file mode 100644
index 4853968b60b18f3bf5ed7080078832fdc4827a00..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/cry.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/devil.gif b/src/main/webapp/static/images/emoticicons/devil.gif
deleted file mode 100644
index 44940fabcbeeb013a9b4c5edf3d9d98606a1417b..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/devil.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/emotic_icons.README b/src/main/webapp/static/images/emoticicons/emotic_icons.README
deleted file mode 100644
index af097ce2894b884328410e4a4974861cd61aa62e..0000000000000000000000000000000000000000
--- a/src/main/webapp/static/images/emoticicons/emotic_icons.README
+++ /dev/null
@@ -1 +0,0 @@
-icons used in the radeox wiki formatter - not cssified
\ No newline at end of file
diff --git a/src/main/webapp/static/images/emoticicons/grin.gif b/src/main/webapp/static/images/emoticicons/grin.gif
deleted file mode 100644
index 63aea4bc6f920dd9294834ab377be5be5bfa7c3f..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/grin.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/kiss.gif b/src/main/webapp/static/images/emoticicons/kiss.gif
deleted file mode 100644
index 9d90af0d1c3b8d688a1480ca403f618b800e4459..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/kiss.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/ohoh.gif b/src/main/webapp/static/images/emoticicons/ohoh.gif
deleted file mode 100644
index a8fa477bf2ea4208fe07a4cae66d16d1ce0910b1..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/ohoh.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/sad.gif b/src/main/webapp/static/images/emoticicons/sad.gif
deleted file mode 100644
index 39e5066f4506ef680278db9188dc1f54a8d69697..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/sad.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/sick.gif b/src/main/webapp/static/images/emoticicons/sick.gif
deleted file mode 100644
index ae62e7f498cb2891987319f20bcd59487b69bd9f..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/sick.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/smile.gif b/src/main/webapp/static/images/emoticicons/smile.gif
deleted file mode 100644
index bc9783528f7ac8c897b89df598f91bed87703e29..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/smile.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/tongue.gif b/src/main/webapp/static/images/emoticicons/tongue.gif
deleted file mode 100644
index f2ab44a93780072ae66300bcb4e79965ad5fd51a..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/tongue.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/ugly.gif b/src/main/webapp/static/images/emoticicons/ugly.gif
deleted file mode 100644
index 70e45687cab0cf1e518d7fb584f0b47edbe323ee..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/ugly.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/weird.gif b/src/main/webapp/static/images/emoticicons/weird.gif
deleted file mode 100644
index d7a18cef723092a03b610300d279418e8629adf8..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/weird.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/wink.gif b/src/main/webapp/static/images/emoticicons/wink.gif
deleted file mode 100644
index 3a884673bce9003689860e219ab0c331c948cc68..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/wink.gif and /dev/null differ
diff --git a/src/main/webapp/static/images/emoticicons/worried.gif b/src/main/webapp/static/images/emoticicons/worried.gif
deleted file mode 100644
index 15d4809fa91fd7a590843189c152053ec2df798b..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/images/emoticicons/worried.gif and /dev/null differ