diff --git a/galasa-parent/dev.galasa.framework.api.health/src/main/java/dev/galasa/framework/api/health/internal/Health.java b/galasa-parent/dev.galasa.framework.api.health/src/main/java/dev/galasa/framework/api/health/internal/Health.java
index bdff17bbe..42ee113f5 100644
--- a/galasa-parent/dev.galasa.framework.api.health/src/main/java/dev/galasa/framework/api/health/internal/Health.java
+++ b/galasa-parent/dev.galasa.framework.api.health/src/main/java/dev/galasa/framework/api/health/internal/Health.java
@@ -28,7 +28,7 @@
  *
  * Does not require authentication
  *
- * @author Michael Baylis
+ *  
  *
  */
 @Component(service = Servlet.class, scope = ServiceScope.PROTOTYPE, property = {
diff --git a/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/TestcatalogStreams.java b/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/TestcatalogStreams.java
index c1b18cd31..4e0bc6274 100644
--- a/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/TestcatalogStreams.java
+++ b/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/TestcatalogStreams.java
@@ -39,7 +39,7 @@
 /**
  * Basic Test Catalog store
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Component(service = Servlet.class, scope = ServiceScope.PROTOTYPE, property = {
diff --git a/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/Testcatalogs.java b/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/Testcatalogs.java
index c9c7109dc..8172f97d1 100644
--- a/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/Testcatalogs.java
+++ b/galasa-parent/dev.galasa.framework.api.testcatalog/src/main/java/dev/galasa/framework/api/testcatlog/internal/Testcatalogs.java
@@ -43,7 +43,7 @@
 /**
  * Basic Test Catalog store
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Component(service = Servlet.class, scope = ServiceScope.PROTOTYPE, property = {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyRegistration.java
index dcedb723c..a8c7f4a39 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyRegistration.java
@@ -19,7 +19,7 @@
 /**
  * 
  * 
- * @author James Davies
+ *  
  */
 @Component(service = { IConfigurationPropertyStoreRegistration.class })
 public class FpfConfigurationPropertyRegistration implements IConfigurationPropertyStoreRegistration {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyStore.java
index 9b45ffc64..59fdd1389 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FpfConfigurationPropertyStore.java
@@ -24,8 +24,8 @@
  * Configuration property store as the only CPS.
  * </p>
  * 
- * @author James Davies
- * @author Matthew Chivers
+ *  
+ *  
  */
 
 public class FpfConfigurationPropertyStore implements IConfigurationPropertyStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FrameworkConfigurationPropertyService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FrameworkConfigurationPropertyService.java
index 8368f5ae5..807c01f62 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FrameworkConfigurationPropertyService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cps/FrameworkConfigurationPropertyService.java
@@ -22,8 +22,8 @@
  * This class is used to drive the registered CPS service, and retireve values
  * from the CPS Store, impletmenting the IConfiguration interface.
  * 
- * @author James Davies
- * @author Matthew Chivers
+ *  
+ *  
  */
 public class FrameworkConfigurationPropertyService implements IConfigurationPropertyStoreService {
     private String                      namespace;
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsRegistration.java
index f559ff870..130030772 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsRegistration.java
@@ -18,7 +18,7 @@
 /**
  * 
  * 
- * @author Bruce Abbott
+ *  
  */
 @Component(service = { ICredentialsStoreRegistration.class })
 public class FileCredentialsRegistration implements ICredentialsStoreRegistration {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsStore.java
index b08206247..492a65f57 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FileCredentialsStore.java
@@ -30,7 +30,7 @@
  * encrypted or not
  * </p>
  * 
- * @author Bruce Abbott
+ *  
  */
 
 public class FileCredentialsStore implements ICredentialsStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FrameworkCredentialsService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FrameworkCredentialsService.java
index cf035c9e9..89d98ca4c 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FrameworkCredentialsService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/creds/FrameworkCredentialsService.java
@@ -23,8 +23,8 @@
  * values from the Credentials Store.
  * </p>
  * 
- * @author Bruce Abbott
- * @author Michael Baylis
+ *  
+ *  
  */
 public class FrameworkCredentialsService implements ICredentialsService {
     private final ICredentialsStore  credsStore;
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cts/FrameworkConfidentialTextService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cts/FrameworkConfidentialTextService.java
index 4b4da9a75..d738d5282 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cts/FrameworkConfidentialTextService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/cts/FrameworkConfidentialTextService.java
@@ -19,7 +19,7 @@
  * can remove usernames, passwords, keys,etc, from logs and console outputs if
  * the work is registered.
  * 
- * @author James Davies
+ *  
  */
 public class FrameworkConfidentialTextService implements IConfidentialTextService {
     private List<ConfidentialText> confidentialTexts = new ArrayList<>();
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStore.java
index 15fbca467..1d08aacbf 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStore.java
@@ -29,7 +29,7 @@
  * store for the Dynamic Status Store.
  * </p>
  * 
- * @author Bruce Abbott
+ *  
  */
 public class FpfDynamicStatusStore implements IDynamicStatusStore {
     private FrameworkPropertyFile fpf;
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreRegistration.java
index 223c21ef5..9675ce01a 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreRegistration.java
@@ -18,7 +18,7 @@
 /**
  * 
  * 
- * @author Bruce Abbott
+ *  
  */
 @Component(service = { IDynamicStatusStoreRegistration.class })
 public class FpfDynamicStatusStoreRegistration implements IDynamicStatusStoreRegistration {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreService.java
index 98524d973..a2e77901b 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreService.java
@@ -21,7 +21,7 @@
  * Store as the only DSS.
  * </p>
  * 
- * @author Bruce Abbott
+ *  
  */
 
 public class FrameworkDynamicStatusStoreService extends FrameworkDynamicStoreKeyAccess
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStoreKeyAccess.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStoreKeyAccess.java
index efb47f465..c3dd106ab 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStoreKeyAccess.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/dss/FrameworkDynamicStoreKeyAccess.java
@@ -27,7 +27,7 @@
 /**
  * Provides the common key access to the DSS
  * 
- * @author Bruce Abbott
+ *  
  */
 
 public class FrameworkDynamicStoreKeyAccess implements IDynamicStatusStoreKeyAccess {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/FrameworkMultipleResultArchiveStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/FrameworkMultipleResultArchiveStore.java
index 177d814cf..05178c4ae 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/FrameworkMultipleResultArchiveStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/FrameworkMultipleResultArchiveStore.java
@@ -20,7 +20,7 @@
 /**
  * Stub for multiple Result Archive Stores.
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class FrameworkMultipleResultArchiveStore implements IResultArchiveStoreService {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASDirectoryStream.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASDirectoryStream.java
index 8a359c805..c46c03008 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASDirectoryStream.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASDirectoryStream.java
@@ -17,7 +17,7 @@
 /**
  * Used with the Directory RAS to produce directory listings
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class DirectoryRASDirectoryStream implements DirectoryStream<Path> {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystem.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystem.java
index 4eecbdfd4..ef2bf8998 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystem.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystem.java
@@ -11,7 +11,7 @@
 /**
  * The Directory RAS File System, basically use the shared generic version
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class DirectoryRASFileSystem extends ResultArchiveStoreFileSystem {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystemProvider.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystemProvider.java
index 1a90f3130..e7d294bec 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystemProvider.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryRASFileSystemProvider.java
@@ -44,7 +44,7 @@
  * The Directory RAS Provider for stored artifacts, that does most of the work
  * on the local filesystem
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class DirectoryRASFileSystemProvider extends ResultArchiveStoreFileSystemProvider {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreRegistration.java
index 1eb00ec4f..1e20ddee9 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreRegistration.java
@@ -20,7 +20,7 @@
 /**
  * A RAS Registration
  *
- * @author Michael Baylis
+ *  
  *
  */
 @Component(service = { IResultArchiveStoreRegistration.class })
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreService.java
index 2fd659b0a..7aa46bbc3 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/ras/directory/DirectoryResultArchiveStoreService.java
@@ -32,7 +32,7 @@
 /**
  * A RAS Service for storing the result archive store
  *
- * @author Michael Baylis
+ *  
  *
  */
 @Component(service = { IResultArchiveStoreService.class })
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterConstant.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterConstant.java
index abc47fb99..07db2571c 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterConstant.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterConstant.java
@@ -11,7 +11,7 @@
  * This class implements the IChacter interface and retruns the appropiate
  * responses for a constant character.
  * 
- * @author James Davies
+ *  
  */
 
 public class CharacterConstant implements ICharacter {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterVariable.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterVariable.java
index 6c9a6224d..ed3d7114c 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterVariable.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/CharacterVariable.java
@@ -19,7 +19,7 @@
  * This class implements the ICharacter interface and retruns the appropiate
  * responses for a variable character.
  * 
- * @author James Davies
+ *  
  */
 public class CharacterVariable implements ICharacter {
     private char                 character;
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ICharacter.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ICharacter.java
index dcbff26c5..e727eeade 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ICharacter.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ICharacter.java
@@ -18,7 +18,7 @@
  * example above the J A T P characters being constant and the other four
  * characters being variable.
  * 
- * @author James Davies
+ *  
  */
 public interface ICharacter {
 
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ResourceString.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ResourceString.java
index df4c24a16..0e1b14666 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ResourceString.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/internal/rps/ResourceString.java
@@ -21,7 +21,7 @@
 /**
  * This class creates the resource string defintion build up of ICharacters.
  * 
- * @author James Davies
+ *  
  */
 public class ResourceString {
     private List<ICharacter> string = new ArrayList<>();
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AbstractManager.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AbstractManager.java
index 26f60a54a..90c5f3fb8 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AbstractManager.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AbstractManager.java
@@ -29,7 +29,7 @@
  * An abstract manager which attempts to provide all the boilerplate code
  * necessary to write a Manager in Galasa.
  *
- * @author Michael Baylis
+ *  
  *
  */
 public abstract class AbstractManager implements IManager {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AnnotatedField.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AnnotatedField.java
index 870777ef5..71ec821d6 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AnnotatedField.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/AnnotatedField.java
@@ -15,7 +15,7 @@
  * Represents annotated fields that the AbstractManager finds on behalf of
  * Managers
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class AnnotatedField {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssAdd.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssAdd.java
index 15c933190..a60f9e4a2 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssAdd.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssAdd.java
@@ -12,7 +12,7 @@
  * property already exists, the transaction will fail.
  * If you want to add a property whether it exists or not, use DssUpdate
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssAdd implements IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDelete.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDelete.java
index 1297841da..1df001c52 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDelete.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDelete.java
@@ -12,7 +12,7 @@
  * is provided,  then this will be checked before deleting and fail the transaction if the 
  * values are different
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssDelete implements IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDeletePrefix.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDeletePrefix.java
index c31a584e2..a0159d19a 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDeletePrefix.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssDeletePrefix.java
@@ -10,7 +10,7 @@
 /**
  * This DSS action request that all properties with this prefix are deleted.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssDeletePrefix implements IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceAdd.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceAdd.java
index 0454656f1..b99955c42 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceAdd.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceAdd.java
@@ -14,7 +14,7 @@
  * property already exists, the transaction will fail.
  * If you want to add a property whether it exists or not, use DssUpdate
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssResourceAdd extends DssAdd implements IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDelete.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDelete.java
index dc16d2185..efec3dd26 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDelete.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDelete.java
@@ -14,7 +14,7 @@
  * is provided,  then this will be checked before deleting and fail the transaction if the 
  * values are different
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssResourceDelete extends DssDelete implements IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDeletePrefix.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDeletePrefix.java
index 4031c448b..e2e0f81d9 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDeletePrefix.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceDeletePrefix.java
@@ -12,7 +12,7 @@
  *
  * This DSS action request that all properties with this prefix are deleted.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssResourceDeletePrefix extends DssDeletePrefix implements IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceSwap.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceSwap.java
index 1772ff5b6..1256a3037 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceSwap.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceSwap.java
@@ -13,7 +13,7 @@
  * This DSS action request that property is swapped with another value.  If the old value does 
  * not match with what is already present, the transaction will fail.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssResourceSwap extends DssSwap implements IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceUpdate.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceUpdate.java
index fbc036050..c3da7ea70 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceUpdate.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssResourceUpdate.java
@@ -13,7 +13,7 @@
  * This DSS action request that property is updated in the DSS whether it exists or not. 
  * If you want the transaction to fail if the property already exists, use DssStatusAdd
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssResourceUpdate extends DssUpdate implements IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssSwap.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssSwap.java
index 4384a53bf..b26bb0156 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssSwap.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssSwap.java
@@ -11,7 +11,7 @@
  * This DSS action request that property is swapped with another value.  If the old value does 
  * not match with what is already present, the transaction will fail.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssSwap implements IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssUpdate.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssUpdate.java
index 59aa2572e..a0b67c31d 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssUpdate.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/DssUpdate.java
@@ -11,7 +11,7 @@
  * This DSS action request that property is updated in the DSS whether it exists or not. 
  * If you want the transaction to fail if the property already exists, use DssAdd
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public class DssUpdate implements IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkPropertyFile.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkPropertyFile.java
index 3a39ba388..0091c964b 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkPropertyFile.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkPropertyFile.java
@@ -47,7 +47,7 @@
  * and the watchng of values inside the properties.
  * </p>
  * 
- * @author James Davies
+ *  
  *
  */
 
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkResourcePoolingService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkResourcePoolingService.java
index 95a96244b..a7420e670 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkResourcePoolingService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/FrameworkResourcePoolingService.java
@@ -22,7 +22,7 @@
  * generate resources to a number of specifications. When params are not given,
  * defaults are used.
  * 
- * @author James Davies
+ *  
  */
 public class FrameworkResourcePoolingService implements IResourcePoolingService {
     private static final int           DEFAULTNUMBEROFRESOURCES    = 10;
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStore.java
index eb212f5a4..0c4cfb4b6 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStore.java
@@ -16,7 +16,7 @@
  * any certificates to be loaded before the initialisation of anything else.
  * </p>
  * 
- * @author James Davies
+ *  
  *
  */
 public interface ICertificateStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStoreServiceRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStoreServiceRegistration.java
index 7e8ac47b3..c92d373ac 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStoreServiceRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ICertificateStoreServiceRegistration.java
@@ -12,7 +12,7 @@
  * certificate store that is a non local file. Overrides are expected to be used 
  * for any local certificates if they are required for execution.
  * 
- * @author jamesdavies
+ *  
  *
  */
 public interface ICertificateStoreServiceRegistration {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextService.java
index 1352f226f..739d2f823 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextService.java
@@ -10,7 +10,7 @@
  * registered passwords, usernames, keys and other confidnetial texts so that
  * they can be obscured inside logs and outputs.
  * 
- * @author James Davies
+ *  
  */
 public interface IConfidentialTextService {
 
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextServiceRegistration.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextServiceRegistration.java
index ad0e51272..b7de59733 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextServiceRegistration.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IConfidentialTextServiceRegistration.java
@@ -12,7 +12,7 @@
  * registered passwords, usernames, keys and other confidnetial texts so that
  * they can be obscured inside logs and outputs.
  * 
- * @author James Davies
+ *  
  */
 public interface IConfidentialTextServiceRegistration {
 
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssAction.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssAction.java
index 28f4a302a..908e92d3c 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssAction.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssAction.java
@@ -8,7 +8,7 @@
 /**
  * IDssAction is the basis for all updates to the Dynamic Status Store properties
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDssAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssResourceAction.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssResourceAction.java
index 7f2b49893..1bde0eb08 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssResourceAction.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDssResourceAction.java
@@ -9,7 +9,7 @@
  * IDssStatusAction is the basis for all updates to the Dynamic Status Store properties 
  * framework status area
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDssResourceAction {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicResource.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicResource.java
index 64dd0944e..ba3bb3abb 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicResource.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicResource.java
@@ -15,7 +15,7 @@
  * avoid the need to have manager specific code in the Web UI or Eclipse plugin.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDynamicResource extends IDynamicStatusStoreKeyAccess {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicRun.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicRun.java
index b12c54acc..1aef32f26 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicRun.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicRun.java
@@ -17,7 +17,7 @@
  * prefixed 'dss.framework.run.R12343'
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDynamicRun {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStore.java
index dae42a8cc..60d2592be 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStore.java
@@ -19,7 +19,7 @@
  * do so and then register itself in the Framework.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDynamicStatusStore extends IDynamicStatusStoreKeyAccess {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreKeyAccess.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreKeyAccess.java
index e9f818287..d74e645bc 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreKeyAccess.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreKeyAccess.java
@@ -31,7 +31,7 @@
  * {@link IFramework#getDynamicStatusStoreService(String)}.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDynamicStatusStoreKeyAccess {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreService.java
index 1046ba27c..877c7db09 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IDynamicStatusStoreService.java
@@ -28,7 +28,7 @@
  * {@link IFramework#getDynamicStatusStoreService(String)}.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IDynamicStatusStoreService extends IDynamicStatusStoreKeyAccess {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFramework.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFramework.java
index 9fed7108d..6bed9efcc 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFramework.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFramework.java
@@ -31,7 +31,7 @@
  * bundle will always be started before any other Galasa bundle.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IFramework {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFrameworkInitialisation.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFrameworkInitialisation.java
index c5a6a14c0..0c0a9a83b 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFrameworkInitialisation.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IFrameworkInitialisation.java
@@ -19,7 +19,7 @@
  * should only be called during test run and server initialisation.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IFrameworkInitialisation {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IKeyStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IKeyStore.java
index 22fea9f4a..b5217e959 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IKeyStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IKeyStore.java
@@ -11,7 +11,7 @@
 /**
  * A class to represent a Java Keystore and allow for easy appending and generation
  * 
- * @author jamesdavies
+ *  
  *
  */
 public interface IKeyStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ILoggingManager.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ILoggingManager.java
index f3639dea3..c2ab73388 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ILoggingManager.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ILoggingManager.java
@@ -13,7 +13,7 @@
  * from the active managers.
  * </p>
  *
- * @author Richard Somers
+ *  
  *
  */
 public interface ILoggingManager {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IManager.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IManager.java
index 1808b6f74..0c9dfded7 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IManager.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IManager.java
@@ -25,7 +25,7 @@
  * {@link org.osgi.service.component.annotations.Component} annotation.
  * </p>
  *
- * @author Michael Baylis
+ *  
  *
  */
 public interface IManager {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStore.java
index a55542178..9944e0622 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStore.java
@@ -32,7 +32,7 @@
  * {@link IFramework#getResultArchiveStore()}.
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IResultArchiveStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreDirectoryService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreDirectoryService.java
index 4105a13d2..3f6c13a37 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreDirectoryService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreDirectoryService.java
@@ -14,7 +14,7 @@
 
 /**
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IResultArchiveStoreDirectoryService {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreService.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreService.java
index 46d8bb143..24b7d7a65 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreService.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/IResultArchiveStoreService.java
@@ -22,7 +22,7 @@
  * </p>
  * 
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IResultArchiveStoreService extends IResultArchiveStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/TestCatalogBuilder.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/TestCatalogBuilder.java
index 55ca60a17..7382c3de9 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/TestCatalogBuilder.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/TestCatalogBuilder.java
@@ -16,7 +16,7 @@
  * during the test catalog build process to append information to the test class
  * entry, and the overall test catalog json file.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributes.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributes.java
index 6e8e8acbd..d9da21c56 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributes.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributes.java
@@ -11,7 +11,7 @@
 /**
  * For use with the dummy RAS file system
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreBasicAttributes implements BasicFileAttributes {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributesView.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributesView.java
index 129ba6de7..b08474e4f 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributesView.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreBasicAttributesView.java
@@ -13,7 +13,7 @@
 /**
  * For use with the dummy RAS file system
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreBasicAttributesView implements BasicFileAttributeView {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreByteChannel.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreByteChannel.java
index f60314dae..43ff97ed8 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreByteChannel.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreByteChannel.java
@@ -13,7 +13,7 @@
 /**
  * Dummy Byte Channel for a null Result Archive Store
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreByteChannel implements SeekableByteChannel {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileStore.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileStore.java
index 1ea1cba99..dc0bda549 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileStore.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileStore.java
@@ -13,7 +13,7 @@
 /**
  * Dummy File Store if needed
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreFileStore extends FileStore {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystem.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystem.java
index cb8c476fd..513904d9a 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystem.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystem.java
@@ -20,7 +20,7 @@
 /**
  * Create a Result Archive Store specific File System
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreFileSystem extends FileSystem {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystemProvider.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystemProvider.java
index af4cecdab..1404c3fa5 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystemProvider.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStoreFileSystemProvider.java
@@ -28,7 +28,7 @@
 /**
  * Dummy RAS provider to be extended by other RAS services
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreFileSystemProvider extends FileSystemProvider {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStorePath.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStorePath.java
index 06ddddf1c..5306942a5 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStorePath.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/ras/ResultArchiveStorePath.java
@@ -26,7 +26,7 @@
 /**
  * Create a Result Archive Store specific version of the Path
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStorePath implements Path {
diff --git a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/teststructure/TestStructure.java b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/teststructure/TestStructure.java
index 74feb135d..d1ed151ad 100644
--- a/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/teststructure/TestStructure.java
+++ b/galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/spi/teststructure/TestStructure.java
@@ -15,7 +15,7 @@
  * This class represents the Test Class structure, ie it's test methods, order
  * of execution and their status
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class TestStructure {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsRegistrationTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsRegistrationTest.java
index 18647f591..0b0dfa829 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsRegistrationTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsRegistrationTest.java
@@ -27,7 +27,7 @@
  * Store.
  * </p>
  *
- * @author Bruce Abbott
+ *  
  */
 public class FileCredentialsRegistrationTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsStoreTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsStoreTest.java
index 508e208ac..b0adf8200 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsStoreTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FileCredentialsStoreTest.java
@@ -33,7 +33,7 @@
  * store is functional.
  * </p>
  *
- * @author Bruce Abbott
+ *  
  */
 public class FileCredentialsStoreTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FrameworkCredentialsTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FrameworkCredentialsTest.java
index b31dcffb2..3f11d759b 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FrameworkCredentialsTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/creds/FrameworkCredentialsTest.java
@@ -27,7 +27,7 @@
  * store is functional.
  * </p>
  *
- * @author Bruce Abbott
+ *  
  */
 public class FrameworkCredentialsTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreTest.java
index 422705bc0..ced7a068a 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FpfDynamicStatusStoreTest.java
@@ -25,7 +25,7 @@
  * Test the Framework DSS Stub. Most of the functionality will exist in the
  * service, so this is just a quick drive of the stub code.
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class FpfDynamicStatusStoreTest {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreServiceTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreServiceTest.java
index b2a732e45..744855dbe 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreServiceTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/dss/FrameworkDynamicStatusStoreServiceTest.java
@@ -27,7 +27,7 @@
  * class in functional
  * </p>
  * 
- * @author Bruce Abbott
+ *  
  */
 
 public class FrameworkDynamicStatusStoreServiceTest {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/ras/directory/DirectoryRASSTest.java b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/ras/directory/DirectoryRASSTest.java
index 7a5493fd6..651d0e108 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/ras/directory/DirectoryRASSTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/dev/galasa/framework/internal/ras/directory/DirectoryRASSTest.java
@@ -39,7 +39,7 @@
 /**
  * Test the Directory based Result Archive Store
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class DirectoryRASSTest {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/cps/FpfConfigurationPropertyStoreTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/cps/FpfConfigurationPropertyStoreTest.java
index b80c882e5..cbd052808 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/cps/FpfConfigurationPropertyStoreTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/cps/FpfConfigurationPropertyStoreTest.java
@@ -27,7 +27,7 @@
  * FPF class is functional.
  * </p>
  * 
- * @author James Davies
+ *  
  */
 
 public class FpfConfigurationPropertyStoreTest {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceRegistrationTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceRegistrationTest.java
index 8eb13f4fa..af17403e2 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceRegistrationTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceRegistrationTest.java
@@ -20,7 +20,7 @@
  * This test class ensures that confidential texts that have been registered are
  * reomved from text.
  * 
- * @author James Davies
+ *  
  */
 public class ConfidentialTextServiceRegistrationTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceTest.java
index 5e7682258..8fa0df026 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/cts/ConfidentialTextServiceTest.java
@@ -19,7 +19,7 @@
  * This test class ensures that confidential texts that have been registered are
  * reomved from text.
  * 
- * @author James Davies
+ *  
  */
 public class ConfidentialTextServiceTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/ExceptionsTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/ExceptionsTest.java
index 156d4d4c5..1f7868ffb 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/ExceptionsTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/ExceptionsTest.java
@@ -31,7 +31,7 @@
  * This test class checks that exceptions are behavoing as expected.
  * </p>
  * 
- * @author James Davies
+ *  
  */
 public class ExceptionsTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/FrameworkPropertyFileTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/FrameworkPropertyFileTest.java
index faf219b01..6d9a2a59a 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/FrameworkPropertyFileTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/fpf/FrameworkPropertyFileTest.java
@@ -46,7 +46,7 @@
  * Used to test the FrameworkFileProperty class functionality.
  * </p>
  * 
- * @author James Davies
+ *  
  *
  */
 public class FrameworkPropertyFileTest {
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterConstantTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterConstantTest.java
index 9c7e406ec..91c681d34 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterConstantTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterConstantTest.java
@@ -22,7 +22,7 @@
  * This test class ensures that a constant character has constant behaviour,
  * always returning the same chracter.
  * 
- * @author James Davies
+ *  
  */
 public class CharacterConstantTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterVariableTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterVariableTest.java
index 0dbea19f8..3f28ac019 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterVariableTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/CharacterVariableTest.java
@@ -25,7 +25,7 @@
  * This test class ensures the correct behaviour is shown from a variable
  * character for the given methods in ICharacter.
  * 
- * @author James Davies
+ *  
  */
 public class CharacterVariableTest {
 
diff --git a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/ResourcesPoolingServiceTest.java b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/ResourcesPoolingServiceTest.java
index 52de10e7b..07e7e826b 100644
--- a/galasa-parent/dev.galasa.framework/src/test/java/test/rps/ResourcesPoolingServiceTest.java
+++ b/galasa-parent/dev.galasa.framework/src/test/java/test/rps/ResourcesPoolingServiceTest.java
@@ -23,7 +23,7 @@
  * This test method creates resource tests strings and checks the behaviour of
  * generating resources.
  * 
- * @author James Davies
+ *  
  */
 public class ResourcesPoolingServiceTest {
 
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/ResultArchiveStoreContentType.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/ResultArchiveStoreContentType.java
index 8b50278d2..6486a6a4a 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/ResultArchiveStoreContentType.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/ResultArchiveStoreContentType.java
@@ -10,7 +10,7 @@
 /**
  * Used to set the File Type for a Stored Artifact in the Result Archive Store
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class ResultArchiveStoreContentType implements FileAttribute<String> {
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/Summary.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/Summary.java
index c167439ef..8a1440f69 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/Summary.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/Summary.java
@@ -14,7 +14,7 @@
 /**
  * Provides a summary text to add to the test catalog
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/Tags.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/Tags.java
index 08a4935df..5ac02f252 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/Tags.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/Tags.java
@@ -14,7 +14,7 @@
 /**
  * Used to tag a test.  These tags can be used when requesting tests for running, eg from Jenkins
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestAreas.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestAreas.java
index d560a3165..a7efeeff0 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestAreas.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestAreas.java
@@ -14,7 +14,7 @@
 /**
  * Used to indicate what areas the test exercises.  These test areas can be used when requesting tests for running, eg from Jenkins
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariation.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariation.java
index d7e20e1a5..b312e3e7e 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariation.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariation.java
@@ -15,7 +15,7 @@
 /**
  * Indicates this test has variations that will be entered into the Test Catalog
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariationProperty.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariationProperty.java
index bde066a6b..571485be4 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariationProperty.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariationProperty.java
@@ -12,7 +12,7 @@
 /**
  * Provide a CPS property to set for a test variation
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)
diff --git a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariations.java b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariations.java
index 4b38b09d5..877fcfd47 100644
--- a/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariations.java
+++ b/galasa-parent/dev.galasa/src/main/java/dev/galasa/TestVariations.java
@@ -14,7 +14,7 @@
 /**
  * Indicates the test has multiple Test Variations
  * 
- * @author Michael Baylis
+ *  
  *
  */
 @Retention(RUNTIME)