Added remove() and remove_if() interface