FLUID-4599: removed unused commented code