FLUID-5190: code clean up.