diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/V1ReplyMessageFactory.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/V1ReplyMessageFactory.java
index 4d5cf6247abc9a0b992270e8c669ee712ff955f7..61a52ac52df930ef3568e5c60d8e1b5a2f0f81d2 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/V1ReplyMessageFactory.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/V1ReplyMessageFactory.java
@@ -1,16 +1,12 @@
 package de.ozgcloud.nachrichten.postfach.osiv2.factory;
 
 import java.time.OffsetDateTime;
-import java.util.List;
 import java.util.UUID;
 
 import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1EidasLevel;
 import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyBehavior;
-import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyFiles;
 import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyMessage;
 
-
-
 public class V1ReplyMessageFactory {
 
 	private static String SEQUENCE_NUMMER = "OZG-Cloud-VorgangId";
@@ -28,78 +24,19 @@ public class V1ReplyMessageFactory {
 	private static String MESSAGE_BOX = "Mailbox-Id-Antwortender";
 	private static OffsetDateTime RESPONSE_TIME = OffsetDateTime.now();
 
-
-public static V1ReplyMessage create(){
-	return createBuilder().build();
-}
-
-public static V1ReplyMessageFactory.Builder createBuilder(){
-	return new Builder()
-			.sequencenumber(SEQUENCE_NUMMER)
-			.subject(SUBJECT)
-			.body(BODY)
-			.displayName(DISPLAY_NAME)
-			.originSender(ORIGIN_SENDER)
-			.replyAction(REPLAY_ACTION)
-			.eidasLevel(EIDAS_LEVEL)
-			.isObligatory(IS_OLIGATORY)
-			.isHtml(IS_HTML)
-			.guid(UUID.nameUUIDFromBytes(GUID.getBytes()))
-			.messageBox(UUID.nameUUIDFromBytes(MESSAGE_BOX.getBytes()))
-			.responseTime(RESPONSE_TIME);
-}
-
-
-	static class Builder{
-		private String sequencenumber;
-		private String subject;
-		private String body;
-		private String displayName;
-		private String originSender;
-		private String replyAction;
-		private String eidasLevel;
-		private Boolean isObligatory;
-		private Boolean isHtml;
-		private List<V1ReplyFiles> files;
-		private UUID guid;
-		private UUID messageBox;
-		private String senderDisplayName;
-		private String recipientDisplayName;
-		private OffsetDateTime responseTime;
-
-		public Builder sequencenumber(String sequencenumber){this.sequencenumber = sequencenumber;return this;}
-		public Builder subject(String subject){this.subject = subject;return this;}
-		public Builder body(String body){this.body = body;return this;}
-		public Builder displayName(String displayName){this.displayName = displayName;return this;}
-		public Builder originSender(String originSender){this.originSender = originSender;return this;}
-		public Builder replyAction(String replyAction){this.replyAction = replyAction;return this;}
-		public Builder eidasLevel(String eidasLevel){this.eidasLevel = eidasLevel;return this;}
-		public Builder isObligatory(Boolean isOligatory){this.isObligatory = isObligatory; return this;}
-		public Builder isHtml(Boolean isHtml){this.isHtml = isHtml;return this;}
-		public Builder files(List<V1ReplyFiles> files){this.files = files;return this;}
-		public Builder guid(UUID guid){this.guid = guid;return this;}
-		public Builder messageBox(UUID messageBox){this.messageBox = messageBox;return this;}
-		public Builder senderDisplayName(String senderDisplayName){this.senderDisplayName = senderDisplayName;return this;}
-		public Builder recipientDisplayName(String recipientDisplayName){this.recipientDisplayName = recipientDisplayName;return this;}
-		public Builder responseTime(OffsetDateTime responseTime){this.responseTime = responseTime;return this;}
-		public V1ReplyMessage build(){
-			var message = new V1ReplyMessage();
-			message.setSequencenumber(sequencenumber);
-			message.setSubject(subject);
-			message.setBody(body);
-			message.setDisplayName(displayName);
-			message.setOriginSender(originSender);
-			message.setReplyAction(V1ReplyBehavior.fromValue(replyAction));
-			message.eidasLevel(V1EidasLevel.fromValue(eidasLevel));
-			message.isHtml(isHtml);
-			message.isObligatory(isObligatory);
-			message.files(files);
-			message.guid(guid);
-			message.messageBox(messageBox);
-			message.senderDisplayName(senderDisplayName);
-			message.recipientDisplayName(recipientDisplayName);
-			message.responseTime(responseTime);
-			return message;
-		}
+	public static V1ReplyMessage create() {
+		return new V1ReplyMessage()
+				.sequencenumber(SEQUENCE_NUMMER)
+				.subject(SUBJECT)
+				.body(BODY)
+				.displayName(DISPLAY_NAME)
+				.originSender(ORIGIN_SENDER)
+				.replyAction(V1ReplyBehavior.fromValue(REPLAY_ACTION))
+				.eidasLevel(V1EidasLevel.fromValue(EIDAS_LEVEL))
+				.isObligatory(IS_OLIGATORY)
+				.isHtml(IS_HTML)
+				.guid(UUID.nameUUIDFromBytes(GUID.getBytes()))
+				.messageBox(UUID.nameUUIDFromBytes(MESSAGE_BOX.getBytes()))
+				.responseTime(RESPONSE_TIME);
 	}
 }