FLUID-4927: code clean up.