diff --git a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/GetPartyInfoResponse.java b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/GetPartyInfoResponse.java
index a668991742..61d252a7f0 100644
--- a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/GetPartyInfoResponse.java
+++ b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/GetPartyInfoResponse.java
@@ -5,7 +5,6 @@
 import jakarta.xml.bind.annotation.XmlElement;
 import java.util.List;
 
-// TODO(cjh) just used for swagger generation - should be used in the actual jaxrs methods
 public class GetPartyInfoResponse {
 
   @Schema(description = "server's url")
diff --git a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Key.java b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Key.java
index 6b89899c54..eb871dddc0 100644
--- a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Key.java
+++ b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Key.java
@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-// TODO(cjh) just used for swagger generation - should be used in the actual jaxrs methods
 public class Key {
   @Schema(description = "known public key of peer", format = "base64")
   private String key;
diff --git a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Peer.java b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Peer.java
index b5318eec63..009cf2571b 100644
--- a/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Peer.java
+++ b/tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/model/Peer.java
@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-// TODO(cjh) just used for swagger generation - should be used in the actual jaxrs methods
 public class Peer {
   @Schema(description = "peer's server url")
   private String url;
diff --git a/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/GetPublicKeysResponse.java b/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/GetPublicKeysResponse.java
index 08ca12daa5..a0a0c437dd 100644
--- a/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/GetPublicKeysResponse.java
+++ b/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/GetPublicKeysResponse.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-// TODO(cjh) just used for swagger generation - should be used in the actual jaxrs methods
 public class GetPublicKeysResponse {
 
   private List<Key> keys;
diff --git a/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/Key.java b/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/Key.java
index 56aa363712..31e8a7ac88 100644
--- a/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/Key.java
+++ b/tessera-jaxrs/thirdparty-jaxrs/src/main/java/com/quorum/tessera/thirdparty/model/Key.java
@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-// TODO(cjh) just used for swagger generation - should be used in the actual jaxrs methods
 public class Key {
 
   @Schema(description = "public key", format = "base64")