code cleanup. No functional change.