diff --git a/src/main/kotlin/no/iktdev/eventi/models/Event.kt b/src/main/kotlin/no/iktdev/eventi/models/Event.kt
index a52befc..ebff9fe 100644
--- a/src/main/kotlin/no/iktdev/eventi/models/Event.kt
+++ b/src/main/kotlin/no/iktdev/eventi/models/Event.kt
@@ -10,9 +10,6 @@ abstract class Event {
     var metadata: Metadata = Metadata()
         protected set
 
-    @Transient
-    open val data: Any? = null
-
     fun derivedOf(event: Event) = apply {
         this.referenceId = event.referenceId
         this.metadata = Metadata(derivedFromId = event.eventId)
diff --git a/src/main/kotlin/no/iktdev/eventi/models/Task.kt b/src/main/kotlin/no/iktdev/eventi/models/Task.kt
index 856f98a..fb8ded5 100644
--- a/src/main/kotlin/no/iktdev/eventi/models/Task.kt
+++ b/src/main/kotlin/no/iktdev/eventi/models/Task.kt
@@ -11,9 +11,6 @@ abstract class Task {
     var metadata: Metadata = Metadata()
         protected set
 
-    @Transient
-    open val data: Any? = null
-
     fun newReferenceId() = apply {
         this.referenceId = UUID.randomUUID()
     }
diff --git a/src/test/kotlin/no/iktdev/eventi/ZDSTest.kt b/src/test/kotlin/no/iktdev/eventi/ZDSTest.kt
index 1292dda..7b2628e 100644
--- a/src/test/kotlin/no/iktdev/eventi/ZDSTest.kt
+++ b/src/test/kotlin/no/iktdev/eventi/ZDSTest.kt
@@ -39,7 +39,7 @@ class ZDSTest {
     }
 
     data class TestTask(
-        override val data: String?
+        val data: String?
     ): Task()
 
     @Test
diff --git a/src/test/kotlin/no/iktdev/eventi/events/TestEvents.kt b/src/test/kotlin/no/iktdev/eventi/events/TestEvents.kt
index 75d14e8..ded1317 100644
--- a/src/test/kotlin/no/iktdev/eventi/events/TestEvents.kt
+++ b/src/test/kotlin/no/iktdev/eventi/events/TestEvents.kt
@@ -7,8 +7,8 @@ import java.util.UUID
 class StartEvent(): Event() {
 }
 
-class EchoEvent(override var data: String): Event() {
+class EchoEvent(var data: String): Event() {
 }
 
-class MarcoEvent(override val data: Boolean): Event() {
+class MarcoEvent(val data: Boolean): Event() {
 }
\ No newline at end of file
diff --git a/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt b/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt
index f7a8fcd..450237f 100644
--- a/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt
+++ b/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt
@@ -44,10 +44,10 @@ class AbstractTaskPollerTest : TestBase() {
         }
     }
 
-    data class EchoTask(override var data: String?) : Task() {
+    data class EchoTask(var data: String?) : Task() {
     }
 
-    data class EchoEvent(override var data: String) : Event() {
+    data class EchoEvent(var data: String) : Event() {
     }
 
     class TaskPollerTest(taskStore: TaskStore, reporterFactory: (Task) -> TaskReporter): AbstractTaskPoller(taskStore, reporterFactory) {