fix remove method