cleanup user field updates