diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyRegistration.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyRegistration.java
index 0aedac1d..38388c47 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyRegistration.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyRegistration.java
@@ -20,7 +20,7 @@
  * This Class is a small OSGI bean that registers the CPS store as a ETCD
  * cluster or quietly fails.
  * 
- * @author James Davies
+ *  
  */
 @Component(service = { IConfigurationPropertyStoreRegistration.class })
 public class Etcd3ConfigurationPropertyRegistration implements IConfigurationPropertyStoreRegistration {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyStore.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyStore.java
index a71464f6..3970ed9a 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyStore.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3ConfigurationPropertyStore.java
@@ -31,7 +31,7 @@
 /**
  * This class impletements the CPS for etcd using the JETCD client.
  * 
- * @author James Davies
+ *  
  * @author Matthew Chivers
  */
 public class Etcd3ConfigurationPropertyStore implements IConfigurationPropertyStore {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3CredentialsStoreRegistration.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3CredentialsStoreRegistration.java
index 85d92c32..6f91b718 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3CredentialsStoreRegistration.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3CredentialsStoreRegistration.java
@@ -20,7 +20,7 @@
  * This Class is a small OSGI bean that registers the Credentials store as a
  * ETCD cluster or quietly fails.
  * 
- * @author James Davies
+ *  
  */
 @Component(service = { ICredentialsStoreRegistration.class })
 public class Etcd3CredentialsStoreRegistration implements ICredentialsStoreRegistration {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStore.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStore.java
index 24f4b956..efa2429a 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStore.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStore.java
@@ -58,7 +58,7 @@
  * This class implements the DSS store for the use of etcd3 as the k-v store. It
  * is interacting with the Jetcd Client offered from coreOs.
  * 
- * @author James Davies
+ *  
  */
 public class Etcd3DynamicStatusStore implements IDynamicStatusStore {
     private final Client                            client;
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStoreRegistration.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStoreRegistration.java
index 3ac35037..95052a27 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStoreRegistration.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/internal/Etcd3DynamicStatusStoreRegistration.java
@@ -20,7 +20,7 @@
  * This Class is a small OSGI bean that registers the DSS store as a ETCD
  * cluster or quietly fails.
  * 
- * @author James Davies
+ *  
  */
 @Component(service = { IDynamicStatusStoreRegistration.class })
 public class Etcd3DynamicStatusStoreRegistration implements IDynamicStatusStoreRegistration {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3ClientService.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3ClientService.java
index c2d3db92..94290318 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3ClientService.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3ClientService.java
@@ -14,7 +14,7 @@
 /**
  * The service to obtain an Etcd3 Client.
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IEtcd3ClientService {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3Listener.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3Listener.java
index c99587d3..cd43051a 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3Listener.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/main/java/dev/galasa/cps/etcd/spi/IEtcd3Listener.java
@@ -19,7 +19,7 @@
  * {@link IEtcd3Client#registerWatch(IEtcd3Listener, String)}
  * </p>
  * 
- * @author Michael Baylis
+ *  
  *
  */
 public interface IEtcd3Listener {
@@ -27,7 +27,7 @@ public interface IEtcd3Listener {
     /**
      * The type of event that triggered the watch
      * 
-     * @author Michael Baylis
+     *  
      *
      */
     public enum Event {
diff --git a/galasa-extensions-parent/dev.galasa.cps.etcd/src/test/java/test/force/codecoverage/Etcd3DssTest.java b/galasa-extensions-parent/dev.galasa.cps.etcd/src/test/java/test/force/codecoverage/Etcd3DssTest.java
index 62b91353..d61752a7 100644
--- a/galasa-extensions-parent/dev.galasa.cps.etcd/src/test/java/test/force/codecoverage/Etcd3DssTest.java
+++ b/galasa-extensions-parent/dev.galasa.cps.etcd/src/test/java/test/force/codecoverage/Etcd3DssTest.java
@@ -48,7 +48,7 @@
  * 
  * All Responses from a etcd cluster have been mocked using mockito.
  * 
- * @author James Davies
+ *  
  */
 //@RunWith(MockitoJUnitRunner.class)
 public class Etcd3DssTest {
diff --git a/galasa-extensions-parent/dev.galasa.ras.couchdb/src/main/java/dev/galasa/ras/couchdb/internal/CouchdbRasReadByteChannel.java b/galasa-extensions-parent/dev.galasa.ras.couchdb/src/main/java/dev/galasa/ras/couchdb/internal/CouchdbRasReadByteChannel.java
index 624806eb..60af4f66 100644
--- a/galasa-extensions-parent/dev.galasa.ras.couchdb/src/main/java/dev/galasa/ras/couchdb/internal/CouchdbRasReadByteChannel.java
+++ b/galasa-extensions-parent/dev.galasa.ras.couchdb/src/main/java/dev/galasa/ras/couchdb/internal/CouchdbRasReadByteChannel.java
@@ -14,7 +14,7 @@
 /**
  * Dummy Byte Channel for a null Result Archive Store
  *
- * @author Michael Baylis
+ *  
  *
  */
 public class CouchdbRasReadByteChannel implements SeekableByteChannel {