diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs
index 2d2dc8939..2a8d6e572 100644
--- a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs
+++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs
@@ -12,7 +12,6 @@ using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Conventions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Squidex.Infrastructure.MongoDb;
 
 namespace Squidex.Infrastructure.MongoDb
 {
diff --git a/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs b/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs
index b054d8729..c4d0e0ef4 100644
--- a/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs
+++ b/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.States;
@@ -53,9 +52,7 @@ namespace Squidex.Infrastructure.Commands
 
             ApplyEvent(@event);
 
-            snapshot.Version++;
-
-            uncomittedEvents.Add(@event.To<IEvent>());
+            uncomittedEvents.Add(@event);
         }
 
         public IReadOnlyList<Envelope<IEvent>> GetUncomittedEvents()
@@ -79,11 +76,6 @@ namespace Squidex.Infrastructure.Commands
 
         public Task WriteSnapshotAsync()
         {
-            if (persistence.Version == EtagVersion.NotFound)
-            {
-                Debugger.Break();
-            }
-
             snapshot.Version = persistence.Version;
 
             return persistence.WriteSnapshotAsync(snapshot);
diff --git a/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs b/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs
index c4c83790f..1695a96f9 100644
--- a/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs
+++ b/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs
@@ -6,7 +6,6 @@
 // ==========================================================================
 
 using System;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Squidex.Infrastructure.Json
diff --git a/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs b/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs
index 5054b4dc7..cc85acd9b 100644
--- a/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs
+++ b/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs
@@ -6,7 +6,6 @@
 // ==========================================================================
 
 using System;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace Squidex.Infrastructure.Json
diff --git a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
index 678ec9d4a..70e23f0b8 100644
--- a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs
@@ -36,23 +36,6 @@ namespace Squidex.Infrastructure.Commands
             Assert.Equal(EtagVersion.Empty, sut.Version);
         }
 
-        [Fact]
-        public void Should_add_event_to_uncommitted_events_and_increase_version_when_raised()
-        {
-            var event1 = new MyEvent();
-            var event2 = new MyEvent();
-
-            sut.RaiseEvent(event1);
-            sut.RaiseEvent(event2);
-
-            Assert.Equal(1, sut.Version);
-            Assert.Equal(new IEvent[] { event1, event2 }, sut.GetUncomittedEvents().Select(x => x.Payload).ToArray());
-
-            sut.ClearUncommittedEvents();
-
-            Assert.Equal(0, sut.GetUncomittedEvents().Count);
-        }
-
         [Fact]
         public async Task Should_write_state_and_events_when_saved()
         {