in class, fixed remove