Remove (c) Manchester lines
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbsentValue.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbsentValue.java
index 2ea392f..aa7fb42 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbsentValue.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbsentValue.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPort.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPort.java
index e57c4f9..512ef9c 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPort.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPort.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPortDescription.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPortDescription.java
index 7c3fe9a..c7b6215 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPortDescription.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractPortDescription.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractValue.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractValue.java
index 47232c2..8057fa6 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractValue.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/AbstractValue.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ErrorValue.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ErrorValue.java
index 0bb07b4..bf90f92 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ErrorValue.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ErrorValue.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/InputDescription.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/InputDescription.java
index 60b9353..b80e7bf 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/InputDescription.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/InputDescription.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/LeafValue.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/LeafValue.java
index 052c0ef..628ddf1 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/LeafValue.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/LeafValue.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ListValue.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ListValue.java
index b14cdf1..cd60078 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ListValue.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/ListValue.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/Namespaces.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/Namespaces.java
index 4003cdb..733411f 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/Namespaces.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/Namespaces.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/OutputDescription.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/OutputDescription.java
index 0b94973..ea39e48 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/OutputDescription.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/OutputDescription.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description;
 
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/package-info.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/package-info.java
index b1ac2c6..f7b368f 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/package-info.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 @XmlSchema(namespace = DATA, elementFormDefault = QUALIFIED, attributeFormDefault = QUALIFIED, xmlns = {
 		@XmlNs(prefix = "port", namespaceURI = DATA),
diff --git a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/utils/IntAdapter.java b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/utils/IntAdapter.java
index 8764176..13af754 100644
--- a/taverna-server-port-description/src/main/java/org/taverna/server/port_description/utils/IntAdapter.java
+++ b/taverna-server-port-description/src/main/java/org/taverna/server/port_description/utils/IntAdapter.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.port_description.utils;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/IllegalStateTransitionException.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/IllegalStateTransitionException.java
index 9f4bf50..b324fb2 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/IllegalStateTransitionException.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/IllegalStateTransitionException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/ImplementationException.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/ImplementationException.java
index a47d112..bdb796b 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/ImplementationException.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/ImplementationException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectory.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectory.java
index 395842a..fbd8c3f 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectory.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectoryEntry.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectoryEntry.java
index 1e04b44..8d791bb 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectoryEntry.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectoryEntry.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteFile.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteFile.java
index e09466d..6dc4409 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteFile.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteFile.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteInput.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteInput.java
index 7a7510c..78078c4 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteInput.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteInput.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteListener.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteListener.java
index 4001721..8fe1798 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteListener.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteListener.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java
index eec4ab5..6699f4d 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSecurityContext.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSecurityContext.java
index 35e6c09..9767cd7 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSecurityContext.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSecurityContext.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java
index fa68b81..8ef2e3d 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteStatus.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteStatus.java
index db039f0..4a15b0c 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteStatus.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteStatus.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java
index 4643d5c..f7c8ea1 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.remote;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/package-info.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/package-info.java
index 9880a3b..ecfff23 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/package-info.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/remote/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Interfaces exported by worker classes to the server.
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/UsageRecordReceiver.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/UsageRecordReceiver.java
index 89c29ae..6f05eaa 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/UsageRecordReceiver.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/UsageRecordReceiver.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.server;
 
diff --git a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/package-info.java b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/package-info.java
index cdd592b..5f27db1 100644
--- a/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/package-info.java
+++ b/taverna-server-runinterface/src/main/java/org/taverna/server/localworker/server/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Interfaces exported by the server to worker classes.
diff --git a/taverna-server-unix-forker/src/main/java/org/taverna/server/unixforker/Forker.java b/taverna-server-unix-forker/src/main/java/org/taverna/server/unixforker/Forker.java
index f9dc632..22294b2 100644
--- a/taverna-server-unix-forker/src/main/java/org/taverna/server/unixforker/Forker.java
+++ b/taverna-server-unix-forker/src/main/java/org/taverna/server/unixforker/Forker.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.unixforker;
 
diff --git a/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java b/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
index d12d3d8..29e19cf 100644
--- a/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
+++ b/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.ogf.usage;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
index 7e35067..e92c4c0 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java
index 48969fa..1bcc570 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/InputREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/InputREST.java
index 0f48207..333c387 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/InputREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/InputREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/InteractionFeed.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/InteractionFeed.java
index b686491..a7a6582 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/InteractionFeed.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/InteractionFeed.java
@@ -1,7 +1,4 @@
 /*

- * Copyright (C) 2013 The University of Manchester

- * 

- * See the file "LICENSE" for license terms.

  */

 package org.taverna.server.master;

 

diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenerPropertyREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenerPropertyREST.java
index 3e983a9..971c04a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenerPropertyREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenerPropertyREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenersREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenersREST.java
index 4b7d7f3..5fb537a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenersREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ListenersREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ManagementState.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ManagementState.java
index 9d4a651..d3a2874 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ManagementState.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ManagementState.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
index 563a822..07f94cc 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunSecurityREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunSecurityREST.java
index 5a366b2..333364b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunSecurityREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunSecurityREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/SingleListenerREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/SingleListenerREST.java
index 6c9e8d8..a5cfcde 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/SingleListenerREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/SingleListenerREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
index 0f98da6..1b2fe1e 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java
index 99a666f..2c8fd30 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
index 184c7b5..3510693 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.admin;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java
index b83d88f..99f2956 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.admin;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/package-info.java
index 930fd75..a0ffffe 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the RESTful administration interface to Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ContentTypes.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ContentTypes.java
index 1a89b8d..b00d20e 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ContentTypes.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ContentTypes.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.api;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ManagementModel.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ManagementModel.java
index 6bc6058..cab39ab 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ManagementModel.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/ManagementModel.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.api;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/TavernaServerBean.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/TavernaServerBean.java
index 5a14fb6..e6077a4 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/api/TavernaServerBean.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/api/TavernaServerBean.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.api;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java
index 5c16e79..2bbd85a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java
index 318ae4f..9f83a60 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
index bb98d6d..96f3dcb 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java
index 1311272..adcbe2c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java
index 258bfd0..c1a737d 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java
index 69c3622..324913b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE.txt" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java
index 8079b1c..7191dd0 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java
index 3486bf7..7e39936 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java
index 8e360dc..d94bf9b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java
index 6d77aa7..f5cd0e3 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java
index d6d057c..7feb70b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java
index 6eddf2d..d1d6fb1 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java
index 1b00eb2..8ea39d8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java
index fd040de..844333b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the common XML elements used throughout Taverna Server's various interfaces.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java
index e9c58a9..c9c5c0f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.common.version;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java
index c2a2bc9..dceb89f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.defaults;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java
index 0b6247e..790efe9 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java
index 303b19b..a343d3f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java
index 4b843e2..ca78824 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java
index 0b6cf07..2264159 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java
index 11d47c7..459d5da 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java
index 67ba551..c95b6ee 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java
index e2ddf4c..6f3dfee 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java
index 7077fc4..6b98ec2 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDestroyException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDestroyException.java
index d7b0d29..6659d91 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDestroyException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDestroyException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDirectoryEntryException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDirectoryEntryException.java
index 0d6ca63..d8fab6a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDirectoryEntryException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoDirectoryEntryException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoListenerException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoListenerException.java
index f4b8e81..f26a252 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoListenerException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoListenerException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoUpdateException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoUpdateException.java
index c49d111..621ed41 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoUpdateException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoUpdateException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NotOwnerException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NotOwnerException.java
index 6e1f792..1c1eb7e 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NotOwnerException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NotOwnerException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java
index dda371e..228379a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/UnknownRunException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/UnknownRunException.java
index 4632d4a..388eef6 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/UnknownRunException.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/UnknownRunException.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.exceptions;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/package-info.java
index 29ccacd..8e3d2c8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the exceptions/faults thrown by Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/Facade.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/Facade.java
index 0015754..af9c57c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/Facade.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/Facade.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.facade;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/package-info.java
index 73c884f..d4b4cf5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/facade/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Simple facade used at the top level of the Taverna Server in order to
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java
index 954b6f1..d3852f9 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.factories;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ListenerFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ListenerFactory.java
index ecc13cd..ce9a021 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ListenerFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/ListenerFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.factories;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java
index eeacad7..92b5b72 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.factories;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/package-info.java
index 39b9ac6..c1b47ed 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/factories/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * These interfaces define the principal way for the <i>factories</i> of
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/AuthorityDerivedIDMapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/AuthorityDerivedIDMapper.java
index 63402ef..6e51387 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/AuthorityDerivedIDMapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/AuthorityDerivedIDMapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/CompositeIDMapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/CompositeIDMapper.java
index b5fcd5a..0661c21 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/CompositeIDMapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/CompositeIDMapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/ConstantIDMapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/ConstantIDMapper.java
index e81f926..e3e23d7 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/ConstantIDMapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/ConstantIDMapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/NameIDMapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/NameIDMapper.java
index 42a3874..ad628c4 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/NameIDMapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/NameIDMapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/User.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/User.java
index bdb6e40..d1cd3dd 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/User.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/User.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/UserStore.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/UserStore.java
index 054d932..0f20a87 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/UserStore.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/UserStore.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/WorkflowInternalAuthProvider.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/WorkflowInternalAuthProvider.java
index 9219a60..c6d864f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/WorkflowInternalAuthProvider.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/WorkflowInternalAuthProvider.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE.txt" for license terms.
  */
 package org.taverna.server.master.identity;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/package-info.java
index dd1500a..c9dd0b4 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/identity/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Implementations of beans that map global user identities to local
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java
index 99e1d99..625f852 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interaction;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java
index 9efc30d..330a61b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the Atom feed implementation for interactions for a particular workflow run.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java
index 9a0a84e..d9ac05c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java
index b098152..7da3c5a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/File.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/File.java
index e4e6590..c4a1dd1 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/File.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/File.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Input.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Input.java
index 31cb7cb..463a569 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Input.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Input.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Listener.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Listener.java
index d7998bc..b656805 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Listener.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Listener.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/LocalIdentityMapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/LocalIdentityMapper.java
index 37b104e..9f9fc8a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/LocalIdentityMapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/LocalIdentityMapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/MessageDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/MessageDispatcher.java
index 37dbf2c..8eb271b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/MessageDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/MessageDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java
index f57fe71..f137fcd 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/RunStore.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/RunStore.java
index b5e84c5..42e4389 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/RunStore.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/RunStore.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/SecurityContextFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/SecurityContextFactory.java
index 902c4d0..49df39a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/SecurityContextFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/SecurityContextFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java
index 399164d..29b97d5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaSecurityContext.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaSecurityContext.java
index b227bfa..0258dbf 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaSecurityContext.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaSecurityContext.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/UriBuilderFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/UriBuilderFactory.java
index e5cd02c..a1b3bd5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/UriBuilderFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/UriBuilderFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.interfaces;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/package-info.java
index cfbbe79..5f9e652 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/interfaces/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Interfaces to the main worker classes that provide the magical power
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java
index 371a202..fd74044 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java
index b67e121..a4b72e5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java
index e449373..96a5caf 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerFactory.java
index f890204..3f421a2 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
index 9f0f39b..ec4502b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/PersistedState.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/PersistedState.java
index 83d6bda..af33af8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/PersistedState.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/PersistedState.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.localworker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/package-info.java
index 7139dd7..dd8c6e5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Implementation of a Taverna Server back-end that works by forking off
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/EmailDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/EmailDispatcher.java
index 3e27806..ea758a5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/EmailDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/EmailDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/JabberDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/JabberDispatcher.java
index 61640bf..b8623f7 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/JabberDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/JabberDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 
 package org.taverna.server.master.notification;
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/NotificationEngine.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/NotificationEngine.java
index bc0f60d..f03d96b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/NotificationEngine.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/NotificationEngine.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/RateLimitedDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/RateLimitedDispatcher.java
index c8d7ef6..b0c0fb8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/RateLimitedDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/RateLimitedDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/SMSDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/SMSDispatcher.java
index 5553141..94884fb 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/SMSDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/SMSDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/TwitterDispatcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/TwitterDispatcher.java
index 8ee4815..cfa7388 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/TwitterDispatcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/TwitterDispatcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java
index e5beaeb..4017256 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification.atom;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/Event.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/Event.java
index 825029d..f8b5e6a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/Event.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/Event.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification.atom;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/EventDAO.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/EventDAO.java
index 56f25ff..3984d60 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/EventDAO.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/EventDAO.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.notification.atom;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/package-info.java
index 9cc592d..3f89257 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/atom/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the Atom feed implementation within Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/package-info.java
index 979066a..a724c26 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/notification/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * The notification fabric and implementations of notification dispatchers
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/package-info.java
index 17bfd03..a1939f9 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * The core of the implementation of Taverna Server, including the
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ContentTypes.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ContentTypes.java
index b0819a5..3ac59cc 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ContentTypes.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ContentTypes.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/DirectoryContents.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/DirectoryContents.java
index e01d1c4..35ab04b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/DirectoryContents.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/DirectoryContents.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/FileSegment.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/FileSegment.java
index 74269c1..9497e97 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/FileSegment.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/FileSegment.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java
index b9b4718..0ab9080 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ListenerDefinition.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ListenerDefinition.java
index 7a072be..1a53df7 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ListenerDefinition.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/ListenerDefinition.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/MakeOrUpdateDirEntry.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/MakeOrUpdateDirEntry.java
index 0138f88..ac9b677 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/MakeOrUpdateDirEntry.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/MakeOrUpdateDirEntry.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java
index ea2f776..d00c741 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
index faed19d..34e2fe8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java
index e9b067e..6e41c03 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java
index 62158bb..2c6d13c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java
index 2b328fd..a8b0088 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java
index 73000e8..837d9fb 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/AccessDeniedHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/AccessDeniedHandler.java
index 8b9c75f..1834d34 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/AccessDeniedHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/AccessDeniedHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadInputPortNameHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadInputPortNameHandler.java
index 254382b..22a56e6 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadInputPortNameHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadInputPortNameHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadPropertyValueHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadPropertyValueHandler.java
index 6ded568..36f9081 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadPropertyValueHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadPropertyValueHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadStateChangeHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadStateChangeHandler.java
index 9501923..3e2b8b0 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadStateChangeHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/BadStateChangeHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileMessageHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileMessageHandler.java
index 0aeb816..4aeee8b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileMessageHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileMessageHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileSegmentHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileSegmentHandler.java
index f387cf6..04f69e3 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileSegmentHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FileSegmentHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FilesystemAccessHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FilesystemAccessHandler.java
index 12c137e..849f723 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FilesystemAccessHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/FilesystemAccessHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/GeneralFailureHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/GeneralFailureHandler.java
index 775805b..da2aefb 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/GeneralFailureHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/GeneralFailureHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/HandlerCore.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/HandlerCore.java
index 0e3fb51..09f1a0a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/HandlerCore.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/HandlerCore.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/IllegalArgumentHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/IllegalArgumentHandler.java
index ac02015..cbe8e96 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/IllegalArgumentHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/IllegalArgumentHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ImplementationProblemHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ImplementationProblemHandler.java
index 1458667..afaa849 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ImplementationProblemHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ImplementationProblemHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InputStreamMessageHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InputStreamMessageHandler.java
index 2c0c092..394667c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InputStreamMessageHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InputStreamMessageHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InvalidCredentialHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InvalidCredentialHandler.java
index fe11de8..d4b2639 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InvalidCredentialHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/InvalidCredentialHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/JAXBExceptionHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/JAXBExceptionHandler.java
index 33ac6a0..23f6809 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/JAXBExceptionHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/JAXBExceptionHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NegotiationFailedHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NegotiationFailedHandler.java
index 47153e7..a197669 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NegotiationFailedHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NegotiationFailedHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java
index e4215a1..3bcaf4d 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCredentialHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCredentialHandler.java
index d81f6ba..e0d2954 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCredentialHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCredentialHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDestroyHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDestroyHandler.java
index 927af4b..1156c26 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDestroyHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDestroyHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java
index ab2e54d..20dbd7b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoListenerHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoListenerHandler.java
index 36e3053..4233c05 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoListenerHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoListenerHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoUpdateHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoUpdateHandler.java
index 61a89d4..017ed73 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoUpdateHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoUpdateHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NotOwnerHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NotOwnerHandler.java
index 44de871..377bc6a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NotOwnerHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/NotOwnerHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java
index 21e5e68..22174f7 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/PermissionHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/PermissionHandler.java
index 03a4dd4..599abfa 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/PermissionHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/PermissionHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java
index 6d7e0ca..a639d64 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE.txt" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/T2FlowDocumentHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/T2FlowDocumentHandler.java
index 4227d80..3de3ae9 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/T2FlowDocumentHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/T2FlowDocumentHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java
index a90a229..c341430 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/UnknownRunHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/UnknownRunHandler.java
index 4542237..729a5d4 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/UnknownRunHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/UnknownRunHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ZipStreamHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ZipStreamHandler.java
index 2241220..36abf08 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ZipStreamHandler.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/ZipStreamHandler.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.rest.handler;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/package-info.java
index e72af22..e321fd7 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains type handlers for the RESTful interface to Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/package-info.java
index 0a0b069..f1a0e79 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the RESTful interface to Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/DirEntry.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/DirEntry.java
index bb8d73f..f0b7af4 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/DirEntry.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/DirEntry.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/FileContents.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/FileContents.java
index 7ebc991..7a536ac 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/FileContents.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/FileContents.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/PermissionList.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/PermissionList.java
index 3ab6d0c..b07a187 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/PermissionList.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/PermissionList.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
index e175bf8..7992a4d 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java
index 854eaff..52f5267 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE.txt" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/ZippedDirectory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/ZippedDirectory.java
index 90fe51b..ed08831 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/ZippedDirectory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/ZippedDirectory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.soap;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/package-info.java
index 51d9b69..285af3a 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * This package contains the SOAP interface to Taverna Server.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
index 487dbd0..3ab4419 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.usage;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
index 12de304..148843b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.usage;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/package-info.java
index 13e14cd..9762964 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Resource usage recording mechanism.
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CallTimeLogger.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CallTimeLogger.java
index a1ac04a..685ca19 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CallTimeLogger.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CallTimeLogger.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CertificateChainFetcher.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CertificateChainFetcher.java
index c27502f..b4f3107 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CertificateChainFetcher.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/CertificateChainFetcher.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/Contextualizer.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/Contextualizer.java
index 884ff94..6be6fed 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/Contextualizer.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/Contextualizer.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/FilenameUtils.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/FilenameUtils.java
index 19299e2..aff8b1f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/FilenameUtils.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/FilenameUtils.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/InvocationCounter.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/InvocationCounter.java
index 55a260b..aae49ee 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/InvocationCounter.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/InvocationCounter.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JCECheck.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JCECheck.java
index 252e316..4389355 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JCECheck.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JCECheck.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java
index ba9ec81..de59c2b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RestUtils.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RestUtils.java
index a892b52..f7e00ff 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RestUtils.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RestUtils.java
@@ -1,7 +1,4 @@
 /*

- * Copyright (C) 2013 The University of Manchester

- * 

- * See the file "LICENSE" for license terms.

  */

 package org.taverna.server.master.utils;

 

diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RuntimeExceptionWrapper.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RuntimeExceptionWrapper.java
index 0b2d4ea..f179a10 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RuntimeExceptionWrapper.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/RuntimeExceptionWrapper.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/UsernamePrincipal.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/UsernamePrincipal.java
index 9bbcc2f..86c7bc0 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/UsernamePrincipal.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/UsernamePrincipal.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/WebappAwareDataSource.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/WebappAwareDataSource.java
index 03fc749..e4ce7f3 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/WebappAwareDataSource.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/WebappAwareDataSource.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/X500Utils.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/X500Utils.java
index da4cff0..309a516 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/X500Utils.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/X500Utils.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.utils;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/package-info.java
index 612e61c..45559ba 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/utils/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * Miscellaneous utility classes. Includes aspects that might be attached
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/CompletionNotifier.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/CompletionNotifier.java
index 10b3830..28bb8cd 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/CompletionNotifier.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/CompletionNotifier.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/FactoryBean.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/FactoryBean.java
index 5d0f371..68870eb 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/FactoryBean.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/FactoryBean.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyImpl.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyImpl.java
index f5613c7..bfad360 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyImpl.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyImpl.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyLimits.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyLimits.java
index 8cbc7ea..f4ce5a0 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyLimits.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/PolicyLimits.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RemoteRunDelegate.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RemoteRunDelegate.java
index 22158d5..652c86f 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RemoteRunDelegate.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RemoteRunDelegate.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunConnection.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunConnection.java
index cf55ea0..89fa8db 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunConnection.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunConnection.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDBSupport.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDBSupport.java
index 2aa7ed1..920aa3d 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDBSupport.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDBSupport.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabase.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabase.java
index cedb4b5..8121843 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabase.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabase.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabaseDAO.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabaseDAO.java
index 51931c0..6544510 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabaseDAO.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/RunDatabaseDAO.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegate.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegate.java
index ff14986..096e0d5 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegate.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegate.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegateImpl.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegateImpl.java
index d36d2da..cc06be8 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegateImpl.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextDelegateImpl.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextFactory.java
index cbccf34..f8ed772 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextFactory.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SecurityContextFactory.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2011-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java
index 793d291..2d9c9d9 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/WorkerModel.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/WorkerModel.java
index 1abe617..013ba6c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/WorkerModel.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/WorkerModel.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.worker;
 
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/package-info.java
index 6007f88..4915eec 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/package-info.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/worker/package-info.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 /**
  * A Taverna Server back-end that works by forking off workflow executors.
diff --git a/taverna-server-webapp/src/test/java/org/taverna/server/master/JaxbSanityTest.java b/taverna-server-webapp/src/test/java/org/taverna/server/master/JaxbSanityTest.java
index 79c026b..21925a7 100644
--- a/taverna-server-webapp/src/test/java/org/taverna/server/master/JaxbSanityTest.java
+++ b/taverna-server-webapp/src/test/java/org/taverna/server/master/JaxbSanityTest.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master;
 
diff --git a/taverna-server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java b/taverna-server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java
index a2a0791..6caa5f2 100644
--- a/taverna-server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java
+++ b/taverna-server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.master.mocks;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Constants.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Constants.java
index 600913a..18fa041 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Constants.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Constants.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.api;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/RunAccounting.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/RunAccounting.java
index 3896c06..7c14f51 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/RunAccounting.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/RunAccounting.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2013 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.api;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Worker.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Worker.java
index c513ed8..9e6d00e 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Worker.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/api/Worker.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.api;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java
index 1692856..7064eec 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java
index 7e47af9..30be74d 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java
index adf3ea7..96076b8 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
index ae89988..d8592a5 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
index 1a6cff8..c9fcde1 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;
 
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/utils/FilenameVerifier.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/utils/FilenameVerifier.java
index fbc3a72..fdcdc64 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/utils/FilenameVerifier.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/utils/FilenameVerifier.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2011 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl.utils;
 
diff --git a/taverna-server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java b/taverna-server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java
index 7bcd92e..ca1eb54 100644
--- a/taverna-server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java
+++ b/taverna-server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010-2012 The University of Manchester
- * 
- * See the file "LICENSE" for license terms.
  */
 package org.taverna.server.localworker.impl;