Tried to fix errors with illegal remove events