FLUID-4661: minor code cleanup