Shouldn't the property be removed if the value is null here?