MDL-41787 fix IDE complaints