removed update_tracked_fields