Added remove if exists on add methods