diff --git a/src/main/java/com/wire/helium/API.java b/src/main/java/com/wire/helium/API.java
index b40d328..448d756 100644
--- a/src/main/java/com/wire/helium/API.java
+++ b/src/main/java/com/wire/helium/API.java
@@ -357,12 +357,7 @@ public Conversation getConversation() {
             throw new RuntimeException(msgError);
         }
 
-        _Conv conv = response.readEntity(_Conv.class);
-        Conversation ret = new Conversation();
-        ret.name = conv.name;
-        ret.id = conv.id;
-        ret.members = conv.members.others;
-        return ret;
+        return response.readEntity(Conversation.class);
     }
 
     @Override
@@ -446,13 +441,7 @@ public Conversation createConversation(String name, UUID teamId, List<QualifiedI
             throw new HttpException(msgError, response.getStatus());
         }
 
-        _Conv conv = response.readEntity(_Conv.class);
-
-        Conversation ret = new Conversation();
-        ret.name = conv.name;
-        ret.id = conv.id;
-        ret.members = conv.members.others;
-        return ret;
+        return response.readEntity(Conversation.class);
     }
 
     @Override
@@ -477,13 +466,7 @@ public Conversation createOne2One(UUID teamId, QualifiedId userId) throws HttpEx
             throw new HttpException(msgError, response.getStatus());
         }
 
-        _Conv conv = response.readEntity(_Conv.class);
-
-        Conversation ret = new Conversation();
-        ret.name = conv.name;
-        ret.id = conv.id;
-        ret.members = conv.members.others;
-        return ret;
+        return response.readEntity(Conversation.class);
     }
 
     @Override
@@ -908,24 +891,10 @@ private boolean isSuccessResponse(int statusCode) {
         return Response.Status.Family.familyOf(statusCode).equals(Response.Status.Family.SUCCESSFUL);
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class _Conv {
-        @JsonProperty("qualified_conversation")
-        public QualifiedId id;
-
-        @JsonProperty
-        public String name;
-
-        @JsonProperty
-        public _Members members;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class _Members {
-        @JsonProperty
-        public List<Member> others;
-    }
-
+    /**
+     * @deprecated This class is deprecated and in case there is any work related to _Service,
+     * {@link Service} can be used instead.
+     */
     @JsonIgnoreProperties(ignoreUnknown = true)
     static class _Service {
         public UUID service;
diff --git a/src/main/java/com/wire/helium/models/model/response/ConversationListResponse.java b/src/main/java/com/wire/helium/models/model/response/ConversationListResponse.java
index f35d285..1c3dedc 100644
--- a/src/main/java/com/wire/helium/models/model/response/ConversationListResponse.java
+++ b/src/main/java/com/wire/helium/models/model/response/ConversationListResponse.java
@@ -12,7 +12,6 @@ public class ConversationListResponse {
     @JsonProperty("failed")
     public List<QualifiedId> failed;
 
-    // TODO(WPB-12040): possible issue with members returning as object(others[], self{}) and we expect a list?
     @JsonProperty("found")
     public List<Conversation> found;