diff --git a/src/Converter/BaseConverter.php b/src/Converter/BaseConverter.php
index <HASH>..<HASH> 100644
--- a/src/Converter/BaseConverter.php
+++ b/src/Converter/BaseConverter.php
@@ -20,16 +20,10 @@ abstract class BaseConverter implements EventConverterInterface
     {
         $q = 'MERGE (user:User {id: {user_id}})
         ON CREATE SET user.login = {user_login}
-        CREATE (event:GithubEvent {id: {event_id}})
-        SET event.type = {event_type}, event.time = {event_time}
+        MERGE (event:GithubEvent {id: {event_id}})
+        SET event.type = {event_type}, event.time = {event_time}, user_id: {user_id}
         MERGE (et:EventType {type:{event_type}})
         MERGE (event)-[:EVENT_TYPE]->(et)
-        WITH user, event
-        OPTIONAL MATCH (user)-[r:LAST_EVENT]->(lastEvent)
-        DELETE r
-        MERGE (user)-[:LAST_EVENT]->(event)
-        WITH user, event, collect(lastEvent) as lastEvents
-        FOREACH (x in lastEvents | CREATE (event)-[:PREVIOUS_EVENT]->(x))
         RETURN event';
 
         $p = [
simpler event, user merge io create for event