ref #8334 code cleanup