FLUID-4824: comment clean-up