fix incorrect call to _validatedRemove for insert and update