diff --git a/prism/src/userinterface/GUIClipboard.java b/prism/src/userinterface/GUIClipboard.java
index db57bddc..6ad4c25d 100644
--- a/prism/src/userinterface/GUIClipboard.java
+++ b/prism/src/userinterface/GUIClipboard.java
@@ -75,7 +75,6 @@ public class GUIClipboard extends GUIPlugin
         /* Listen to clipboard events. */
         Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
         clipboard.addFlavorListener(new FlavorListener() {
-        	@Override
         	public void flavorsChanged(FlavorEvent e) {
         		doClipboardEnables();
         	}
@@ -101,7 +100,6 @@ public class GUIClipboard extends GUIPlugin
     		this.plugin = plugin;
     		/* get notified when enabledness of clipboard actions may change */
     		this.plugin.getSelectionChangeHandler().addListener(new GUIEventListener() {
-    			@Override
     			public boolean processGUIEvent(GUIEvent e) {
     				doClipboardEnables();
     				return true;
@@ -114,7 +112,6 @@ public class GUIClipboard extends GUIPlugin
 	    		
 	    		/* get notified when undo history may change */
 	    		undoManager.addListener(new GUIEventListener() {
-	    			@Override
 	    			public boolean processGUIEvent(GUIEvent e) {
 	    				if (e instanceof GUIUndoManagerEvent)
 	    				{
diff --git a/prism/src/userinterface/GUIPrism.java b/prism/src/userinterface/GUIPrism.java
index 4d5c5d32..ef8b0ac6 100644
--- a/prism/src/userinterface/GUIPrism.java
+++ b/prism/src/userinterface/GUIPrism.java
@@ -231,7 +231,6 @@ public class GUIPrism extends JFrame
         JPanel thePanel = new JPanel(); // panel to store tabs
         theTabs = new JTabbedPane();
         theTabs.addChangeListener(new ChangeListener() {
-        	@Override
         	public void stateChanged(ChangeEvent e) {
         		clipboardPlugin.pluginChanged(getFocussedPlugin()); 		
         	}
diff --git a/prism/src/userinterface/log/GUIWindowLog.java b/prism/src/userinterface/log/GUIWindowLog.java
index 810b8742..71885cc7 100644
--- a/prism/src/userinterface/log/GUIWindowLog.java
+++ b/prism/src/userinterface/log/GUIWindowLog.java
@@ -69,7 +69,6 @@ public class GUIWindowLog implements PrismLog
 		this.logPlugin = logPlugin;
 		textArea = ta;
 		textArea.addCaretListener(new CaretListener() {
-			@Override
 			public void caretUpdate(CaretEvent e) {
 				if (GUIWindowLog.this.logPlugin != null)
 					GUIWindowLog.this.logPlugin.getSelectionChangeHandler().notifyListeners(new GUIEvent(1));
diff --git a/prism/src/userinterface/model/GUITextModelEditor.java b/prism/src/userinterface/model/GUITextModelEditor.java
index 5bcab97c..8d2e1e40 100644
--- a/prism/src/userinterface/model/GUITextModelEditor.java
+++ b/prism/src/userinterface/model/GUITextModelEditor.java
@@ -176,7 +176,6 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen
 		editor.setText(initialText);
 		editor.getDocument().addDocumentListener(this);
 		editor.addCaretListener(new CaretListener() {
-			@Override
 			public void caretUpdate(CaretEvent e) {
 				GUITextModelEditor.this.handler.getGUIPlugin().getSelectionChangeHandler().notifyListeners(new GUIEvent(1));				
 			}
@@ -295,7 +294,6 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen
 		editor.getDocument().addUndoableEditListener(undoManager);
 		editor.getDocument().addUndoableEditListener(new UndoableEditListener() 
 		{
-			@Override
 			public void undoableEditHappened(UndoableEditEvent e) 
 			{
 				System.out.println("adding undo edit");				
diff --git a/prism/src/userinterface/properties/GUIMultiProperties.java b/prism/src/userinterface/properties/GUIMultiProperties.java
index 5468e4a6..048e7d88 100644
--- a/prism/src/userinterface/properties/GUIMultiProperties.java
+++ b/prism/src/userinterface/properties/GUIMultiProperties.java
@@ -1460,16 +1460,12 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
 		}
 	}
 	
-	
-	
-	@Override
 	public void componentAdded(ContainerEvent e) 
 	{
 		// notify GUIClipboard
 		selectionChangeHandler.notifyListeners(new GUIEvent(1));		
 	}
 
-	@Override
 	public void componentRemoved(ContainerEvent e) {
 		// notify GUIClipboard
 		selectionChangeHandler.notifyListeners(new GUIEvent(1));