Changed remove method semantics