code cleanup
No functional change
signature = 6730651