FLUID-5439: More removal of FSS