diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/Kommentar.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/Kommentar.java
index 3600084c4f0eb639bd3762e45f54f5a0be477fa6..89eb1615fb6c468455689c949429c01e664907e6 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/Kommentar.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/Kommentar.java
@@ -38,8 +38,6 @@ public class Kommentar implements CommandBody {
 	@LinkedResource(controllerClass = UserProfileController.class)
 	private String createdBy;
 	@JsonProperty(access = Access.READ_ONLY)
-	private String createdByName;
-	@JsonProperty(access = Access.READ_ONLY)
 	private ZonedDateTime createdAt;
 
 	@NotNull(message = FIELD_IS_EMPTY)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
index b75688087c0f7b8f122d9223bf015e234735f7d9..b1d5c54549e867917b067088d459eb692111d467 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
@@ -10,9 +10,7 @@ import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ValueMapping;
 
-import de.itvsh.goofy.common.IgnoreGrpcFields;
 import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.kommentar.GrpcKommentar;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface KommentarMapper {
@@ -23,13 +21,6 @@ public interface KommentarMapper {
 	static final String CREATED_AT = "createdAt";
 	static final String VORGANG_ID = "vorgangId";
 
-	@Mapping(target = "textBytes", ignore = true)
-	@IgnoreGrpcFields
-	GrpcKommentar toGrpcKommentar(Kommentar kommentar);
-
-	@Mapping(target = "vorgangId", ignore = true)
-	Kommentar toKommentar(GrpcKommentar grpcKommentar);
-
 	@Mapping(target = "kommentar", ignore = true)
 	@ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
 	@ValueMapping(source = "UNDEFINED", target = MappingConstants.NULL)
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/GrpcKommentarTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/GrpcKommentarTestFactory.java
deleted file mode 100644
index 275eb20838fca5765fa6e0a828d0e788127828ac..0000000000000000000000000000000000000000
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/GrpcKommentarTestFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.itvsh.goofy.kommentar;
-
-import de.itvsh.ozg.pluto.kommentar.GrpcKommentar;
-
-@Deprecated
-public class GrpcKommentarTestFactory {
-
-	final static String ID = KommentarTestFactory.ID;
-	final static String CREATED_BY = KommentarTestFactory.CREATED_BY;
-	final static String CREATED_BY_NAME = KommentarTestFactory.CREATED_BY_NAME;
-	final static String CREATED_AT_STR = KommentarTestFactory.CREATED_AT_STR;
-	final static String TEXT = KommentarTestFactory.TEXT;
-
-	public static GrpcKommentar create() {
-		return createBuilder().build();
-	}
-
-	public static GrpcKommentar.Builder createBuilder() {
-		return GrpcKommentar.newBuilder()
-				.setId(ID)
-				.setCreatedBy(CREATED_BY)
-				.setCreatedByName(CREATED_BY_NAME)
-				.setCreatedAt(CREATED_AT_STR)
-				.setText(TEXT);
-	}
-}
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
index fc347c6b0009161e72757106f0e928fdabadaa55..e05a9316e3a549b332ad81d99d6239e6391574ec 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
@@ -2,7 +2,6 @@ package de.itvsh.goofy.kommentar;
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
@@ -53,45 +52,4 @@ class KommentarMapperTest {
 	private Kommentar map() {
 		return mapper.fromItemMap(KommentarTestFactory.createAsMap());
 	}
-
-	@Nested
-	@Deprecated
-	@Disabled
-	class TestFromGrpc {
-
-		@Test
-		void shouldMap() {
-			var kommentar = mapper.toKommentar(GrpcKommentarTestFactory.create());
-
-			assertThat(kommentar).isNotNull().usingRecursiveComparison().isEqualTo(KommentarTestFactory.create());
-		}
-
-		@Test
-		void shouldHandleNull() {
-			var grpcKommentar = mapper.toKommentar(null);
-
-			assertThat(grpcKommentar).isNull();
-		}
-	}
-
-	@Nested
-	@Deprecated
-	@Disabled
-	class TestToGrpc {
-
-		@Test
-		void shouldMap() {
-			var grpcKommentar = mapper.toGrpcKommentar(KommentarTestFactory.createBuilder().id(null).build());
-
-			assertThat(grpcKommentar).isNotNull().usingRecursiveComparison().ignoringFields("id_", "memoizedHashCode")
-					.isEqualTo(GrpcKommentarTestFactory.create());
-		}
-
-		@Test
-		void shouldHandleNull() {
-			var grpcKommentar = mapper.toGrpcKommentar(null);
-
-			assertThat(grpcKommentar).isNull();
-		}
-	}
 }
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
index d6b9d7e1bbeea927781d97ce7e4f1401b1f1322e..f6ab98bee651161b94edd7f48311cea1e66ce0cb 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
@@ -17,7 +17,6 @@ public class KommentarTestFactory {
 	public static final String ID = UUID.randomUUID().toString();
 
 	public static final String CREATED_BY = UserProfileTestFactory.ID.toString();
-	public static final String CREATED_BY_NAME = lorem.getName();
 	public static final String CREATED_AT_STR = "2021-01-10T10:30:00Z";
 	public static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR);
 
@@ -34,7 +33,6 @@ public class KommentarTestFactory {
 				.id(ID)
 				.text(TEXT)
 				.createdBy(CREATED_BY)
-				.createdByName(CREATED_BY_NAME)
 				.createdAt(CREATED_AT)
 				.vorgangId(VORGANG_ID);
 	}