FLUID-5298: Cleaning up the FSS demos