diff --git a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntry.java b/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntry.java
deleted file mode 100644
index 21103c9e7145751828f586f05b0f5f075a9b612d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntry.java
+++ /dev/null
@@ -1,43 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard;
-
-import org.olat.core.gui.control.creator.ControllerCreator;
-
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-public interface ClipboardEntry {
-	
-	public boolean acceptsFlavor (Class flavorInterfaceName);
-
-	/**
-	 * 
-	 */
-	public ControllerCreator createTrayUI();
-	
-	//public Object getHandler(Class flavorInterfaceName);
-	
-	//TODO: public ControllerCreator createTrayView();
-	// or is String as return type enough?
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntryCreator.java b/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntryCreator.java
deleted file mode 100644
index 33814927975010a3d3e74ae45de5e66fa03ce2b9..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardEntryCreator.java
+++ /dev/null
@@ -1,29 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-public interface ClipboardEntryCreator {
-	public ClipboardEntry createClipboardEntry();
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardService.java b/src/main/java/org/olat/core/commons/services/clipboard/ClipboardService.java
deleted file mode 100644
index 2a92c05f4c4c912c061838bcd6eba42a32158616..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/ClipboardService.java
+++ /dev/null
@@ -1,46 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard;
-
-import org.olat.core.gui.control.creator.ControllerCreator;
-import org.olat.core.gui.control.Event;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- * this is a service instance for handling a clipboard (a la gui copy and paste).
- * it is normally attached to one user, but this is up to the caller of the service.
- */
-public interface ClipboardService {
-	
-	public ControllerCreator createCopyToUIService(ClipboardEntryCreator cbec);
-
-	public ControllerCreator createPasteFromUIService(Class[] acceptedFlavorInterfaces);
-	
-	public ClipboardEntry getClipboardEntryFrom(Event clipboardEvent);
-	
-	/**
-	 * 
-	 * @return (once only allowed) the UI representing the clipboard content (should be presented at some place like e.g. top right of the screen or similar, a place where it is always accessible)
-	 */
-	public ControllerCreator onceGetClipboardUI();
-	
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardEvent.java b/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardEvent.java
deleted file mode 100644
index af37a6f2a1185b695f1256fc6b88511203d518cc..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardEvent.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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard.impl;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.gui.control.Event;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-public class ClipboardEvent extends Event {
-	private final ClipboardEntry cbe;
-
-	/**
-	 * @param command
-	 */
-	public ClipboardEvent(ClipboardEntry cbe) {
-		super("clipboardevent");
-		this.cbe = cbe;
-	}
-
-	/**
-	 * @return the clipboardentry (never null)
-	 */
-	public ClipboardEntry getClipboardEntry() {
-		return cbe;
-	}
-
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardServiceImpl.java b/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardServiceImpl.java
deleted file mode 100644
index c2dee3561240c8ed247ce6fc1790e1a597ec99c1..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardServiceImpl.java
+++ /dev/null
@@ -1,84 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard.impl;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.commons.services.clipboard.ClipboardEntryCreator;
-import org.olat.core.commons.services.clipboard.ClipboardService;
-import org.olat.core.gui.UserRequest;
-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.control.creator.ControllerCreator;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-@Service
-public class ClipboardServiceImpl implements ClipboardService {
-
-	private ClipboardEntry clipboardEntry;
-
-	/* (non-Javadoc)
-	 * @see org.olat.core.commons.services.clipboard.ClipboardService#createCopyToUIService()
-	 */
-	public ControllerCreator createCopyToUIService(final ClipboardEntryCreator cbec) {
-		return new ControllerCreator() {
-			public Controller createController(UserRequest ureq, WindowControl wControl) {
-				return new CopyToClipboardController(ureq, wControl, ClipboardServiceImpl.this, cbec);
-			}};
-	}
-	
-	public ControllerCreator createPasteFromUIService(final Class[] acceptedFlavorInterfaces) {
-		return new ControllerCreator() {
-			public Controller createController(UserRequest ureq, WindowControl wControl) {
-				return new PasteFromClipboardController(ureq, wControl, ClipboardServiceImpl.this, acceptedFlavorInterfaces);
-			}};
-	}
-
-	public ClipboardEntry getClipboardEntryFrom(Event event) {
-		ClipboardEvent cbe = (ClipboardEvent)event;
-		return cbe.getClipboardEntry();
-	}
-
-	
-
-	ClipboardEntry getClipboardEntry() {
-		return clipboardEntry;
-	}
-
-	void setClipboardEntry(ClipboardEntry clipboardEntry) {
-		this.clipboardEntry = clipboardEntry;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.olat.core.commons.services.clipboard.ClipboardService#onceGetClipboardUI()
-	 */
-	public ControllerCreator onceGetClipboardUI() {
-		return new ControllerCreator(){
-			public Controller createController(UserRequest ureq, WindowControl wControl) {
-				return new ClipboardTrayController(ureq, wControl, ClipboardServiceImpl.this);
-			}};
-	}
-
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardTrayController.java b/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardTrayController.java
deleted file mode 100644
index 1b6a75cfd74479b61bf58b2da353d54bd104e561..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/ClipboardTrayController.java
+++ /dev/null
@@ -1,113 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
- * University of Zurich, Switzerland.
- * <p>
- */
-package org.olat.core.commons.services.clipboard.impl;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
-import org.olat.core.gui.components.util.ComponentUtil;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-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.control.controller.BasicController;
-import org.olat.core.gui.control.floatingresizabledialog.FloatingResizableDialogController;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- */
-public class ClipboardTrayController extends BasicController {
-
-	private final ClipboardServiceImpl cbs;
-	private Link openDetail;
-	private VelocityContainer mainVc;
-	private Controller trayContentC;
-	private Panel expandedP;
-	private ClipboardEntry latestCB;
-	private Component detail;
-	private FloatingResizableDialogController frdC;
-
-	/**
-	 * @param ureq
-	 * @param wControl
-	 */
-	ClipboardTrayController(UserRequest ureq, WindowControl wControl, ClipboardServiceImpl cbs) {
-		super(ureq, wControl);
-		this.cbs = cbs;
-		expandedP = new Panel("trayExpanded");
-
-		mainVc = createVelocityContainer("tray");
-		ComponentUtil.registerForValidateEvents(mainVc, this);
-		openDetail = LinkFactory.createLink("opendetail", mainVc, this);
-		mainVc.put("expanded", expandedP);
-		putInitialPanel(mainVc);
-	}
-
-	@Override
-	public void event(UserRequest ureq, Component source, Event event) {
-		if (event == ComponentUtil.VALIDATE_EVENT) {
-			// before rendering, check if we can still or newly offer the paste
-			// button. this is the case when the clipboard contains an entry which
-			// matches the desired dataflavor
-			ClipboardEntry cbe = cbs.getClipboardEntry();
-			if (cbe == null) {
-				expandedP.setContent(null);
-				if (trayContentC != null) trayContentC.dispose();
-			} else {
-				if (cbe != latestCB) {
-					latestCB = cbe;
-					trayContentC = cbe.createTrayUI().createController(ureq, getWindowControl());
-					frdC = new FloatingResizableDialogController(ureq, getWindowControl(), trayContentC.getInitialComponent(), "clipboard tray");
-					frdC.addControllerListener(this);
-					detail = frdC.getInitialComponent();
-					expandedP.setContent(detail);
-				}
-			}
-		} else if (source == openDetail) {
-			if (detail == null) {
-				getWindowControl().setInfo("clipboard is empty");
-			} else {
-				expandedP.setContent(detail);
-			}
-		}
-	}
-
-	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == frdC) {
-			if (event == Event.DONE_EVENT) {
-				// close button was clicked -> hide
-				expandedP.setContent(null);
-			}
-		}
-
-	}
-
-	@Override
-	protected void doDispose() {
-		if (trayContentC != null) trayContentC.dispose();
-		if (frdC != null) frdC.dispose();
-	}
-
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/CopyToClipboardController.java b/src/main/java/org/olat/core/commons/services/clipboard/impl/CopyToClipboardController.java
deleted file mode 100644
index 0b50384ccf420bdcbad54099a75964a156c8b445..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/CopyToClipboardController.java
+++ /dev/null
@@ -1,72 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <p>
-*/ 
-package org.olat.core.commons.services.clipboard.impl;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.commons.services.clipboard.ClipboardEntryCreator;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-public class CopyToClipboardController extends BasicController {
-
-	private final ClipboardServiceImpl cbs;
-	private final ClipboardEntryCreator cbCreator;
-	private Link copyTo;
-
-	/**
-	 * @param ureq
-	 * @param wControl
-	 */
-	CopyToClipboardController(UserRequest ureq, WindowControl wControl, ClipboardServiceImpl cbs, ClipboardEntryCreator cbCreator) {
-		super(ureq, wControl);
-		this.cbs = cbs;
-		this.cbCreator = cbCreator;
-		VelocityContainer mainVc = createVelocityContainer("to");
-		
-		copyTo = LinkFactory.createButton("copyTo", mainVc, this);
-		putInitialPanel(mainVc);
-	}
-
-	@Override
-	public void event(UserRequest ureq, Component source, Event event) {
-		if (source == copyTo) {
-			ClipboardEntry cbe = cbCreator.createClipboardEntry();
-			cbs.setClipboardEntry(cbe);
-		}
-	}
-	
-	@Override
-	protected void doDispose() {
-		// nothing to do
-	}
-
-
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/PasteFromClipboardController.java b/src/main/java/org/olat/core/commons/services/clipboard/impl/PasteFromClipboardController.java
deleted file mode 100644
index d7376f784f521819959278f5b5333c1a0234578d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/PasteFromClipboardController.java
+++ /dev/null
@@ -1,97 +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) 1999-2006 at Multimedia- & E-Learning Services (MELS),<br>
- * University of Zurich, Switzerland.
- * <p>
- */ 
-package org.olat.core.commons.services.clipboard.impl;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.commons.services.clipboard.ClipboardEntryCreator;
-import org.olat.core.commons.services.clipboard.impl.ClipboardServiceImpl;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
-import org.olat.core.gui.components.util.ComponentUtil;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- */
-public class PasteFromClipboardController extends BasicController {
-
-	private final ClipboardServiceImpl cbs;
-	private Link pasteFrom;
-	private VelocityContainer mainVc;
-	private final Class[] acceptedFlavorInterfaces;
-
-	/**
-	 * @param ureq
-	 * @param wControl
-	 */
-	PasteFromClipboardController(UserRequest ureq, WindowControl wControl, ClipboardServiceImpl cbs, Class[] acceptedFlavorInterfaces) {
-		super(ureq, wControl);
-		this.cbs = cbs;
-		this.acceptedFlavorInterfaces = acceptedFlavorInterfaces;
-		mainVc = createVelocityContainer("from");
-		ComponentUtil.registerForValidateEvents(mainVc, this);
-		pasteFrom = LinkFactory.createButton("pasteFrom", mainVc, this);
-		putInitialPanel(mainVc);
-	}
-
-	@Override
-	public void event(UserRequest ureq, Component source, Event event) {
-		if (event == ComponentUtil.VALIDATE_EVENT) {
-			// before rendering, check if we can still or newly offer the paste
-			// button.
-			// this is the case when the clipboard contains an entry which matches
-			// the desired dataflavor
-			ClipboardEntry cbe = cbs.getClipboardEntry();
-			if (cbe == null) {
-				// or do a setVisible?
-				pasteFrom.setEnabled(false);
-			} else {
-				// there is an entry in the clipboard, check if we can make use of it.
-				
-				// TODO: Improve this handling
-				boolean accepted = false;
-				for (int i = 0; !accepted && i < acceptedFlavorInterfaces.length; i++) {
-					Class aclass = acceptedFlavorInterfaces[i];
-					if (aclass.equals(cbe.getClass())) {
-						pasteFrom.setEnabled(true);
-						accepted = true;
-					}
-			  }
-			}
-		} else if (source == pasteFrom) {
-			fireEvent(ureq, new ClipboardEvent(cbs.getClipboardEntry()));
-		}
-	}
-	
-	@Override
-	protected void doDispose() {
-		// nothing to do
-	}
-
-
-}
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/from.html b/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/from.html
deleted file mode 100644
index 8f76b2870b30a9ef94c738d357693a475e8088a5..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/from.html
+++ /dev/null
@@ -1 +0,0 @@
-$r.render("pasteFrom")
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/to.html b/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/to.html
deleted file mode 100644
index 39b8335f4307f3bf7d878fab0ea97aec2caa496c..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/to.html
+++ /dev/null
@@ -1 +0,0 @@
-$r.render("copyTo")
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/tray.html b/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/tray.html
deleted file mode 100644
index ffd9dad9016f207176ac7748d7da47e5ead12fe8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_content/tray.html
+++ /dev/null
@@ -1,4 +0,0 @@
-$r.render("opendetail")
-$r.render("expanded")
-
-
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ar.properties
deleted file mode 100644
index d4235c8c8a819473b81e0122841f893cd324de52..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ar.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Feb 09 15:17:21 CET 2010
-copyTo=\u0646\u0633\u062E
-opendetail=\u0627\u0644\u062D\u0627\u0641\u0638\u0629
-pasteFrom=\u0644\u0635\u0642
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_bg.properties
deleted file mode 100644
index 1063150a37be4bbf06d0c0107351aecf91572cb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_bg.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu May 21 20:15:23 CEST 2009
-copyTo=\u041A\u043E\u043F\u0438\u0440\u0430\u0439\u0442\u0435
-opendetail=\u041C\u0435\u0436\u0434\u0438\u043D\u0435\u043D \u0431\u0443\u0444\u0435\u0440
-pasteFrom=\u0417\u0430\u043B\u0435\u043F\u0435\u0442\u0435
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_cs.properties
deleted file mode 100644
index 8400af49b05af7faa293c2cd54f42ff55234a2bf..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_cs.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:13 CET 2009
-copyTo=Kop\u00EDrovat
-opendetail=Schr\u00E1nka
-pasteFrom=Vlo\u017Eit
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_de.properties
deleted file mode 100644
index 49b555fea37ae80e009dff2c94ef5e170c702edb..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:04 CET 2009
-copyTo=Kopieren
-opendetail=Zwischenablage
-pasteFrom=Einf\u00FCgen
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_el.properties
deleted file mode 100644
index f90d7c9b959daae6df7b59656b6da0f9e6ef72ef..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_el.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:15 CET 2009
-copyTo=\u0391\u03BD\u03C4\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE
-opendetail=\u03A0\u03AF\u03BD\u03B1\u03BA\u03B1\u03C2 (Clipboard)
-pasteFrom=\u0395\u03C0\u03B9\u03BA\u03CC\u03BB\u03BB\u03B7\u03C3\u03B7
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_en.properties
deleted file mode 100644
index f47e030ea0cc805f19be2cb6821379c855aff86d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Jan 22 19:08:42 CET 2010
-copyTo=Copy
-opendetail=Clipboard
-pasteFrom=Paste
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_es.properties
deleted file mode 100644
index 54c6e550653c102e9ec56b981b44e4ff929cb5c7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_es.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:20 CET 2009
-copyTo=Copiar
-opendetail=Portapapeles
-pasteFrom=Pegar
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_fr.properties
deleted file mode 100644
index 00357cbe9fd704fe3740e70ae299f81f997fb527..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_fr.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:07 CET 2009
-copyTo=Copier
-opendetail=Presse-papiers
-pasteFrom=Coller
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_it.properties
deleted file mode 100644
index 9517f9af45866db8a33bde9bb508e1f8f3a2a873..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_it.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Sep 03 14:17:40 CEST 2010
-copyTo=Copiare
-opendetail=Clipboard
-pasteFrom=Incollare
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_jp.properties
deleted file mode 100644
index 9b01f8e67b598e79af35c192a4fd92dbbf0083d7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_jp.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:01 CET 2009
-copyTo=\u30B3\u30D4\u30FC
-opendetail=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9
-pasteFrom=\u30DA\u30FC\u30B9\u30C8
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ko.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ko.properties
deleted file mode 100644
index 67794242cdb9813f39ae51914d843670454c0a42..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ko.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Wed Aug 05 18:00:58 CEST 2009
-copyTo=\uBCF5\uC0AC
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_lt.properties
deleted file mode 100644
index 5c41202e550743b98327ce49df2026fee12da606..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_lt.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:02 CET 2009
-copyTo=Kopijuoti
-opendetail=Main\u0173 sritis
-pasteFrom=\u012Eklijuoti
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_nl_NL.properties
deleted file mode 100644
index 0bd3761ecb23de8cfa6de89c42b9340a10d95bcc..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_nl_NL.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:21 CET 2009
-copyTo=Kopi\u00EBren
-opendetail=Klembord
-pasteFrom=Plakken
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index 0b240d9d3a06aa3cbc67e15653e3438b4d06b4d6..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:16 CET 2009
-copyTo=Kopiuj
-opendetail=Schowek
-pasteFrom=Wklej
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pt_BR.properties
deleted file mode 100644
index 99e90b7f9e94b22413c5a94c358df6ecc2b32ae0..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_pt_BR.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:53:59 CET 2009
-copyTo=Copiar
-opendetail=Clipboard
-pasteFrom=Colar
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ru.properties
deleted file mode 100644
index d1a3f5b6dc29a17c3e1ed1b0c190cd50be798734..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_ru.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jul 27 18:07:59 CEST 2009
-copyTo=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-opendetail=\u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430
-pasteFrom=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_sq.properties
deleted file mode 100644
index ac3077605878dcef5ad277ba0fbdf016a068d008..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_sq.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 26 13:48:24 CEST 2009
-copyTo=Kopjo
-opendetail=Cop\u00EBzad\u00EBrrasa
-pasteFrom=Ngjit
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_vi.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_vi.properties
deleted file mode 100644
index fbd4103522528e428d6060a7c097ac569d9576dc..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_vi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:53:58 CET 2009
-copyTo=Ch\u00E9p
-opendetail=B\u1EA3ng ghi nh\u1EDB
-pasteFrom=D\u00E1n
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_CN.properties
deleted file mode 100644
index dcb8fb8dfe2594a1c79e69e270ee6c474fcd0c55..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_CN.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 23 04:56:09 CEST 2009
-copyTo=\u590D\u5236
-opendetail=\u526A\u5207\u677F
-pasteFrom=\u7C98\u8D34
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_TW.properties
deleted file mode 100644
index a8c112d174b527cf2b408077efdb1fe6f76899f3..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/LocalStrings_zh_TW.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:06 CET 2009
-copyTo=\u8907\u88FD
-opendetail=\u526A\u8CBC\u7C3F
-pasteFrom=\u8CBC\u4E0A
diff --git a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/i18nBundleMetadata.properties
deleted file mode 100644
index 424f601437cd7e39f03495d665409a19ff31bc86..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/core/commons/services/clipboard/impl/_i18n/i18nBundleMetadata.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tue Feb 17 14:03:31 CET 2009
-bundle.priority=100
diff --git a/src/main/java/org/olat/gui/control/OlatTopNavController.java b/src/main/java/org/olat/gui/control/OlatTopNavController.java
index 9acb41947b1cc810d765c11f18909fad868a1439..a183ffdd1a6aa7d81fe2d0e655c1e5168ec64d85 100644
--- a/src/main/java/org/olat/gui/control/OlatTopNavController.java
+++ b/src/main/java/org/olat/gui/control/OlatTopNavController.java
@@ -24,7 +24,6 @@ package org.olat.gui.control;
 import org.olat.basesecurity.AuthHelper;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
-import org.olat.core.commons.services.clipboard.ClipboardService;
 import org.olat.core.commons.services.search.ui.SearchController;
 import org.olat.core.commons.services.search.ui.SearchServiceUIFactory;
 import org.olat.core.commons.services.search.ui.SearchServiceUIFactory.DisplayOption;
@@ -62,7 +61,6 @@ public class OlatTopNavController extends BasicController /*TODO:PB:OLAT-4047 im
 	private VelocityContainer topNavVC;
 	private Controller imController;
 	private GroupChatManagerController groupChatController;
-	private Controller clipboardC;
 	private SearchController searchC;
 	private Link helpLink, loginLink;
 	//TODO:PB:OLAT-4047 private Link permLink;
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_ar.properties
index 7c379c6721a27af6eea258864abe41a6d728b875..14e8560543bbc225d08b6ea955e815d8cc56c51f 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_ar.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:32 CEST 2010
-ClipboardDemoController.menu.title=\u0627\u0644\u062D\u0627\u0641\u0638\u0629
-ClipboardDemoController.menu.title.alt=\u062A\u0648\u0636\u064A\u062D \u0627\u0644\u062D\u0627\u0641\u0638\u0629
 ErrorDemoController.menu.title=\u0623\u062E\u0637\u0627\u0621
 ErrorDemoController.menu.title.alt=\u062A\u0648\u0636\u064A\u062D \u0645\u0639\u0627\u0644\u062C\u0629 \u062E\u0637\u0623
 GUIDemoCSSJSController.menu.title=CSS & JS \u062F\u064A\u0646\u0627\u0645\u064A\u0643
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_bg.properties
index a59e845812f1d78919cfad78196a04db42a9aa54..73b8cdd0a56ece02efae7c180c86cf7a2d20840d 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_bg.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:31 CEST 2010
-ClipboardDemoController.menu.title=\u041C\u0435\u0436\u0434\u0438\u043D\u0435\u043D \u0431\u0443\u0444\u0435\u0440
-ClipboardDemoController.menu.title.alt=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0438\u0440\u0430 \u041C\u0435\u0436\u0434\u0438\u043D\u043D\u0438\u044F \u0411\u0443\u0444\u0435\u0440
 ErrorDemoController.menu.title=\u0413\u0440\u0435\u0448\u043A\u0438
 ErrorDemoController.menu.title.alt=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0438\u0440\u0430 \u0421\u043F\u0440\u0430\u0432\u044F\u043D\u0435\u0442\u043E \u0441 \u0413\u0440\u0435\u0448\u043A\u0438
 GUIDemoCSSJSController.menu.title=\u0414\u0438\u043D\u0430\u043C\u0438\u0447\u043D\u0438 CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_de.properties
index 9ac345fbbd1abff8cc0db72b28c3b468805faf69..cdaa6bedb1cce15fb2afb28448a71e6b928364e5 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_de.properties
@@ -1,6 +1,4 @@
 #Mon Mar 02 09:54:04 CET 2009
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrates Clipboard
 ErrorDemoController.menu.title=Errors
 ErrorDemoController.menu.title.alt=Demonstrates Error Handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_el.properties
index b3d034ff459d8b76e02b5f8ffc00f5b66d9a67aa..0642578384d9243036ca935ed1cf0f60be4e9a21 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_el.properties
@@ -1,6 +1,4 @@
 #Mon Sep 13 14:00:01 CEST 2010
-ClipboardDemoController.menu.title=\u03A0\u03AF\u03BD\u03B1\u03BA\u03B1\u03C2
-ClipboardDemoController.menu.title.alt=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
 ErrorDemoController.menu.title=\u039B\u03AC\u03B8\u03B7
 ErrorDemoController.menu.title.alt=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 \u03B4\u03B9\u03B1\u03C7\u03B5\u03AF\u03C1\u03B9\u03C3\u03B7\u03C2 \u03C3\u03C6\u03B1\u03BB\u03BC\u03AC\u03C4\u03C9\u03BD
 GUIDemoCSSJSController.menu.title=\u0394\u03C5\u03BD\u03B1\u03BC\u03B9\u03BA\u03CC CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_en.properties
index 3dc0db77fa27be6eab6f6bc3dd808d1544850fdd..c6129d026c113c4c159d578309bb7ffd390e90a6 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_en.properties
@@ -1,6 +1,4 @@
 #Sun Jan 23 15:22:53 CET 2011
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrates clipboard
 ErrorDemoController.menu.title=Errors
 ErrorDemoController.menu.title.alt=Demonstrates error handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_es.properties
index 22085c1f1e8890cf52781a47e1c46eb2319679a3..89b61ab4738c12c5285486922cdd1213989f9a95 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_es.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:33 CEST 2010
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demostrar Clipboard
 ErrorDemoController.menu.title=Errores
 ErrorDemoController.menu.title.alt=Demostrar el manejo de errores
 GUIDemoCSSJSController.menu.title=CSS & JS din\u00E1mico
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_fr.properties
index d5b6e9b0bf8e9b53d7c6369c459fb14f5fc80ad2..b29430270b32749bb34125a1c9794992b54bda96 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_fr.properties
@@ -1,6 +1,4 @@
 #Sat Jan 08 13:10:53 CET 2011
-ClipboardDemoController.menu.title=Presse-papier
-ClipboardDemoController.menu.title.alt=D\u00E9montre le presse-papier
 ErrorDemoController.menu.title=Erreurs
 ErrorDemoController.menu.title.alt=D\u00E9montre le traitement des erreurs
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_it.properties
index ed6d22ee1222b4f5eaa7352c954eb6b21bf6c376..f20f8f152fc6cb5ee57a24c61a02fa987e261f5b 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_it.properties
@@ -1,6 +1,4 @@
 #Sat Jan 08 13:05:53 CET 2011
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrates Clipboard
 ErrorDemoController.menu.title=Errors
 ErrorDemoController.menu.title.alt=Demonstrates Error Handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_jp.properties
index faab840f385a9f4e3456d8e9e70cca7eb41e7e19..6540d399ed3ff512a6ab932fc4e953c5764dcea7 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_jp.properties
@@ -1,5 +1,4 @@
 #Thu Sep 08 16:42:39 CEST 2011
-ClipboardDemoController.menu.title=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9
 ErrorDemoController.menu.title=\u30A8\u30E9\u30FC
 ErrorDemoController.menu.title.alt=\u30A8\u30E9\u30FC\u51E6\u7406\u3092\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30C8\u3059\u308B
 GUIDemoCSSJSController.menu.title=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AFCSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_nl_NL.properties
index d774430d4b5fa98be070fd3fc603b19adc32a1a5..d20008dfa03d7cbddedde410dc8148edeb76d0ed 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_nl_NL.properties
@@ -1,6 +1,4 @@
 #Thu Sep 08 16:42:48 CEST 2011
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrates clipboard
 ErrorDemoController.menu.title=Errors
 ErrorDemoController.menu.title.alt=Demonstrates error handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pl.properties
index ed2355c95ce25a98419ca1c65b2200232d73c37f..feaeff8be30d1065d0fb6bf3b3966048edc6bdc6 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pl.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:32 CEST 2010
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrates Clipboard
 ErrorDemoController.menu.title=Errors
 ErrorDemoController.menu.title.alt=Demonstrates Error Handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pt_BR.properties
index 0df80c9a2d11f92ad99a34cd00767102a41d6a1a..fa8bdf75ad2939ad08fb31993321a250a2990635 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_pt_BR.properties
@@ -1,6 +1,4 @@
 #Thu Sep 08 16:42:38 CEST 2011
-ClipboardDemoController.menu.title=Clipboard
-ClipboardDemoController.menu.title.alt=Demonstrar Clipboard
 ErrorDemoController.menu.title=Erros
 ErrorDemoController.menu.title.alt=Demonstra Error Handling
 GUIDemoCSSJSController.menu.title=Dynamic CSS & JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_CN.properties
index 9a6555603e4153147c96992c0305abd70c0f9e16..ddcb93c1df2c387dfc39f02d63ce74589b42a2f5 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_CN.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:30 CEST 2010
-ClipboardDemoController.menu.title=\u526A\u8D34\u677F
-ClipboardDemoController.menu.title.alt=\u663E\u793A\u526A\u8D34\u677F
 ErrorDemoController.menu.title=\u9519\u8BEF
 ErrorDemoController.menu.title.alt=\u663E\u793A\u9519\u8BEF\u5904\u7406
 GUIDemoCSSJSController.menu.title=\u5185\u90E8 CSS & JS\u6837\u5F0F
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_TW.properties
index 7c2dc13244b77152f4d6230686d93371d400f287..901d9365b095d3b185951c1eb6cba2111f70f94b 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_zh_TW.properties
@@ -1,6 +1,4 @@
 #Wed Jul 28 13:33:31 CEST 2010
-ClipboardDemoController.menu.title=\u526A\u8CBC\u7C3F
-ClipboardDemoController.menu.title.alt=\u5C55\u793A\u526A\u8CBC\u7C3F
 ErrorDemoController.menu.title=\u932F\u8AA4
 ErrorDemoController.menu.title.alt=\u5C55\u793A\u932F\u8AA4\u8655\u7406
 GUIDemoCSSJSController.menu.title=\u52D5\u614B CSS \u548C JS
diff --git a/src/main/java/org/olat/test/guidemo/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/test/guidemo/_i18n/i18nBundleMetadata.properties
index da3fb73b139f715b3039dee8308886994a198158..70465e489255e584c073e24b2dee835b148147be 100644
--- a/src/main/java/org/olat/test/guidemo/_i18n/i18nBundleMetadata.properties
+++ b/src/main/java/org/olat/test/guidemo/_i18n/i18nBundleMetadata.properties
@@ -1,5 +1,4 @@
 #Sat Jan 08 13:05:02 CET 2011
-ClipboardDemoController.menu.title.alt.annotation=deutsch nicht \u00FCbersetzt?
 ErrorDemoController.menu.title.alt.annotation=tranlation?
 ErrorDemoController.menu.title.annotation=no translation?
 GuiDemoAjaxTreeController.menu.title.alt.annotation=no translation?
diff --git a/src/main/java/org/olat/test/guidemo/clipboard/ClipboardDemoController.java b/src/main/java/org/olat/test/guidemo/clipboard/ClipboardDemoController.java
deleted file mode 100644
index eefbe8ee7c7188b5766b102f9539d7a4be1e037b..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/test/guidemo/clipboard/ClipboardDemoController.java
+++ /dev/null
@@ -1,98 +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.
- * <p>
- */
-package org.olat.test.guidemo.clipboard;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.commons.services.clipboard.ClipboardEntryCreator;
-import org.olat.core.commons.services.clipboard.ClipboardService;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-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.control.controller.BasicController;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- */
-public class ClipboardDemoController extends BasicController {
-
-	private Controller copyToC;
-	private Controller pasteFromC;
-	private ClipboardService cps;
-
-	/**
-	 * @param ureq
-	 * @param wControl
-	 */
-	public ClipboardDemoController(UserRequest ureq, WindowControl wControl) {
-		super(ureq, wControl);
-		
-		cps = (ClipboardService) CoreSpringFactory.getBean(ClipboardService.class);
-		// if cps == null --> service not available in this setup: does this make sense at all?
-		
-		VelocityContainer mainVc = createVelocityContainer("clipdemo");
-
-		// copyTo demo
-		copyToC = cps.createCopyToUIService(new ClipboardEntryCreator() {
-			public ClipboardEntry createClipboardEntry() {
-				return createCurrentClipboardEntry();
-			}
-		
-		}).createController(ureq, getWindowControl());
-		mainVc.put("copyto", copyToC.getInitialComponent());
-
-		// pasteFrom demo
-		pasteFromC = cps.createPasteFromUIService(new Class[] { DemoClipboardEntry.class}).createController(ureq, getWindowControl());
-		pasteFromC.addControllerListener(this);
-		mainVc.put("pastefrom", pasteFromC.getInitialComponent());
-
-		putInitialPanel(mainVc);
-	}
-
-	ClipboardEntry createCurrentClipboardEntry() {
-		return new DemoClipboardEntry("time:"+System.currentTimeMillis());
-	}
-	
-	@Override
-	public void event(UserRequest ureq, Component source, Event event) {
-		// nothing to do yet
-	}
-
-	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == pasteFromC) {
-			ClipboardEntry cbe = cps.getClipboardEntryFrom(event);
-			DemoClipboardEntry dcbe = (DemoClipboardEntry) cbe;
-			getWindowControl().setInfo("content of clipboard is:"+dcbe.getText());
-		}
-	}
-
-	@Override
-	protected void doDispose() {
-		if (copyToC != null) copyToC.dispose();
-		if (pasteFromC != null) pasteFromC.dispose();
-	}
-
-}
-
diff --git a/src/main/java/org/olat/test/guidemo/clipboard/DemoClipboardEntry.java b/src/main/java/org/olat/test/guidemo/clipboard/DemoClipboardEntry.java
deleted file mode 100644
index d4d9f3bcd3c51b47c7d8e4fa9e74eefe8c56c92f..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/test/guidemo/clipboard/DemoClipboardEntry.java
+++ /dev/null
@@ -1,71 +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.
-* <p>
-*/ 
-package org.olat.test.guidemo.clipboard;
-
-import org.olat.core.commons.services.clipboard.ClipboardEntry;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.creator.ControllerCreator;
-import org.olat.core.gui.control.generic.messages.MessageUIFactory;
-
-/**
- * @author Felix Jost, http://www.goodsolutions.ch
- *
- */
-public class DemoClipboardEntry implements ClipboardEntry {
-
-	private final String text;
-
-	/**
-	 * @param string
-	 */
-	public DemoClipboardEntry(String text) {
-		this.text = text;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.olat.core.commons.services.clipboard.ClipboardEntry#acceptsFlavor(java.lang.Class)
-	 */
-	public boolean acceptsFlavor(Class flavorInterfaceName) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.olat.core.commons.services.clipboard.ClipboardEntry#createTrayUI()
-	 */
-	public ControllerCreator createTrayUI() {
-		return new ControllerCreator(){
-			public Controller createController(UserRequest ureq, WindowControl wControl) {
-				return MessageUIFactory.createSimpleMessage(ureq, wControl, DemoClipboardEntry.this.text);
-			}};
-	}
-
-	/**
-	 * @return
-	 */
-	public String getText() {
-		return text;
-	}
-	
-	
-
-}
diff --git a/src/main/java/org/olat/test/guidemo/clipboard/_content/clipdemo.html b/src/main/java/org/olat/test/guidemo/clipboard/_content/clipdemo.html
deleted file mode 100644
index fbb28e3fd3266a41eadab7052a7d3d97235a4fde..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/test/guidemo/clipboard/_content/clipdemo.html
+++ /dev/null
@@ -1,5 +0,0 @@
-copyTo:<br>
-$r.render("copyto")
-<hr>
-pasteFrom:<br>
-$r.render("pastefrom")
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml b/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
index 0fe269518d0167edfcbef54fbc20346a62a6385c..c77fd8f3051b1b93d7b2bc2b9de6c9820b7488d2 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
@@ -461,21 +461,6 @@
 			<property name="order" value="25" />
 		</bean>
 		
-		<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
-			<property name="actionController">	
-				<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
-					<property name="className" value="org.olat.test.guidemo.clipboard.ClipboardDemoController"/>
-				</bean>
-			</property>
-			<property name="translationPackage" value="org.olat.test.guidemo" />
-			<property name="extensionPoints">
-				<list>	
-					<value>org.olat.test.GUIDemoMainController</value>		
-				</list>
-			</property>
-			<property name="order" value="26" />
-		</bean>
-		
 		<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
 			<property name="actionController">	
 				<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">