Add logging for rare corner case.
Remove unused fields.