ref #8489: code cleaning