FLUID-5469: Removing uses of old FSS classes