FLUID-4824: Code clean-up