some cleanup and extra logging to find the update identity sync issue