[#8539] code simplifications
20 files changed