code cleanup. no visible user change.