fixed remove method