diff --git a/src/main/java/mops/gruppen2/domain/Group.java b/src/main/java/mops/gruppen2/domain/Group.java
index 257a4f2..3a09149 100644
--- a/src/main/java/mops/gruppen2/domain/Group.java
+++ b/src/main/java/mops/gruppen2/domain/Group.java
@@ -21,7 +21,7 @@ public class Group {
     private long id;
     private String title;
     private String description;
-    public List<User> members;
+    private final List<User> members;
     private final Map<String, Role> roles;
 
     private GroupType type;
diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
index 5573117..b22bcd3 100644
--- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
@@ -21,7 +21,7 @@ public class DeleteUserEvent extends Event {
         for (User user : group.getMembers()) {
             if (user.getUser_id().equals(this.user_id)) {
                 group.members.remove(user);
-                group.getRoles().remove(user);
+                group.getRoles().remove(user_id);
                 return;
             }
         }
diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
index bfbab9b..f115c97 100644
--- a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
@@ -25,22 +25,7 @@ public class UpdateRoleEvent extends Event {
     }
 
     public void apply(Group group) {
-        User user = new User(user_id, null, null, null);
-
-        Optional<User> userOptional = group.getMembers().stream()
-                .filter(u -> u.getUser_id().equals(user_id))
-                .findFirst();
-
-        if (userOptional.isPresent()) {
-            user = userOptional.get();
-        } else {
-        }
-
-        if (group.getRoles().containsKey(user) && newRole == Role.MEMBER) {
-            group.getRoles().remove(user);
-        } else {
-            group.getRoles().put(user.getUser_id(), newRole);
-        }
+        group.getRoles().put(this.user_id, this.newRole);
     }
 
 }