diff --git a/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java b/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
index 880d344..19691e2 100644
--- a/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
+++ b/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
@@ -68,13 +68,11 @@ public class Team  {
 
     /**
      * Removes a member from the team by name
-     * @param firstName the first name of the racer to be removed
-     * @param lastName the last name of the racer to be removed
+     * @param killableMember the Racer object to be removed from the team
      */
-    public void removeMember(String firstName, String lastName){
-        this.members.forEach(racer ->{
-            if(firstName.equals(racer.getFirstName()) && lastName.equals(racer.getLastName())) members.remove(racer);
-        });
+    public void removeMember(Racer killableMember){
+        this.members.remove(killableMember);
+        killableMember.setMemberTeam(null);
         this.checkFirstSemesterTeam();
     }
 }