Add remove and remove_first