Might want to attempt to update the original entity here.  Just to ensure all the unique values were removed from the CF's and that nothing is blocking an update.